1.1.0 qmth.boot版本由1.0.3升级到1.0.4

pom.xml

@@ -11,7 +11,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <qmth.boot.version>1.0.3</qmth.boot.version>
+        <qmth.boot.version>1.0.4</qmth.boot.version>
         <java.version>1.8</java.version>
         <swagger2.version>2.9.2</swagger2.version>
         <fastjson.version>1.2.68</fastjson.version>

src/main/java/com/qmth/eds/api/EasyExcelController.java

@@ -6,7 +6,6 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.tools.excel.enums.ExcelType;
 import com.qmth.eds.bean.dto.EasyExcelStudentDto;
 import com.qmth.eds.bean.dto.EasyTestSheetDto;
@@ -41,7 +40,7 @@ import java.util.Objects;
 @Api(tags = "easyExcelController")
 @RestController
 @RequestMapping("/common")
-@Aac(auth = BOOL.FALSE)
+@Aac(auth = false)
 public class EasyExcelController {
     private final static Logger log = LoggerFactory.getLogger(EasyExcelController.class);
 

src/main/java/com/qmth/eds/api/ExamSyncTotalController.java

@@ -1,13 +1,12 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.common.contant.SystemConstant;
-import com.qmth.eds.job.service.JobService;
-import com.qmth.eds.service.ExamSyncTotalService;
 import com.qmth.eds.common.util.Result;
 import com.qmth.eds.common.util.ResultUtil;
+import com.qmth.eds.job.service.JobService;
+import com.qmth.eds.service.ExamSyncTotalService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -76,7 +75,7 @@ public class ExamSyncTotalController {
      */
     @ApiOperation(value = "人工同步")
     @PostMapping("/manual_sync")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result manualSync() {
         jobService.getExamData(false);
         return ResultUtil.success(true);

src/main/java/com/qmth/eds/api/SysController.java

@@ -2,7 +2,6 @@ package com.qmth.eds.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.bean.params.LoginParam;
 import com.qmth.eds.bean.result.*;
@@ -25,9 +24,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.security.NoSuchAlgorithmException;
 import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 系统公共Controller
@@ -64,7 +61,7 @@ public class SysController {
     @ApiOperation(value = "登录")
     @PostMapping("/login")
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = LoginResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result login(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody LoginParam login, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -199,7 +196,7 @@ public class SysController {
         return ResultUtil.ok(!CollectionUtils.isEmpty(teacherResultList) ? teacherResultList : Collections.emptyList());
     }
 
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     @GetMapping("/test")
     public void test() {
         // 1

src/main/java/com/qmth/eds/common/util/AuthUtil.java

@@ -1,7 +1,6 @@
 package com.qmth.eds.common.util;//package com.qmth.teachcloud.data.store.util;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.enums.Platform;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
@@ -169,10 +168,10 @@ public class AuthUtil {
         Aac beanTypeAac = handlerMethod.getBeanType().getAnnotation(Aac.class);
         Aac classAac = handlerMethod.getMethodAnnotation(Aac.class);
         if (Objects.nonNull(beanTypeAac)) {
-            map.computeIfAbsent(SystemConstant.AUTH, v -> beanTypeAac.auth() == BOOL.TRUE ? true : false);
+            map.computeIfAbsent(SystemConstant.AUTH, v -> beanTypeAac.auth() == null ? false : beanTypeAac.auth()[0]);
         }
         if (Objects.nonNull(classAac)) {
-            map.computeIfAbsent(SystemConstant.AUTH, v -> classAac.auth() == BOOL.TRUE ? true : false);
+            map.computeIfAbsent(SystemConstant.AUTH, v -> beanTypeAac.auth() == null ? false : beanTypeAac.auth()[0]);
         }
 
         if (Objects.nonNull(map.get(SystemConstant.AUTH)) && !map.get(SystemConstant.AUTH)) {

src/main/java/com/qmth/eds/core/aspect/ApiControllerAspect.java → src/main/java/com/qmth/eds/core/aspect/ControllerAspect.java

@@ -30,8 +30,8 @@ import java.util.Objects;
  */
 @Aspect
 @Component
-public class ApiControllerAspect {
-    private final static Logger log = LoggerFactory.getLogger(ApiControllerAspect.class);
+public class ControllerAspect {
+    private final static Logger log = LoggerFactory.getLogger(ControllerAspect.class);
 
     /**
      * api切入点

src/main/java/com/qmth/eds/start/StartRunning.java

@@ -46,7 +46,7 @@ public class StartRunning implements CommandLineRunner {
         schoolJobMap.computeIfAbsent("name", v -> TimedSyncTaskJob.class.getName());
         quartzService.deleteJob(JobEnum.TIMED_SYNC_TASK_JOB.name(), JobEnum.TIMED_SYNC_TASK_JOB.name());
         // 每天0点定时任务
-        quartzService.addJob(TimedSyncTaskJob.class, JobEnum.TIMED_SYNC_TASK_JOB.name(), JobEnum.TIMED_SYNC_TASK_JOB.name(), "0 0 0 * * ?", schoolJobMap);
+//        quartzService.addJob(TimedSyncTaskJob.class, JobEnum.TIMED_SYNC_TASK_JOB.name(), JobEnum.TIMED_SYNC_TASK_JOB.name(), "0 0 0 * * ?", schoolJobMap);
 
         log.info("服务器启动时执行 end");
     }