记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit a2cab66f authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev' into test

parents 2ba82c9f 7d6a02ed
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 331 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
......@@ -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
View file @ a2cab66f
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
View file @ a2cab66f
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
View file @ a2cab66f
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
View file @ a2cab66f
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}
liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/logback-spring.xml deleted 100644 → 0
View file @ 2ba82c9f
<?xml version="1.0" encoding="UTF-8"?>
<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
<!-- scan:当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true -->
<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
<configuration scan="true" scanPeriod="10 seconds">
<!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
<property name="log.path" value="./logs/eureka/" />
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<!--输出到控制台-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<encoder>
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
<!-- 设置字符集 -->
<charset>UTF-8</charset>
</encoder>
</appender>
<!--输出到文件-->
<!-- 时间滚动输出 level为 DEBUG 日志 -->
<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_debug.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
<fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>debug</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 INFO 日志 -->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_info.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天日志归档路径以及格式 -->
<fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>info</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 WARN 日志 -->
<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_warn.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 ERROR 日志 -->
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_error.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!--
<logger>用来设置某一个包或者具体的某一个类的日志打印级别、
以及指定<appender>。<logger>仅有一个name属性，
一个可选的level和一个可选的addtivity属性。
name:用来指定受此logger约束的某一个包或者具体的某一个类。
level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
如果未设置此属性，那么当前logger将会继承上级的级别。
addtivity:是否向上级logger传递打印信息。默认是true。
-->
<!--<logger name="org.springframework.web" level="info"/>-->
<!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>-->
<!--
使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-->
<!--
root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
不能设置为INHERITED或者同义词NULL。默认是DEBUG
可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-->
<!--开发环境:打印控制台-->
<springProfile name="dev">
<logger name="com.liquidnet" level="debug"/>
</springProfile>
<root level="info">
<appender-ref ref="CONSOLE" />
<appender-ref ref="DEBUG_FILE" />
<appender-ref ref="INFO_FILE" />
<appender-ref ref="WARN_FILE" />
<appender-ref ref="ERROR_FILE" />
</root>
<!--生产环境:输出到文件-->
<!--<springProfile name="pro">-->
<!--<root level="info">-->
<!--<appender-ref ref="CONSOLE" />-->
<!--<appender-ref ref="DEBUG_FILE" />-->
<!--<appender-ref ref="INFO_FILE" />-->
<!--<appender-ref ref="ERROR_FILE" />-->
<!--<appender-ref ref="WARN_FILE" />-->
<!--</root>-->
<!--</springProfile>-->
</configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment