Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-student/src/main/java/com/ym/mec/student/interceptor/MDCInterceptor.java

@@ -1,22 +1,19 @@
 package com.ym.mec.student.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
-
-import org.apache.commons.lang3.StringUtils;
+import com.ym.mec.util.web.WebUtil;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import com.ym.mec.util.web.WebUtil;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.UUID;
 
 @Component
 public class MDCInterceptor extends HandlerInterceptorAdapter {
@@ -24,6 +21,8 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 	private static final String IP = "ip";
 
 	private static final String USERNAME = "username";
+
+	private static final String REQ_ID = "reqId";
 	@Autowired
 	@Lazy
 	private SysUserFeignService sysUserFeignService;
@@ -39,13 +38,11 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 			}else {
 				TenantIdThreadLocal.set(1);
 			}
+			// 存储userId以及IP
+			MDC.put(USERNAME, sysUser.getUsername() + "@" + sysUser.getId());
 		}
-		String username = "";
-		String userId = "";
-		// 存储userId以及IP
-		MDC.put(USERNAME, username + "@" + userId);
 		MDC.put(IP, WebUtil.getRemoteIp(request));
-
+		MDC.put(REQ_ID, UUID.randomUUID().toString());
 		return true;
 	}
 

mec-student/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/student-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{reqId} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/MDCInterceptor.java

@@ -6,6 +6,8 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 
+import com.ym.mec.util.web.WebUtil;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -14,9 +16,13 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.UUID;
 
 @Component
 public class MDCInterceptor extends HandlerInterceptorAdapter {
+	private static final String IP = "ip";
+	private static final String USERNAME = "username";
+	private static final String REQ_ID = "reqId";
 	@Autowired
 	@Lazy
 	private SysUserFeignService sysUserFeignService;
@@ -37,7 +43,11 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 					TenantIdThreadLocal.set(1);
 				}
 			}
+			// 存储userId以及IP
+			MDC.put(USERNAME, sysUser.getRealName() + "@" + sysUser.getId());
 		}
+		MDC.put(IP, WebUtil.getRemoteIp(request));
+		MDC.put(REQ_ID, UUID.randomUUID().toString());
 		return true;
 	}
 

mec-teacher/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/teacher-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{reqId} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">