소스 검색

新增教研分析授权配置

wangliang 3 년 전
부모
커밋
dd7e09c510

+ 7 - 1
teachcloud-report/src/main/java/com/qmth/teachcloud/report/auth/TeachcloudReportAuthenticationService.java

@@ -12,6 +12,7 @@ import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PrivilegePropertyEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
+import com.qmth.teachcloud.common.service.AuthInfoService;
 import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -22,7 +23,6 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
@@ -39,6 +39,9 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
     @Resource
     DictionaryConfig dictionaryConfig;
 
+    @Resource
+    AuthInfoService authInfoService;
+
     @Override
     public AccessEntity findByIdentity(String identity, SignatureType signatureType, String path) {
         return new TeachcloudReportSession(identity, SignatureType.TOKEN);
@@ -117,6 +120,9 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
         if (count > 0) {
             return true;
         }
+        if (Objects.nonNull(authBean.getSchool())) {
+            authInfoService.appHasExpired(authBean.getSchool().getCode());
+        }
         //系统公用接口不拦截
         Set<String> sysUrls = commonCacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
         int sysCount = Objects.nonNull(sysUrls) ? (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(path)).count() : 0;

+ 6 - 2
teachcloud-report/src/main/java/com/qmth/teachcloud/report/start/StartRunning.java

@@ -1,7 +1,7 @@
 package com.qmth.teachcloud.report.start;
 
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.service.OrgCenterDataDisposeService;
+import com.qmth.teachcloud.common.service.AuthInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
@@ -20,14 +20,18 @@ import javax.annotation.Resource;
 public class StartRunning implements CommandLineRunner {
     private final static Logger log = LoggerFactory.getLogger(StartRunning.class);
 
+//    @Resource
+//    private OrgCenterDataDisposeService orgCenterDataDisposeService;
+
     @Resource
-    private OrgCenterDataDisposeService orgCenterDataDisposeService;
+    AuthInfoService authInfoService;
 
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         SystemConstant.initTempFiles();
 //        orgCenterDataDisposeService.updateSchoolInfo();
+        authInfoService.appInfoInit();
         log.info("服务器启动时执行 end");
     }
 }

+ 2 - 0
teachcloud-report/src/main/resources/application-dev.properties

@@ -143,6 +143,8 @@ print.open.paperStructure=/api/admin/print/open/paper_structure
 print.open.paperEvaluation=/api/admin/print/open/paper_evaluation
 print.open.examStudentScore=/api/admin/print/open/exam_student_score
 
+com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic
+
 #============================================================================
 # \u914D\u7F6EJobStore
 #============================================================================