机构中心集成

themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java

@@ -101,6 +101,9 @@ public class SysController {
     @Resource
     TMTencentVideoMessageService tencentVideoMessageService;
 
+    @Resource
+    AuthInfoService authInfoService;
+
     @ApiOperation(value = "菜单查询接口")
     @RequestMapping(value = "/getMenu", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "菜单信息", response = TBPrivilege.class)})
@@ -229,9 +232,8 @@ public class SysController {
         }
         if (!Objects.equals(code.toUpperCase(), SystemConstant.ADMIN)) {
             TBOrg tbOrg = cacheService.addOrgCodeCache(code);
-            if (Objects.isNull(tbOrg)) {
-                throw new BusinessException(ExceptionResultEnum.ORG_NO);
-            }
+            Optional.ofNullable(tbOrg).orElseThrow(() -> new BusinessException(ExceptionResultEnum.ORG_NO));
+            authInfoService.appHasExpired(code);
             return ResultUtil.ok(Collections.singletonMap("logo", tbOrg.getLogo()));
         } else {
             return ResultUtil.ok(Collections.singletonMap("logo", dictionaryConfig.sysDomain().getAdminLogoUrl()));

themis-admin/src/main/java/com/qmth/themis/admin/api/TBClientDownloadController.java

@@ -1,23 +0,0 @@
-package com.qmth.themis.admin.api;
-
-
-import io.swagger.annotations.Api;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 客户端下载管理 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2022-09-05
- */
-@Api(tags = "客户端下载管理Controller")
-@RestController
-@RequestMapping("/${prefix.url.admin}/download")
-@Validated
-public class TBClientDownloadController {
-
-}

themis-admin/src/main/java/com/qmth/themis/admin/start/StartRunning.java

@@ -1,12 +1,14 @@
 package com.qmth.themis.admin.start;
 
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.service.AuthInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.File;
 
 /**
@@ -23,15 +25,15 @@ public class StartRunning implements CommandLineRunner {
     @Value("${spring.application.name}")
     String applicationName;
 
-//    @Resource
-//    AuthInfoService authInfoService;
+    @Resource
+    AuthInfoService authInfoService;
 
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         SystemConstant.initTempFiles();
         SystemConstant.getSearcher(SystemConstant.TEMP_FILES_DIR + File.separator + applicationName);
-//        authInfoService.appInfoInit();
+        authInfoService.appInfoInit();
         log.info("服务器启动时执行 end");
     }
 }

themis-admin/src/main/resources/application-dev.properties

@@ -215,8 +215,8 @@ prefix.url.notify=api/notify
 
 monitor.config.prefix=oe_test
 
-#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+com.qmth.solar.access-key=8134f6aae0134770b8618913705d3667
+com.qmth.solar.access-secret=s1NENpvc8Jq5evcE0B7GfLmoQOvwmlCy
 
 #\u65E0\u9700\u9274\u6743\u7684url
 no.auth.urls=/webjars/**,/druid/**,/swagger-ui.html,/doc.html,/swagger-resources/**,/v2/api-docs,/webjars/springfox-swagger-ui/**,/api/admin/user/login/account,/api/admin/sys/org/queryByOrgCode,/file/**,/upload/**,/client/**,/base_photo/**,/frontend/**,/api/admin/client/save,/api/admin/client/upload,/api/admin/client/query,/api/admin/app/save,/api/admin/app/query,/api/notify/monitor/record/tencent,/api/notify/monitor/status/tencent

themis-business/src/main/java/com/qmth/themis/business/util/AuthUtil.java

@@ -6,6 +6,7 @@ import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.cache.TEStudentCacheDto;
 import com.qmth.themis.business.entity.TBSession;
 import com.qmth.themis.business.entity.TBUser;
+import com.qmth.themis.business.service.AuthInfoService;
 import com.qmth.themis.business.service.CacheService;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
@@ -199,6 +200,10 @@ public class AuthUtil {
 //        if (authDto.getRoleCodes().contains(RoleEnum.SUPER_ADMIN.name())) {
 //            return true;
 //        }
+        AuthInfoService authInfoService = SpringContextHolder.getBean(AuthInfoService.class);
+        if (Objects.nonNull(authDto.getTbOrg())) {
+            authInfoService.appHasExpired(authDto.getTbOrg().getCode());
+        }
         //系统公用接口不拦截
         int sysCount = (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(url)).count();
         if (sysCount > 0) {

themis-exam/src/main/resources/application-dev.properties

@@ -191,7 +191,10 @@ wxapp.upload.url=http://192.168.10.86:6002
 #wxapp.upload.url=https://mobile.online-exam-test.cn
 client.config.url=https://cdn.online-exam.cn/client
 monitor.config.prefix=oe_test
-        
+
+com.qmth.solar.access-key=8134f6aae0134770b8618913705d3667
+com.qmth.solar.access-secret=s1NENpvc8Jq5evcE0B7GfLmoQOvwmlCy
+
 #\u65E0\u9700\u9274\u6743\u7684url
 no.auth.urls=/webjars/**,/druid/**,/swagger-ui.html,/doc.html,/swagger-resources/**,/v2/api-docs,/webjars/springfox-swagger-ui/**,/api/oe/student/login,/api/oe/sys/env,/file/**,/upload/**,/client/**,/base_photo/**,/frontend/**,/api/oe/exam/short_code,/api/mobile/authorization
 common.system.urls=/api/oe/student/logout,/api/oe/exam/file/upload,/api/mobile/file/upload