正式鉴权修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CommonServiceImpl.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.bean.auth.AuthBean;
 import com.qmth.distributed.print.business.bean.auth.ExpireTimeBean;
 import com.qmth.distributed.print.business.bean.dto.OrgDto;
@@ -21,7 +20,6 @@ import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.*;
-import com.qmth.distributed.print.common.SignatureEntityTest;
 import com.qmth.distributed.print.common.contant.SpringContextHolder;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
@@ -355,9 +353,9 @@ public class CommonServiceImpl implements CommonService {
     /**
      * 文件预览
      *
-     * @param path 附件路径
-     * @param type 保存类型：本地、OSS
-     * @param isExpire     url是否带过期时间
+     * @param path     附件路径
+     * @param type     保存类型：本地、OSS
+     * @param isExpire url是否带过期时间
      * @return
      */
     @Override
@@ -681,7 +679,7 @@ public class CommonServiceImpl implements CommonService {
         Set<RoleTypeEnum> roleType = authBean.getRoleList().stream().map(s -> s.getType()).collect(Collectors.toSet());
         String sessionId = SessionUtil.digest(sysUser.getId(), Math.abs(roleType.toString().hashCode()), platform.name());
         //TODO 测试用
-        String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
+//        String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
         ExpireTimeBean expireTime = AuthUtil.getExpireTime(platform);
         TBSession tbSession = new TBSession(sessionId, String.valueOf(sysUser.getId()), roleType.toString(),
                 platform.name(), platform.name(), deviceId, ServletUtil.getRequest().getLocalAddr(), token,
@@ -689,7 +687,8 @@ public class CommonServiceImpl implements CommonService {
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
+//        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
+        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
         return loginResult;
@@ -702,9 +701,9 @@ public class CommonServiceImpl implements CommonService {
         QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId).eq(ExamTask::getPaperNumber, paperNumber);
         ExamTask examTask = examTaskService.getOne(queryWrapper);
-        if(examTask!= null){
+        if (examTask != null) {
             return createPaperNumber(schoolId);
-        } else{
+        } else {
             return paperNumber;
         }
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicAttachmentController.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "文件上传Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/file")
-@Aac(auth = BOOL.FALSE)
 public class BasicAttachmentController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCardRuleController.java

@@ -28,7 +28,6 @@ import java.util.List;
 @Api(tags = "题卡规则Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/card_rule")
-@Aac(auth = BOOL.FALSE)
 public class BasicCardRuleController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCourseController.java

@@ -29,7 +29,6 @@ import java.util.List;
 @Api(tags = "课程Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/course")
-@Aac(auth = BOOL.FALSE)
 public class BasicCourseController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamRuleController.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "考务规则Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/exam_rule")
-@Aac(auth = BOOL.FALSE)
 public class BasicExamRuleController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicSchoolController.java

@@ -29,7 +29,6 @@ import java.util.List;
 @Api(tags = "学校Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/school")
-@Aac(auth = BOOL.FALSE)
 public class BasicSchoolController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicTemplateController.java

@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "通用模板Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/template")
-@Aac(auth = BOOL.FALSE)
 public class BasicTemplateController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/ClientController.java

@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
 @Api(tags = "客户端Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.client}")
-@Aac(strict = BOOL.TRUE)
 public class ClientController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/EnumsController.java

@@ -25,7 +25,6 @@ import java.util.List;
 @Api(tags = "枚举类型Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/get_enums")
-@Aac(auth = BOOL.FALSE)
 public class EnumsController {
 
     /**

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamCardController.java

@@ -32,7 +32,6 @@ import java.util.List;
 @Api(tags = "题卡Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/card")
-@Aac(auth = BOOL.FALSE)
 public class ExamCardController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamDetailController.java

@@ -43,7 +43,6 @@ import java.util.Set;
 @Api(tags = "考务数据管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/print")
-@Aac(auth = BOOL.FALSE)
 public class ExamDetailController {
     @Resource
     private TBTaskService tbTaskService;

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanController.java

@@ -51,7 +51,6 @@ import java.util.Objects;
 @Api(tags = "印刷计划管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/print")
-@Aac(auth = BOOL.FALSE)
 public class ExamPrintPlanController {
     @Resource
     private ExamPrintPlanService examPrintPlanService;

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -50,7 +50,6 @@ import java.util.Objects;
 @Api(tags = "命题任务Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/task")
-@Aac(auth = BOOL.FALSE)
 public class ExamTaskController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/SysConfigController.java

@@ -27,14 +27,14 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "参数Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/sys_config")
-@Aac(auth = BOOL.FALSE)
 public class SysConfigController {
 
     @Autowired
     private SysConfigService sysConfigService;
 
     @ApiOperation(value = "根据key查询")
-    @RequestMapping(value = "/get_one",method = RequestMethod.POST)
+    @RequestMapping(value = "/get_one", method = RequestMethod.POST)
+    @Aac(auth = BOOL.FALSE)
     public Result getOne(@RequestParam(value = "key", required = false) String key) {
         SysConfig value = sysConfigService.getByKey(key);
         return ResultUtil.ok(value);

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -46,7 +46,6 @@ import java.util.stream.Collectors;
 @Api(tags = "系统Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}")
-@Aac(strict = BOOL.TRUE, platform = Platform.WEB)
 public class SysController {
     private final static Logger log = LoggerFactory.getLogger(SysController.class);
 

distributed-print/src/main/java/com/qmth/distributed/print/api/SysOrgController.java

@@ -31,7 +31,6 @@ import java.util.List;
 @Api(tags = "组织架构Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/org")
-@Aac(auth = BOOL.FALSE)
 public class SysOrgController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/SysPrivilegeController.java

@@ -27,7 +27,6 @@ import java.util.List;
 @Api(tags = "菜单权限Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/privilege")
-@Aac(auth = BOOL.FALSE)
 public class SysPrivilegeController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/SysRoleController.java

@@ -27,7 +27,6 @@ import java.util.List;
 @Api(tags = "角色Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
-@Aac(auth = BOOL.FALSE)
 public class SysRoleController {
 
     @Autowired

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -35,7 +35,6 @@ import java.util.List;
 @Api(tags = "用户Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
-@Aac(auth = BOOL.FALSE)
 public class SysUserController {
     private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
 

distributed-print/src/main/java/com/qmth/distributed/print/api/TBTaskController.java

@@ -34,7 +34,6 @@ import java.util.Objects;
 @Api(tags = "数据管理-任务管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.data}")
-@Aac(strict = BOOL.TRUE, platform = Platform.WEB)
 public class TBTaskController {
 
     @Resource

distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java

@@ -34,7 +34,6 @@ import javax.annotation.Resource;
 @Api(tags = "工作台Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.work}")
-@Aac(strict = BOOL.TRUE, platform = Platform.WEB)
 public class WorkController {
 
     @Resource

distributed-print/src/main/java/com/qmth/distributed/print/interceptor/AuthInterceptor.java

@@ -22,11 +22,11 @@ public class AuthInterceptor extends ExtendInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         log.info("preHandle is come in");
-        if (request.getServletPath().contains(endpoint)) {
+//        if (request.getServletPath().contains(endpoint)) {
             return true;
-        } else {
-            return AuthUtil.adminAuthInterceptor(request, response);
-        }
+//        } else {
+//            return AuthUtil.adminAuthInterceptor(request, response);
+//        }
     }
 
     @Override

distributed-print/src/main/resources/application.properties

@@ -65,13 +65,13 @@ org.center.orgQueryApi=/api/open/org/query
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
-#com.qmth.api.global-auth=false
-#com.qmth.api.global-strict=false
+com.qmth.api.global-auth=true
+#com.qmth.api.global-strict=true
 #com.qmth.api.global-rate-limit=1/5s
 
 #token\u8D85\u65F6\u914D\u7F6E
-com.qmth.api.auth.time-max-ahead=-10000
-com.qmth.api.auth.time-max-delay=10000
+com.qmth.api.auth.time-max-ahead=-5
+com.qmth.api.auth.time-max-delay=30
 
 #\u7F13\u5B58\u65F6\u95F4
 com.qmth.cache.expire-after-write=8h
@@ -99,5 +99,5 @@ sms.config.codeSendInterval=60
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 #aliyun SMS secret
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-sms.config.aliyunSMSSignName=\u9038\u6559\u4e91
+sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565