Merge branch 'v1.4' into master

backend/src/main/java/io/metersphere/service/UserService.java

@@ -320,6 +320,10 @@ public class UserService {
     public void updateUser(User user) {
         user.setUpdateTime(System.currentTimeMillis());
         userMapper.updateByPrimaryKeySelective(user);
+        // 禁用用户之后，剔除在线用户
+        if (StringUtils.equals(user.getStatus(), UserStatus.DISABLED)) {
+            SessionUtils.kickOutUser(user.getId());
+        }
     }
 
     public void switchUserRole(String sign, String sourceId) {

backend/src/main/resources/logback.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
-    <property resource="application.properties"/>
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
-        </encoder>
-    </appender>
+	<property resource="application.properties"/>
+	<property file="/opt/metersphere/conf/metersphere.properties"/>
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
 
 	<appender name="debugAppender"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>DEBUG</level>
 			<onMatch>ACCEPT</onMatch>
@@ -142,7 +143,7 @@
 
 	<root level="INFO">
 		<appender-ref ref="infoAsyncAppender" />
-		<appender-ref ref="console" />
+		<appender-ref ref="console"/>
 	</root>
 
 	<logger name="io.metersphere" additivity="false">
@@ -152,6 +153,10 @@
 		<appender-ref ref="errorAsyncAppender"/>
 	</logger>
 
+	<logger name="io.metersphere.base.mapper" level="${logger.sql.level:ERROR}">
+		<appender-ref ref="console"/>
+	</logger>
+
 	<logger name="io.metersphere.Application" additivity="false" level="${logger.level:INFO}">
 		<appender-ref ref="infoAsyncAppender"/>
 	</logger>