Merge remote-tracking branch 'origin/master'

This commit is contained in:
joylink_zhangsai 2020-11-19 19:08:19 +08:00
commit cfa404807c

View File

@ -49,9 +49,6 @@ pagehelper:
reasonable: true reasonable: true
support-methods-arguments: true support-methods-arguments: true
params: count=countSql params: count=countSql
#mybatis:
# config-locations: classpath:mybatis/mybatis-config.xml
# mapper-locations: classpath:mybatis/mapper/**/*.xml
wechat: wechat:
app-id: wx41cb66db5faf330f app-id: wx41cb66db5faf330f
@ -97,9 +94,8 @@ tencent-cloud:
logging: logging:
file: file:
path: /logs/joylink/rtss path: /logs/joylink/rtss
pattern: level:
level: club.joylink.rtss: DEBUG
club.joylink.rtss: DEBUG
common: common:
env: dev env: dev
@ -122,9 +118,8 @@ tencent-cloud:
logging: logging:
file: file:
path: /usr/local/joylink/logs/rtss path: /usr/local/joylink/logs/rtss
pattern: level:
level: club.joylink.rtss: INFO
club.joylink.rtss: INFO
common: common:
env: test env: test
@ -150,9 +145,8 @@ file:
logging: logging:
file: file:
path: /usr/local/joylink/logs/rtss path: /usr/local/joylink/logs/rtss
pattern: level:
level: club.joylink.rtss: INFO
club.joylink.rtss: INFO
common: common:
env: prd env: prd
@ -171,9 +165,8 @@ tencent-cloud:
logging: logging:
file: file:
path: /usr/local/joylink/logs/rtss path: /usr/local/joylink/logs/rtss
pattern: level:
level: club.joylink.rtss: INFO
club.joylink.rtss: INFO
common: common:
env: local env: local