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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -122,8 +122,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private TenantContractTemplateDao tenantContractTemplateDao;
     @Autowired
     private SysUserTenantService sysUserTenantService;
-    @Autowired
-    private SysUserServiceImpl sysUserService;
 
     @Value("${contract.baseDir:/var/pdf}")
     private String contractBaseDir;
@@ -1148,7 +1146,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         }
 
         if (StringUtils.isBlank(tenantId)) {
-            SysUser sysUser = sysUserService.getSysUser();
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
             if (sysUser != null && sysUser.getTenantId() != null) {
                 tenantId = sysUser.getTenantId().toString();
             }

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3546,7 +3546,7 @@
             #{item}
         </foreach>
         AND new_course_id_ IS NOT NULL AND pre_course_flag_ = 0
-        AND status_ = 'NOT_START' AND del_flag_ = 0
+        AND status_ = 'NOT_START'
     </select>
     <select id="getLock" resultMap="CourseSchedule">
         SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE

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

@@ -47,7 +47,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 "/musicGroup/getGradeList",
                 "/studentCompetition/get","/musicGroup/preRegister",
                 "/tenantInfo/queryTenantInfoByOrgan/**",
-                "/subject/list","/tenantApply/add","/questionnaireUserResult/add",
+                "/subject/list","/tenantApply/add","/questionnaireUserResult/add","/questionnaireTopic/getDetail",
                 "/musicEnlightenmentQuestionnaire/addEnlightenmentQuestionnaire", "/musicEnlightenmentQuestionnaire/getUserMusicEnlightenmentQuestionnaire").permitAll().anyRequest().authenticated().and().httpBasic();
     }
 

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

@@ -1,33 +1,31 @@
 package com.ym.mec.web.interceptor;
 
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ym.mec.biz.handler.SysUserContextHolder;
-import com.ym.mec.biz.service.impl.SysUserServiceImpl;
+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 com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.yonge.log.interceptor.AuditLogInterceptor;
+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
-	private SysUserServiceImpl sysUserService;
+	@Lazy
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
-		SysUser sysUser = sysUserService.getSysUser();
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		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/TenantInterceptor.java

@@ -1,6 +1,5 @@
 package com.ym.mec.web.interceptor;
 
-import com.ym.mec.biz.handler.SysUserContextHolder;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,6 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 		TenantContextHolder.clearTenantId();
-		SysUserContextHolder.clearSysUser();
 	}
 
 }