瀏覽代碼

排除部分不需要校验tenantId的接口,避免循环调用

zouxuan 3 年之前
父節點
當前提交
cff2e08a89

+ 3 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -36,7 +36,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/queryUserInfo");
+		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").
+				excludePathPatterns("/queryUserInfo","/user/queryUserByPhone","/user/add",
+						"user/queryUserById/*","/role/queryRoleCodeListByUserId","/user/updateSysUser");
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/userDevice/unbind").excludePathPatterns("/*");
 	}
 	

+ 4 - 4
mec-im/src/main/java/com/ym/config/WebMvcConfig.java

@@ -54,10 +54,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/v2/api-docs","/user/register",
-				"/group/join","/group/create","/group/quit","/room/leave","/room/statusSync",
-				"/room/statusImMsg","/group/batchDismiss","/private/send","/group/send",
-				"/group/dismiss","/room/statusImMsg","/history/get");
+		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/v2/api-docs",
+				"/group/*","/room/statusSync",
+				"/room/statusImMsg","/private/*","/system/*",
+				"/room/statusImMsg","/history/get","/user/*","/push/*");
 	}
 
 	@SuppressWarnings("rawtypes")

+ 0 - 4
mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -1,8 +1,6 @@
 package com.ym.controller;
 
-import com.ym.mec.common.entity.ImBaseMessage;
 import com.ym.mec.common.entity.ImGroupMessage;
-import com.ym.mec.common.entity.ImNoticeMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
 import com.ym.pojo.NoticeMessage;
 import com.ym.service.GroupService;
@@ -13,9 +11,7 @@ import io.rong.models.group.GroupModel;
 import io.rong.models.group.UserGroup;
 import io.rong.models.message.GroupMessage;
 import io.rong.models.message.MentionMessage;
-import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 0 - 3
mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -1,12 +1,9 @@
 package com.ym.controller;
 
-import com.ym.mec.common.entity.ImGroupMessage;
 import com.ym.mec.common.entity.ImPrivateMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
-import com.ym.pojo.CustomMessage;
 import com.ym.service.MessageService;
 import io.rong.messages.TxtMessage;
-import io.rong.models.message.GroupMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;

+ 0 - 1
mec-im/src/main/java/com/ym/interceptor/TenantInterceptor.java

@@ -49,5 +49,4 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 		TenantContextHolder.clearTenantId();
 	}
-
 }