Merge remote-tracking branch 'origin/saas' into saas

cms/src/main/java/com/ym/mec/cms/interceptor/OperationLogInterceptor.java

@@ -24,8 +24,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/interceptor/OperationLogInterceptor.java

@@ -28,7 +28,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 			SysUser sysUser = sysUserService.get(authUser.getUserId());
 
 			if (sysUser != null) {
-				setUsername(sysUser.getRealName(), sysUser.getId());
+				setUsername(sysUser.getRealName(), sysUser.getId(), sysUser.getTenantId() + "");
 			}
 		}
 		return true;

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -43,6 +43,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
     private String username;
 
     private Integer userId;
+    
+    private String tenantId;
 
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -147,8 +149,9 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
         auditLogService.insert(auditLog);
     }
 
-    public void setUsername(String username, Integer userId) {
+    public void setUsername(String username, Integer userId, String tenantId) {
         this.username = username;
         this.userId = userId;
+        this.tenantId = tenantId;
     }
 }

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

@@ -22,8 +22,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

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

@@ -22,8 +22,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

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

@@ -24,8 +24,8 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+		if (sysUser != null && sysUser.getId() != null) {
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}

mec-websocket/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId());
+			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
 		}
 		return true;
 	}