Merge branch 'master' into JCB-KF

base-modules/service-file/src/main/resources/logback.xml

@@ -58,9 +58,9 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+<!--	<logger name="com.ruoyi" level="info" />-->
 	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+<!--	<logger name="org.springframework" level="warn" />-->
 
 	<root level="info">
 		<appender-ref ref="console" />

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TenantConfigController.java

@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 个人中心
  *
  * @author ya
  * @since 2022-05-05

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

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/usky-system" />
+	<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="SQL_PACKAGE" value="com.usky.system.mapper"/>
+
     <!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -12,6 +14,20 @@
 		</encoder>
 	</appender>
 
+    <appender name="file_sql" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>${log.path}/sql.log</File>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <maxIndex>10</maxIndex>
+            <fileNamePattern>${log.path}/sql.log.%i</fileNamePattern>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>100MB</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+
     <!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/info.log</file>
@@ -58,17 +74,19 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.usky" level="info" />
+<!--	<logger name="com.usky" level="info" />-->
 	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+<!--	<logger name="org.springframework" level="warn" />-->
 
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
+    <logger name="${SQL_PACKAGE}" additivity="false" level="DEBUG">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file_sql"/>
+    </logger>
 	
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
+        <appender-ref ref="console" />
     </root>
 </configuration>