Merge remote-tracking branch 'origin/master'

mec-student/src/main/java/com/ym/mec/student/config/WebMvcConfig.java

@@ -3,6 +3,7 @@ package com.ym.mec.student.config;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ym.mec.student.interceptor.OperationLogInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
@@ -22,6 +23,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Autowired
 	private MDCInterceptor mdcInterceptor;
 
+	@Autowired
+	private OperationLogInterceptor operationLogInterceptor;
+
 	/**
 	 * 枚举类的转换器 addConverterFactory
 	 */
@@ -41,6 +45,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		excludePathPatterns.add("/login");
 
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+
+		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");
 	}
 
 	@Bean

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

@@ -0,0 +1,31 @@
+package com.ym.mec.student.interceptor;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.yonge.log.interceptor.AuditLogInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class OperationLogInterceptor extends AuditLogInterceptor {
+
+	@Autowired
+	@Lazy
+	private SysUserFeignService sysUserFeignService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser != null) {
+			setUsername(sysUser.getRealName());
+		}
+		return true;
+	}
+
+}

mec-teacher/src/main/java/com/ym/mec/teacher/config/WebMvcConfig.java

@@ -12,6 +12,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.ym.mec.teacher.interceptor.MDCInterceptor;
+import com.ym.mec.teacher.interceptor.OperationLogInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
@@ -49,6 +50,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Autowired
 	private MDCInterceptor mdcInterceptor;
 
+	@Autowired
+	private OperationLogInterceptor operationLogInterceptor;
+
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		List<String> includePathPatterns = new ArrayList<String>();
@@ -56,6 +60,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		List<String> excludePathPatterns = new ArrayList<String>();
 		excludePathPatterns.add("/login");
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+
+		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");
 	}
 
 	/**

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

@@ -0,0 +1,31 @@
+package com.ym.mec.teacher.interceptor;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.yonge.log.interceptor.AuditLogInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class OperationLogInterceptor extends AuditLogInterceptor {
+
+	@Autowired
+	@Lazy
+	private SysUserFeignService sysUserFeignService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser != null) {
+			setUsername(sysUser.getRealName());
+		}
+		return true;
+	}
+
+}