Merge branch 'dev' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/resources/logback.xml

@@ -3,8 +3,8 @@
     <!-- 日志存放路径 -->
 	<property name="log.path" value="/var/log/uskycloud/service-system" />
    <!-- 日志输出格式 -->
-<!--	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />-->
-    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) -- [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />
+	<property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
+<!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->
 
 
     <property name="SQL_PACKAGE" value="com.usky.system.mapper"/>