Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBusinessBiz.java

@@ -98,9 +98,13 @@ public class UserBusinessBiz {
         if (leaderId != 0) {
             Map<Integer, AppUserLogin> userIdAndUserLoginMap = appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(Arrays.asList(leaderId));
             Map<Integer, AppUserDetail> userIdAndUserDetailMap = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(leaderId));
+            if (!userIdAndUserLoginMap.isEmpty()){
                 promoteBO.setLeaderUsername(userIdAndUserLoginMap.get(leaderId).getUsername());
+            }
+            if (!userIdAndUserDetailMap.isEmpty()){
                 promoteBO.setLeaderHeadUrl(userIdAndUserDetailMap.get(leaderId).getHeadimgurl());
             }
+        }
         promoteBO.setInviteNumber(memberStateAndCountMap.get(0));
         promoteBO.setActivatedNumber(memberStateAndCountMap.get(1));
 

xx-universal/xx-universal-server/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
-	<property name="LOG_HOME" value="${system.log.path:-logs}"/>
+	<property name="LOG_HOME" value="logs" />
 
 	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
@@ -17,28 +17,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
-		<filter class="com.xxfc.platform.universal.filter.DenyFilter"></filter>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-		</encoder>
-	</appender>
-	
-	<appender name="WEB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
-		<filter class="com.xxfc.platform.universal.filter.AcceptFilter"></filter>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-		</encoder>
-	</appender>
-	
 	<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
 		<destination>192.168.0.181:5044</destination>
 
@@ -52,5 +30,6 @@
 
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
+		<appender-ref ref="LOGSTASH" />
 	</root>
 </configuration>
\ No newline at end of file