Merge remote-tracking branch 'origin/master'

src/main/resources/application.yml

@@ -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,9 +94,8 @@ tencent-cloud:
 logging:
   file:
     path: /logs/joylink/rtss
-  pattern:
-    level:
-      club.joylink.rtss: DEBUG
+  level:
+    club.joylink.rtss: DEBUG
 
 common:
   env: dev
@@ -122,9 +118,8 @@ tencent-cloud:
 logging:
   file:
     path: /usr/local/joylink/logs/rtss
-  pattern:
-    level:
-      club.joylink.rtss: INFO
+  level:
+    club.joylink.rtss: INFO
 
 common:
   env: test
@@ -150,9 +145,8 @@ file:
 logging:
   file:
     path: /usr/local/joylink/logs/rtss
-  pattern:
-    level:
-      club.joylink.rtss: INFO
+  level:
+    club.joylink.rtss: INFO
 
 common:
   env: prd
@@ -171,9 +165,8 @@ tencent-cloud:
 logging:
   file:
     path: /usr/local/joylink/logs/rtss
-  pattern:
-    level:
-      club.joylink.rtss: INFO
+  level:
+    club.joylink.rtss: INFO
 
 common:
   env: local