日志文件路径从Spring配置读取

eladmin-system/src/main/resources/config/application-nt.yml

@@ -190,4 +190,7 @@ xxl:
       ip:
       port: 9999
       logpath: ./logs/xxl-job/
-      logretentiondays: 30
+      logretentiondays: 30
+
+logback:
+  logdir: ./logs/java-app

eladmin-system/src/main/resources/config/application-prod.yml

@@ -190,4 +190,7 @@ xxl:
       ip:
       port: 9999
       logpath: /users/songxiaodong/applogs/xxl-job/jobhandler
-      logretentiondays: 30
+      logretentiondays: 30
+
+logback:
+  logdir: ./logs/java-app

eladmin-system/src/main/resources/config/application-test.yml

@@ -1,193 +1,197 @@
-#配置数据源
-server:
-  port: 8000
-spring:
-  mvc:
-    static-path-pattern: /image/**
-  resources:
-    static-locations: file:/imagetest/,file:/imagetest/
-  datasource:
-    druid:
-      db-type: com.alibaba.druid.pool.DruidDataSource
-      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://47.99.197.173:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false
-      username: root
-      password: fqgztemp123mysql
-      # 初始连接数
-      initial-size: 5
-      # 最小连接数
-      min-idle: 15
-      # 最大连接数
-      max-active: 30
-      # 超时时间(以秒数为单位)
-      remove-abandoned-timeout: 180
-      # 获取连接超时时间
-      max-wait: 3000
-      # 连接有效性检测时间
-      time-between-eviction-runs-millis: 30000
-      # 连接在池中最小生存的时间
-      min-evictable-idle-time-millis: 30000
-      # 连接在池中最大生存的时间
-      max-evictable-idle-time-millis: 30000
-      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
-      test-while-idle: true
-      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
-      test-on-borrow: true
-      # 是否在归还到池中前进行检验
-      test-on-return: false
-      # 检测连接是否有效
-      validation-query: select 1
-      # 配置监控统计
-      webStatFilter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-      filter:
-        stat:
-          enabled: true
-          # 记录慢SQL
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  redis:
-    #数据库索引
-    database: 1
-    sentinel:
-      master: mymaster
-      nodes: 47.99.197.173:26379
    password: 123qysd!@#
-    #连接超时时间
-    timeout: 10000
-# 登录相关配置
-login:
-  # 登录缓存
-  cache-enable: true
-  #  是否限制单用户登录
-  single-login: true
-  #  验证码
-  login-code:
-    #  验证码类型配置 查看 LoginProperties 类
-    code-type: arithmetic
-    #  登录图形验证码有效时间/分钟
-    expiration: 2
-    #  验证码高度
-    width: 111
-    #  验证码宽度
-    height: 36
-    # 内容长度
-    length: 2
-    # 字体名称，为空则使用默认字体
-    font-name:
-    # 字体大小
-    font-size: 25
-
-#jwt
-jwt:
-  header: Authorization
-  # 令牌前缀
-  token-start-with: Bearer
-  # 必须使用最少88位的Base64对该令牌进行编码
-  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
-  # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 14400000
-  # 在线用户key
-  online-key: online-token-
-  # 验证码
-  code-key: code-key-
-  # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
-  detect: 1800000
-  # 续期时间范围，默认1小时，单位毫秒
-  renew: 3600000
-
-#是否允许生成代码，生产环境设置为false
-generator:
-  enabled: false
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
-
-#是否开启 swagger-ui
-swagger:
-  enabled: false
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-    auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/*Mapper.xml
-#  type-aliases-package: com.tcpp.FqNotarize.entity
-  global-config:
-    # 逻辑删除配置
-    db-config:
-      # 删除前
-      logic-not-delete-value: 1
-      # 删除后
-      logic-delete-value: 0    
-
-# IP 本地解析
-ip:
-  local-parsing: true
-
-# 文件存储路径
-file:
-  mac:
-    path: ~/file/
-    avatar: ~/avatar/
-  linux:
-    path: /home/eladmin/file/
-    avatar: /home/eladmin/avatar/
-  windows:
-    path: C:\eladmin\file\
-    avatar: C:\eladmin\avatar\
-  # 文件大小 /M
-  maxSize: 100
-  avatarMaxSize: 5
-
-app:
-  background:
-    picture: https://flowbb.show.xjrkj.com/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
-  image:
-    url: https://www.flowbb.top/image/
-  upload:
-    path: /image/
-  host:
-    domain: https://www.flowbb.top/
-  push:
-    port: 8082
-  minio:
-    accesskey: minioadmin
-    secretkey: minioadmin
-    url: http://124.222.192.60:9000
-    bucketName: mytest      
-    preview: https://flowbb.show.xjrkj.com
-    
-tencent:
-  client:
-    webankAppId: TIDAeQGR
-    secret: Wqwpw09j9Yg4s2e1GbuiUoeRQjlKFA1oXTuVC8w1Cy1gOtnlq0xz9QrKvqCSOqJS
-    keyLicence: gKLyvw8NrVTuEWz3feO/QbeeE94SLjiWRN8hhn02DVDMuVeB6T/zKvSfxdfqWqLrJeFRyWeOFOuhoq52f6By4TAEDGIR6oczvFkYP4ycBeHvtnbmzNTx44mTx9h6mwUy5GMHSdsE7EKJ3K/5kZR1JrMrGBRG9Lb58U33zYyHKPeDm7nT3l8keTndTb6SOYB2Q4FY6F0uFpPEv7s/IzkxzOpfAdakQlTFwQ/y9sLF9rHw83DjdvWWXEpQ9wXYILTcjOXeKseyAzKuQq1zc7LQ9GVjpPcPx8pQkSyXeIOBYEe/oXx5w1RePHSCfLnjPaaIiN82eSIMA4GElErIjcagLA==
-  bank:
-    webankAppId: TIDAmm4i
-    secret: FAeFRoz5YxQkMyf1g0nSk7DVo7LQNmdAjKWxvwlxh5phMdftGt0nxdeX0FKXd7kD
-    keyLicence: XMKMHERS8SLw5DiM/nnFm/dRVQZ31//VbBhHXiVHgrX1ztbjUAwCrvTut3GoBFRPT5ubNc91yapZpagyIYgqKIRevdiAs4l6yML5yDP9sRwiYwaB4nOEWYILmCldg8w+Vr7t75puP7ofWkn2B5c5vE4HksFS4kqzj1zF6Kxlh+yNTCECObvKiDJdNqcXJKl0Dht9jtc5JojGPFPXYBAuN0manuUxpSwl5wq1H/OOhZ9RrklAqFxie4Z5r4PhEbiBKE6FAgwCNcE4NKNbk7Tr1VgMnOn/R4IqYbKaNA2u7OYaGBmSKuBPG5hcRl72k6XMqTYZnP85CybfQ/fEthVkvA==
-xxl:
-  job:
-    accessToken: Easd123%&$@#kllsdfPO[JasdfF
-    admin:
-      addresses: http://114.55.230.80:8080/xxl-job-admin
-    executor:
-      appname: eladmintest-xxl-job-executor
-      address:
-      ip:
-      port: 9998
-      logpath: /users/songxiaodong/applogs/xxl-job/jobhandler
-      logretentiondays: 30
+#配置数据源
+server:
+  port: 8000
+spring:
+  mvc:
+    static-path-pattern: /image/**
+  resources:
+    static-locations: file:/imagetest/,file:/imagetest/
+  datasource:
+    druid:
+      db-type: com.alibaba.druid.pool.DruidDataSource
+      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+      url: jdbc:log4jdbc:mysql://47.99.197.173:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+      username: root
+      password: fqgztemp123mysql
+      # 初始连接数
+      initial-size: 5
+      # 最小连接数
+      min-idle: 15
+      # 最大连接数
+      max-active: 30
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
+      # 获取连接超时时间
+      max-wait: 3000
+      # 连接有效性检测时间
+      time-between-eviction-runs-millis: 30000
+      # 连接在池中最小生存的时间
+      min-evictable-idle-time-millis: 30000
+      # 连接在池中最大生存的时间
+      max-evictable-idle-time-millis: 30000
+      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+      test-while-idle: true
+      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+      test-on-borrow: true
+      # 是否在归还到池中前进行检验
+      test-on-return: false
+      # 检测连接是否有效
+      validation-query: select 1
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
+      filter:
+        stat:
+          enabled: true
+          # 记录慢SQL
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  redis:
+    #数据库索引
+    database: 1
+    sentinel:
+      master: mymaster
+      nodes: 47.99.197.173:26379
+    password: 123qysd!@#
+    #连接超时时间
+    timeout: 10000
+# 登录相关配置
+login:
+  # 登录缓存
+  cache-enable: true
+  #  是否限制单用户登录
+  single-login: true
+  #  验证码
+  login-code:
+    #  验证码类型配置 查看 LoginProperties 类
+    code-type: arithmetic
+    #  登录图形验证码有效时间/分钟
+    expiration: 2
+    #  验证码高度
+    width: 111
+    #  验证码宽度
+    height: 36
+    # 内容长度
+    length: 2
+    # 字体名称，为空则使用默认字体
+    font-name:
+    # 字体大小
+    font-size: 25
+
+#jwt
+jwt:
+  header: Authorization
+  # 令牌前缀
+  token-start-with: Bearer
+  # 必须使用最少88位的Base64对该令牌进行编码
+  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
+  # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
+  token-validity-in-seconds: 14400000
+  # 在线用户key
+  online-key: online-token-
+  # 验证码
+  code-key: code-key-
+  # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
+  detect: 1800000
+  # 续期时间范围，默认1小时，单位毫秒
+  renew: 3600000
+
+#是否允许生成代码，生产环境设置为false
+generator:
+  enabled: false
+
+#如果生产环境要开启swagger，需要配置请求地址
+#springfox:
+#  documentation:
+#    swagger:
+#      v2:
+#        host: # 接口域名或外网ip
+
+#是否开启 swagger-ui
+swagger:
+  enabled: false
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/*Mapper.xml
+#  type-aliases-package: com.tcpp.FqNotarize.entity
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0    
+
+# IP 本地解析
+ip:
+  local-parsing: true
+
+# 文件存储路径
+file:
+  mac:
+    path: ~/file/
+    avatar: ~/avatar/
+  linux:
+    path: /home/eladmin/file/
+    avatar: /home/eladmin/avatar/
+  windows:
+    path: C:\eladmin\file\
+    avatar: C:\eladmin\avatar\
+  # 文件大小 /M
+  maxSize: 100
+  avatarMaxSize: 5
+
+app:
+  background:
+    picture: https://flowbb.show.xjrkj.com/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
+  image:
+    url: https://www.flowbb.top/image/
+  upload:
+    path: /image/
+  host:
+    domain: https://www.flowbb.top/
+  push:
+    port: 8082
+  minio:
+    accesskey: minioadmin
+    secretkey: minioadmin
+    url: http://124.222.192.60:9000
+    bucketName: mytest      
+    preview: https://flowbb.show.xjrkj.com
+    
+tencent:
+  client:
+    webankAppId: TIDAeQGR
+    secret: Wqwpw09j9Yg4s2e1GbuiUoeRQjlKFA1oXTuVC8w1Cy1gOtnlq0xz9QrKvqCSOqJS
+    keyLicence: gKLyvw8NrVTuEWz3feO/QbeeE94SLjiWRN8hhn02DVDMuVeB6T/zKvSfxdfqWqLrJeFRyWeOFOuhoq52f6By4TAEDGIR6oczvFkYP4ycBeHvtnbmzNTx44mTx9h6mwUy5GMHSdsE7EKJ3K/5kZR1JrMrGBRG9Lb58U33zYyHKPeDm7nT3l8keTndTb6SOYB2Q4FY6F0uFpPEv7s/IzkxzOpfAdakQlTFwQ/y9sLF9rHw83DjdvWWXEpQ9wXYILTcjOXeKseyAzKuQq1zc7LQ9GVjpPcPx8pQkSyXeIOBYEe/oXx5w1RePHSCfLnjPaaIiN82eSIMA4GElErIjcagLA==
+  bank:
+    webankAppId: TIDAmm4i
+    secret: FAeFRoz5YxQkMyf1g0nSk7DVo7LQNmdAjKWxvwlxh5phMdftGt0nxdeX0FKXd7kD
+    keyLicence: XMKMHERS8SLw5DiM/nnFm/dRVQZ31//VbBhHXiVHgrX1ztbjUAwCrvTut3GoBFRPT5ubNc91yapZpagyIYgqKIRevdiAs4l6yML5yDP9sRwiYwaB4nOEWYILmCldg8w+Vr7t75puP7ofWkn2B5c5vE4HksFS4kqzj1zF6Kxlh+yNTCECObvKiDJdNqcXJKl0Dht9jtc5JojGPFPXYBAuN0manuUxpSwl5wq1H/OOhZ9RrklAqFxie4Z5r4PhEbiBKE6FAgwCNcE4NKNbk7Tr1VgMnOn/R4IqYbKaNA2u7OYaGBmSKuBPG5hcRl72k6XMqTYZnP85CybfQ/fEthVkvA==
+xxl:
+  job:
+    accessToken: Easd123%&$@#kllsdfPO[JasdfF
+    admin:
+      addresses: http://114.55.230.80:8080/xxl-job-admin
+    executor:
+      appname: eladmintest-xxl-job-executor
+      address:
+      ip:
+      port: 9998
+      logpath: /users/songxiaodong/applogs/xxl-job/jobhandler
+      logretentiondays: 30
+
+logback:
+  logdir: ./logs/java-app

eladmin-system/src/main/resources/logback.xml

@@ -6,18 +6,17 @@
 <!-- 属性描述 scan：性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true scanPeriod:设置监测配置文件是否有修改的时间间隔， 
 	如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 debug:当此属性设置为true时，将打印出logback内部日志信息， 
 	实时查看logback运行状态。默认值为false。 -->
-<configuration scan="true" scanPeriod="60 seconds"
-	debug="false">
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
 	<!-- 定义参数常量 -->
 	<!-- logger.trace("msg" logger.debug... -->
 	<property name="log.level" value="debug" />
 	<!-- 日志最大的历史 30天 -->
 	<property name="log.maxHistory" value="30" />
 	<!-- 定义日志文件 输入位置 -->
-	<property name="log.filePath" value="./log" />
-	<property name="log.pattern"
-		value="%d{yyyy-MM-dd HH:mm:ss:SSS}[%thread]%-5level%logger{50}-%msg%n" />
+	<springProperty scope="context" name="log.filePath" source="logback.logdir" />
+	<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss:SSS}[%thread]%-5level%logger{50}-%msg%n" />
 	<property name="log.charset" value="utf-8" />
+
 	<!-- 控制台设置,控制台输出日志 -->
 	<appender name="console"
 		class="ch.qos.logback.core.ConsoleAppender">