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
support-methods-arguments: true
params: count=countSql
#mybatis:
# config-locations: classpath:mybatis/mybatis-config.xml
# mapper-locations: classpath:mybatis/mapper/**/*.xml
wechat:
app-id: wx41cb66db5faf330f
@ -97,7 +94,6 @@ tencent-cloud:
logging:
file:
path: /logs/joylink/rtss
pattern:
level:
club.joylink.rtss: DEBUG
@ -122,7 +118,6 @@ tencent-cloud:
logging:
file:
path: /usr/local/joylink/logs/rtss
pattern:
level:
club.joylink.rtss: INFO
@ -150,7 +145,6 @@ file:
logging:
file:
path: /usr/local/joylink/logs/rtss
pattern:
level:
club.joylink.rtss: INFO
@ -171,7 +165,6 @@ tencent-cloud:
logging:
file:
path: /usr/local/joylink/logs/rtss
pattern:
level:
club.joylink.rtss: INFO