Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -103,6 +103,7 @@ public class KylinOrderTicketVo implements Serializable {
 
     private Integer isTrueName;
     private String noticeImage;
+    private String notice;
     private Integer ticketType;
     private String fieldName;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ liquidnet:
     context:
     name: liquidnet-client-admin-web
   logfile:
-    path: ./logs
+    path: /data/logs
     name: client-admin-web
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ liquidnet:
     context:
     name: liquidnet-client-admin-web
   logfile:
-    path: ./logs
+    path: /data/logs
     name: client-admin-web
     config: classpath:logback-spring.xml
     file-max-size: 200MB
@@ -15,34 +15,46 @@ liquidnet:
     level-root: info
   mysql:
     master:
-      urlHostAndPort: 39.106.122.201:3308
-      username: testmall
-      password: zhengzai!mYT
+      urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306
+      username: zhengzai
+      password: $hAh4SGcDQ
       database-name: test_ln_scene
     slave:
-      urlHostAndPort: 39.106.122.201:3308
-      username: testmall
-      password: zhengzai!mYT
+      urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306
+      username: zhengzai
+      password: $hAh4SGcDQ
       database-name: test_ln_scene
+  mongodb:
+    host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
+    port: 3717
+    user: root
+    pwd: $hAh4SGcDQ
+    sslEnabled: false
+    database: test_ln_scene
+  redis:
+    host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+    #    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
+    port: 6380
+    password: PO@B!Iud32
   url-refund:
-    apply: "http://pay.zhengzai.tv/refund/single"
-    notify: "https://kylin.zhengzai.tv/kylin/refund/callback"
+    apply: "http://testpay.zhengzai.tv/refund/single"
+    notify: "https://testkylin.zhengzai.tv/kylin/refund/callback"
   url-banner:
-    provinces: "https://service.zhengzai.tv/provinces" #省份
-    url1: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
-    url2: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
-    url5: "https://mall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
+    provinces: "https://testservice.zhengzai.tv/provinces" #省份
+    url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
+    url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
+    url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
     url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
-    url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
-    url8: "https://kylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
-    url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
-    url14: "https://mall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
-    url20: "https://merchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
-    url21: "https://merchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
-    url22: "https://merchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
-    url23: "https://mediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
-    url24: "https://merchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
-    url26: "https://passport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
+    url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
+    url8: "https://testkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
+    url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
+    url14: "https://testmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
+    url20: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
+    url21: "https://testmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
+    url22: "https://testmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
+    url23: "https://testmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
+    url24: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
+    url26: "https://testpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
   al-oss:
     imgUrl: "https://img.zhengzai.tv/"
     endpoint: http://oss-cn-hangzhou.aliyuncs.com

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ liquidnet:
     context:
     name: liquidnet-client-admin-web
   logfile:
-    path: ./logs
+    path: /data/logs
     name: client-admin-web
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
         context:
         name: liquidnet-client-admin-web
     logfile:
-        path: ./logs
+        path: /data/logs
         name: client-admin-web
         config: classpath:logback-spring.xml
         file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-dev.yml

@@ -5,6 +5,6 @@ liquidnet:
     port: 8090
   logfile:
     name: client-job
-    path: ./logs
+    path: /data/logs
   mysql:
     database-name: dev_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-test.yml

@@ -5,6 +5,6 @@ liquidnet:
     port: 8090
   logfile:
     name: client-job
-    path: ./logs
+    path: /data/logs
   mysql:
     database-name: test_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-account-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-account
     name: liquidnet-service-account
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-account
   mysql:
     database-name: liquidnet_wac

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -7,13 +7,10 @@ liquidnet:
     context: /adam
     name: liquidnet-service-adam
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-adam
     config: classpath:logback-spring.xml
     file-max-size: 200MB
-    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
   rabbitmq:
     connection-timeout: 5000

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -7,13 +7,10 @@ liquidnet:
     context: /adam
     name: liquidnet-service-adam
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-adam
     config: classpath:logback-spring.xml
     file-max-size: 200MB
-    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
   rabbitmq:
     connection-timeout: 3000

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -22,13 +22,13 @@ logging:
 #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: 200MB
+    max-size: ${liquidnet.logfile.file-max-size}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: info
+    root: ${liquidnet.logfile.level}
     #以下是为指定包设置日志级别
     com.liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-bank-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-bank
     name: liquidnet-service-bank
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-bank
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dev.yml

@@ -8,7 +8,7 @@ liquidnet:
 #    context: /service-consumer
     name: liquidnet-service-consumer
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-consumer
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-test.yml

@@ -8,7 +8,7 @@ liquidnet:
 #    context: /service-consumer
     name: liquidnet-service-consumer
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-consumer
     config: classpath:logback-spring.xml
     file-max-size: 200MB

liquidnet-bus-config/liquidnet-config/liquidnet-service-example-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-example
     name: liquidnet-service-example
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-example
   mysql:
     database-name: liquidnet_bus

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-executor-main
     name: liquidnet-service-executor-main
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-executor-main
   xxl:
     accessToken: qk52rqSejRBm9enf6BTTxw==
@@ -20,4 +20,4 @@ liquidnet:
       # Job执行器心跳注册分组依据，按需配置
       appname: liquidnet-service-executor
       # Job执行器运行日志，注意目录读写权限
-      logpath: ./logs/job
+      logpath: /data/logs/job

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-test.yml

@@ -4,7 +4,7 @@ liquidnet:
     context: /service-executor-main
     name: liquidnet-service-executor-main
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-executor-main
   xxl:
     accessToken: qk52rqSejRBm9enf6BTTxw==
@@ -20,4 +20,4 @@ liquidnet:
       # Job执行器心跳注册分组依据，按需配置
       appname: liquidnet-service-executor
       # Job执行器运行日志，注意目录读写权限
-      logpath: ./logs/job
+      logpath: /data/logs/job

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -7,14 +7,14 @@ liquidnet:
     context: /kylin
     name: liquidnet-service-kylin
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-kylin
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level: info
   rabbitmq:
     connection-timeout: 5000
   mysql:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -7,14 +7,14 @@ liquidnet:
     context: /kylin
     name: liquidnet-service-kylin
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-kylin
     config: classpath:logback-spring.xml
     file-max-size: 200MB
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level: info
   rabbitmq:
     connection-timeout: 3000
   mysql:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -22,16 +22,16 @@ logging:
 #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: 200MB
+    max-size: ${liquidnet.logfile.file-max-size}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: info
+    root: ${liquidnet.logfile.level}
     #以下是为指定包设置日志级别
     com:
-      liquidnet: debug
+      liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------
 eureka:
 #  client:

liquidnet-bus-config/liquidnet-config/liquidnet-service-reconciliation-dev.yml

@@ -5,7 +5,7 @@ liquidnet:
     context: /service-reconciliation
     name: liquidnet-service-reconciliation
   logfile:
-    path: ./logs
+    path: /data/logs
     name: service-reconciliation
   mysql:
     main-db:

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-dev.yml

@@ -3,6 +3,6 @@ liquidnet:
     port: 7003
     name: liquidnet-support-zuul
   logfile:
-    path: ./logs
+    path: /data/logs
     name: support-zuul
     level: debug

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-test.yml

@@ -3,7 +3,7 @@ liquidnet:
     port: 80
     name: liquidnet-support-zuul
   logfile:
-    path: ./logs
+    path: /data/logs
     name: support-zuul
     level: debug
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/DataImpl.java

@@ -507,16 +507,18 @@ public class DataImpl {
                     }
 
                     //演出
-                    String performancedSql = "select time_start,img_poster,need_id_card from performances where id =" + orderData.getInt("performance_id");
+                    String performancedSql = "select time_start,img_poster,need_id_card,notice from performances where id =" + orderData.getInt("performance_id");
                     pstmt = con.prepareStatement(performancedSql);
                     ResultSet performanceData = pstmt.executeQuery();
                     String performanceTimeStart = "";
                     String performanceImg = "";
                     int isTrueName = 0;
+                    String notice = "";
                     while (performanceData.next()) {
                         performanceTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmssS.parse(performanceData.getTimestamp("time_start").toString()));
                         performanceImg=performanceData.getString("img_poster");
                         isTrueName=performanceData.getString("need_id_card").equals("yes")?1:0;
+                        notice=performanceData.getString("notice");
                     }
 
                     orderTickets.setOrderTicketsId(orderData.getInt("id") + "");
@@ -635,6 +637,7 @@ public class DataImpl {
                     orderTicketVo.setIsTrueName(isTrueName);
                     orderTicketVo.setOverdueAt(orderTickets.getCreatedAt().plusMinutes(orderTickets.getPayCountdownMinute()).plusSeconds(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     orderTicketVo.setNoticeImage("[{\"id\":1,\"sort\":1,\"message\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"message\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"message\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"message\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
+                    orderTicketVo.setNotice(notice);
                     orderTicketVo.setTicketType(ticketType);
                     orderTicketVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + orderTicketRelations.getPerformanceId(), "name"));
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -962,6 +962,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                 orderTicketVo.setIsTrueName(ticketVo.getIsTrueName());
                 orderTicketVo.setNoticeImage(performanceVo.getNoticeImage());
+                orderTicketVo.setNotice(performanceVo.getNotice());
                 orderTicketVo.setTicketType(ticketVo.getType());
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
                 if (ticketVo.getIsShowCode() == 1) {

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ liquidnet:
     path: ./logs
     name: support-config
   eureka:
-    host: 127.0.0.1:7001
+    host: 172.17.207.177:7001
   rabbitmq:
     host: 127.0.0.1
     port: 5672

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server1.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server2.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server3.yml

+liquidnet:
+  logfile:
+    path: /data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application.yml

+liquidnet:
+  logfile:
+    path: /Users/anjiabin/data/logs
+    name: support-eureka
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+
 server:
   port: 7001
   servlet:
@@ -33,24 +43,16 @@ eureka:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}
 #     hostname: localhost
-liquidnet:
-  logfile:
-    path: /logfile
-    name: liquidnet-eureka-server.log
 
 logging:
-  config: classpath:logback-spring.xml
-  path: ${liquidnet.logfile.path}
-#logging:
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        stellar:
-#          controller: info
-##  pattern:
-##    console: %d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n
-##    file: %d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com.liquidnet: ${liquidnet.logfile.level}