zouxuan 5 年之前
父节点
当前提交
ae3eb6259d

+ 6 - 10
mec-student/src/main/java/com/ym/mec/student/controller/SysConfigController.java

@@ -1,22 +1,19 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.common.filters.TenantIdThreadLocal;
+import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.entity.SysConfig;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /** 
  * 系统配置控制层
@@ -32,7 +29,6 @@ public class SysConfigController extends BaseController {
 	@ApiOperation(value = "参数列表")
 	@GetMapping(value = "list")
 	public Object configList(String group) {
-		Integer integer = TenantIdThreadLocal.get();
 		Map<String,Object> params = new HashMap<String, Object>();
 		params.put("group", group);
 		List<SysConfig> configs = sysConfigService.findAll(params);

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

@@ -50,5 +50,6 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 		MDC.remove(USERNAME);
 		MDC.remove(IP);
+		TenantIdThreadLocal.remove();
 	}
 }

+ 0 - 1
mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSubjectController.java

@@ -44,7 +44,6 @@ public class TeacherSubjectController extends BaseController {
     public Object findSubSubjects(Integer tenantId){
         if(tenantId == null){
             tenantId = TenantIdThreadLocal.get();
-            TenantIdThreadLocal.remove();
         }
         return succeed(subjectService.findSubSubjects(tenantId));
     }

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

@@ -37,4 +37,9 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 		}
 		return true;
 	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+		TenantIdThreadLocal.remove();
+	}
 }