3.3.0 qmth.boot版本升到到1.0.4

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.params.ClientLoginParam;
@@ -64,7 +63,7 @@ public class ClientController {
     @ApiOperation(value = "登录")
     @PostMapping("/user/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 ClientLoginParam login, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -496,7 +495,7 @@ public class ClientController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/school/list", method = RequestMethod.POST)
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result list() {
         List<SchoolDto> list = clientService.listSchool();
         return ResultUtil.ok(list);
@@ -509,7 +508,7 @@ public class ClientController {
      */
     @ApiOperation(value = "修改密码")
     @RequestMapping(value = "/user/update_password", method = RequestMethod.POST)
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result updatePassword(@RequestParam Long userId,
                                  @RequestParam String password) {
         return ResultUtil.ok(clientService.updatePassword(userId, password));

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

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.api;
 import com.alibaba.fastjson.JSONObject;
 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.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.result.CalculateNotifyResult;
@@ -63,7 +62,7 @@ public class NotifyApiController {
     @ApiOperation(value = "教研分析进度回调")
     @ApiResponses({@ApiResponse(code = 200, message = "教研分析进度回调", response = CalculateNotifyResult.class)})
     @RequestMapping(value = "/analysis/progress", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     @Transactional
     public Result analysisProgress(@ApiParam(value = "接收教研分析回调数据", required = true) @RequestBody String result) throws UnsupportedEncodingException {
         try {

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.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.distributed.print.business.bean.params.open.GradeOpenPageParams;
 import com.qmth.distributed.print.business.bean.params.open.GradeOpenParams;
@@ -66,7 +65,7 @@ public class OpenApiController {
     @ApiOperation(value = "试卷基础配置查询")
     @ApiResponses({@ApiResponse(code = 200, message = "试卷基础配置查询", response = Object.class)})
     @PostMapping("/paper_config")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result paperConfig(@ApiParam(value = "接收试卷配置数据信息", required = true) @RequestBody String result) throws UnsupportedEncodingException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -81,7 +80,7 @@ public class OpenApiController {
     @ApiOperation(value = "试卷考察点查询")
     @ApiResponses({@ApiResponse(code = 200, message = "试卷考察点查询", response = Object.class)})
     @PostMapping("/paper_dimension")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result paperDimension(@ApiParam(value = "试卷考察点查询", required = true) @RequestBody String result) throws UnsupportedEncodingException {
 
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
@@ -97,7 +96,7 @@ public class OpenApiController {
     @ApiOperation(value = "试卷蓝图查询")
     @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图查询", response = Object.class)})
     @PostMapping("/paper_structure")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result paperStructure(@ApiParam(value = "试卷考察点查询", required = true) @RequestBody String result) throws UnsupportedEncodingException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -112,7 +111,7 @@ public class OpenApiController {
     @ApiOperation(value = "试卷评价模型查询")
     @ApiResponses({@ApiResponse(code = 200, message = "试卷评价模型查询", response = Object.class)})
     @PostMapping("/paper_evaluation")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result paperEvaluation(@ApiParam(value = "试卷评价模型查询", required = true) @RequestBody String result) throws UnsupportedEncodingException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -127,7 +126,7 @@ public class OpenApiController {
     @ApiOperation(value = "考生成绩查询")
     @ApiResponses({@ApiResponse(code = 200, message = "考生成绩查询", response = Object.class)})
     @PostMapping("/exam_student_score")
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result examStudentScore(@ApiParam(value = "考生成绩查询", required = true) @RequestBody String result) throws UnsupportedEncodingException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -142,7 +141,7 @@ public class OpenApiController {
     @ApiOperation(value = "单点登录")
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
     @RequestMapping(value = "/account/login", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result accountLogin(@ApiParam(value = "时间", required = true) @RequestParam String time,
                                @ApiParam(value = "地址", required = true) @RequestParam String path,
                                @ApiParam(value = "鉴权信息", required = true) @RequestParam String signature,
@@ -199,7 +198,7 @@ public class OpenApiController {
     @ApiOperation(value = "西交大登录之前逻辑")
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = SysUser.class)})
     @RequestMapping(value = "/login_before_xju_logic", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result loginBeforeXjuLogic(@ApiParam(value = "登录账号", required = true) @RequestBody String account) throws UnsupportedEncodingException {
         Optional.ofNullable(account).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("账号为空"));
         String decodeJson = URLDecoder.decode(account, SystemConstant.CHARSET_NAME);

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.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.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.params.LoginParam;
@@ -49,7 +48,6 @@ import javax.validation.Valid;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -127,7 +125,7 @@ public class SysController {
     @ApiOperation(value = "登录")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @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());
@@ -275,7 +273,7 @@ public class SysController {
      */
     @ApiOperation(value = "发送验证码")
     @RequestMapping(value = "/get_verify_code", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getVerifyCode(@RequestBody LoginParam loginParam) {
         String mobileNumber = loginParam.getMobileNumber();
         if (StringUtils.isBlank(mobileNumber)) {
@@ -328,7 +326,7 @@ public class SysController {
      */
     @ApiOperation(value = "发送验证码")
     @RequestMapping(value = "/get_verify_code_by_account", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object getverifyCodeByAccount(@RequestBody LoginParam loginParam) {
         String loginName = loginParam.getLoginName();
         String password = loginParam.getPassword();
@@ -365,7 +363,7 @@ public class SysController {
      */
     @ApiOperation(value = "发送验证码（绑定手机号）")
     @RequestMapping(value = "/get_verify_code_for_bind", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getVerifyCodeForBind(@RequestBody LoginParam loginParam) {
         String loginName = loginParam.getLoginName();
         String password = loginParam.getPassword();
@@ -428,7 +426,7 @@ public class SysController {
     @ApiOperation(value = "根据机构代码查询机构信息接口")
     @RequestMapping(value = "/school/query_by_school_code", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "学校信息", response = EditResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result queryBySchoolCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
         if (Objects.nonNull(code) && code.contains("#")) {
             code = code.substring(0, code.indexOf("#"));
@@ -627,7 +625,7 @@ public class SysController {
 
     @ApiOperation(value = "获取服务器时间")
     @RequestMapping(value = "/get_system_time", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getSystemTime() {
         return ResultUtil.ok(System.currentTimeMillis());
     }

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

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.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.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.CloudUserPushService;
@@ -9,16 +8,13 @@ import com.qmth.distributed.print.business.service.CloudUserPushStatusService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncSysUserDataImportService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.bean.dto.UserExportDto;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.service.SysUserService;
-import com.qmth.teachcloud.common.util.FileUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -216,7 +212,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "修改密码")
     @RequestMapping(value = "/update_password", method = RequestMethod.POST)
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     @OperationLogDetail(detail = "修改密码", customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.updatePassword(user));

distributed-print/src/main/java/com/qmth/distributed/print/aspect/ApiControllerAspect.java → distributed-print/src/main/java/com/qmth/distributed/print/aspect/TeachCloudControllerAspect.java

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

pom.xml

@@ -22,7 +22,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>
         <swagger2.version>2.9.2</swagger2.version>
         <fastjson.version>1.2.68</fastjson.version>
         <fileupload.version>1.4</fileupload.version>

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysConfigController.java

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.common.api.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.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysConfig;
@@ -34,7 +33,7 @@ public class SysConfigController {
 
     @ApiOperation(value = "根据key查询")
     @RequestMapping(value = "/get_one", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getOne(@RequestParam(value = "key", required = false) String key) {
         SysConfig value = sysConfigService.getByKey(key);
         return ResultUtil.ok(value);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysUserOrgMapper.java

@@ -1,13 +0,0 @@
-package com.qmth.teachcloud.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.teachcloud.common.entity.SysUserOrg;
-
-/**
- * @Description: 系统用户机构对应关系mapper
- * @Author: CaoZixuan
- * @Date: 2022-02-16
- */
-public interface SysUserOrgMapper extends BaseMapper<SysUserOrg> {
-
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysUserOrgService.java

@@ -1,12 +0,0 @@
-package com.qmth.teachcloud.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.entity.SysUserOrg;
-
-/**
- * @Description: 用户机构对应关系表服务类
- * @Author: CaoZixuan
- * @Date: 2022-02-16
- */
-public interface SysUserOrgService extends IService<SysUserOrg> {
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserOrgServiceImpl.java

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.common.entity.SysUserOrg;
-import com.qmth.teachcloud.common.mapper.SysUserOrgMapper;
-import com.qmth.teachcloud.common.service.SysUserOrgService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 系统用户机构关系服务实现类
- * @Author: CaoZixuan
- * @Date: 2022-02-16
- */
-@Service
-public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper,SysUserOrg> implements SysUserOrgService {
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/AuthUtil.java

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.common.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.SignatureType;
 import com.qmth.teachcloud.common.SignatureEntityTest;
@@ -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()[0]);
         }
         if (Objects.nonNull(classAac)) {
-            map.computeIfAbsent(SystemConstant.AUTH, v -> classAac.auth() == BOOL.TRUE ? true : false);
+            map.computeIfAbsent(SystemConstant.AUTH, v -> classAac.auth()[0]);
         }
 
         if (Objects.nonNull(map.get(SystemConstant.AUTH)) && !map.get(SystemConstant.AUTH)) {

teachcloud-common/src/main/resources/mapper/SysUserOrgMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.common.mapper.SysUserOrgMapper">
-
-</mapper>

teachcloud-report/src/main/java/com/qmth/teachcloud/report/aspect/ApiControllerAspect.java → teachcloud-report/src/main/java/com/qmth/teachcloud/report/aspect/TeachCloudControllerAspect.java

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