Pārlūkot izejas kodu

优化-新增常量prefix

xiaof 2 gadi atpakaļ
vecāks
revīzija
310a53aebf
26 mainītis faili ar 72 papildinājumiem un 149 dzēšanām
  1. 3 1
      paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/BasicAttachmentController.java
  2. 3 1
      paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/BasicSchoolController.java
  3. 2 1
      paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/SysConfigController.java
  4. 2 1
      paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/SysRoleGroupMemberController.java
  5. 2 1
      paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/TSAuthController.java
  6. 0 9
      paper-library-common/src/main/java/com/qmth/paper/library/common/config/DictionaryConfig.java
  7. 18 0
      paper-library-common/src/main/java/com/qmth/paper/library/common/contant/ApiPrefixConstant.java
  8. 0 93
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/PrefixUrlDomain.java
  9. 4 3
      paper-library/src/main/java/com/qmth/paper/library/api/BasicSemesterController.java
  10. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/BasicStudentController.java
  11. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/ClientController.java
  12. 2 3
      paper-library/src/main/java/com/qmth/paper/library/api/ConditionController.java
  13. 6 5
      paper-library/src/main/java/com/qmth/paper/library/api/EnumsController.java
  14. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/MenuCustomController.java
  15. 2 3
      paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesController.java
  16. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesTypeController.java
  17. 4 3
      paper-library/src/main/java/com/qmth/paper/library/api/PaperLibraryController.java
  18. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/PaperScanTaskController.java
  19. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/SysController.java
  20. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/SysOrgController.java
  21. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/SysPrivilegeController.java
  22. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/SysRoleController.java
  23. 2 1
      paper-library/src/main/java/com/qmth/paper/library/api/SysSettingController.java
  24. 2 2
      paper-library/src/main/java/com/qmth/paper/library/api/SysUserController.java
  25. 2 3
      paper-library/src/main/java/com/qmth/paper/library/api/TBTaskController.java
  26. 0 10
      paper-library/src/main/resources/application-dev.properties

+ 3 - 1
paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/BasicAttachmentController.java

@@ -1,6 +1,7 @@
 package com.qmth.paper.library.common.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.entity.BasicAttachment;
 import com.qmth.paper.library.common.service.BasicAttachmentService;
 import com.qmth.paper.library.common.util.Result;
@@ -23,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "文件上传Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/file")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_COMMON + "/file")
 public class BasicAttachmentController {
 
     @Autowired
@@ -31,6 +32,7 @@ public class BasicAttachmentController {
 
     /**
      * 文件查询
+     *
      * @return
      */
     @ApiOperation(value = "文件查询")

+ 3 - 1
paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/BasicSchoolController.java

@@ -2,6 +2,7 @@ package com.qmth.paper.library.common.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.common.bean.dto.SchoolDto;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.service.BasicSchoolService;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
@@ -24,7 +25,7 @@ import java.util.List;
  */
 @Api(tags = "学校Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/school")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_COMMON + "/school")
 public class BasicSchoolController {
 
     @Autowired
@@ -32,6 +33,7 @@ public class BasicSchoolController {
 
     /**
      * 学校查询
+     *
      * @return
      */
     @ApiOperation(value = "查询")

+ 2 - 1
paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/SysConfigController.java

@@ -3,6 +3,7 @@ package com.qmth.paper.library.common.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.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.entity.SysConfig;
 import com.qmth.paper.library.common.service.SysConfigService;
 import com.qmth.paper.library.common.util.Result;
@@ -25,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "参数Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/sys_config")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_COMMON + "/sys_config")
 public class SysConfigController {
 
     @Autowired

+ 2 - 1
paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/SysRoleGroupMemberController.java

@@ -2,6 +2,7 @@ package com.qmth.paper.library.common.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.common.bean.params.SysRoleGroupMemberParams;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysRoleGroupMember;
 import com.qmth.paper.library.common.service.SysRoleGroupMemberService;
@@ -25,7 +26,7 @@ import javax.validation.Valid;
  */
 @Api(tags = "角色组成员Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role/group")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_SYS + "/role/group")
 @Validated
 //@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
 public class SysRoleGroupMemberController {

+ 2 - 1
paper-library-common-api/src/main/java/com/qmth/paper/library/common/api/TSAuthController.java

@@ -2,6 +2,7 @@ package com.qmth.paper.library.common.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.solar.crypto.AppLicenseUtil;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.service.AuthInfoService;
 import com.qmth.paper.library.common.util.Result;
@@ -33,7 +34,7 @@ import java.io.IOException;
  */
 @Api(tags = "授权配置Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.auth}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_AUTH)
 @Validated
 public class TSAuthController {
     private final static Logger log = LoggerFactory.getLogger(TSAuthController.class);

+ 0 - 9
paper-library-common/src/main/java/com/qmth/paper/library/common/config/DictionaryConfig.java

@@ -15,15 +15,6 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class DictionaryConfig {
 
-    /**
-     * 模块前缀
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "prefix.url")
-    public PrefixUrlDomain prefixUrlDomain() {
-        return new PrefixUrlDomain();
-    }
-
     /**
      * 系统配置
      */

+ 18 - 0
paper-library-common/src/main/java/com/qmth/paper/library/common/contant/ApiPrefixConstant.java

@@ -0,0 +1,18 @@
+package com.qmth.paper.library.common.contant;
+
+/**
+ * API常量
+ */
+public class ApiPrefixConstant {
+    /**
+     * api请求前缀
+     */
+    public static final String PREFIX_COMMON = "/admin/common";
+    public static final String PREFIX_SYS = "/admin/sys";
+    public static final String PREFIX_BASIC = "/admin/basic";
+    public static final String PREFIX_DATA = "/admin/data";
+    public static final String PREFIX_MENU = "/admin/menu";
+    public static final String PREFIX_AUTH = "/admin/auth";
+    public static final String PREFIX_PAPER = "/admin/paper";
+    public static final String PREFIX_CLIENT = "/admin/client";
+}

+ 0 - 93
paper-library-common/src/main/java/com/qmth/paper/library/common/domain/PrefixUrlDomain.java

@@ -1,93 +0,0 @@
-package com.qmth.paper.library.common.domain;
-
-import java.io.Serializable;
-
-/**
- * @Description: 模块前缀
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class PrefixUrlDomain implements Serializable {
-
-    String common;
-
-    String sys;
-
-    String basic;
-
-    String data;
-
-    String menu;
-
-    String auth;
-
-    String paper;
-
-    String client;
-
-    public String getCommon() {
-        return common;
-    }
-
-    public void setCommon(String common) {
-        this.common = common;
-    }
-
-    public String getSys() {
-        return sys;
-    }
-
-    public void setSys(String sys) {
-        this.sys = sys;
-    }
-
-    public String getBasic() {
-        return basic;
-    }
-
-    public void setBasic(String basic) {
-        this.basic = basic;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public String getMenu() {
-        return menu;
-    }
-
-    public void setMenu(String menu) {
-        this.menu = menu;
-    }
-
-    public String getAuth() {
-        return auth;
-    }
-
-    public void setAuth(String auth) {
-        this.auth = auth;
-    }
-
-    public String getPaper() {
-        return paper;
-    }
-
-    public void setPaper(String paper) {
-        this.paper = paper;
-    }
-
-    public String getClient() {
-        return client;
-    }
-
-    public void setClient(String client) {
-        this.client = client;
-    }
-}

+ 4 - 3
paper-library/src/main/java/com/qmth/paper/library/api/BasicSemesterController.java

@@ -3,9 +3,10 @@ package com.qmth.paper.library.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
-import com.qmth.paper.library.common.service.BasicSemesterService;
 import com.qmth.paper.library.common.bean.params.BasicSemesterParams;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.service.BasicSemesterService;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
@@ -28,7 +29,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "学期管理controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/semester")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_BASIC + "/semester")
 public class BasicSemesterController {
     @Resource
     private BasicSemesterService basicSemesterService;
@@ -39,7 +40,7 @@ public class BasicSemesterController {
     public Result findBasicSemesterList(@ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                         @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
-        return ResultUtil.ok(basicSemesterService.basicSemesterPage(schoolId,pageNumber,pageSize));
+        return ResultUtil.ok(basicSemesterService.basicSemesterPage(schoolId, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "学期管理-新增/编辑")

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/BasicStudentController.java

@@ -6,6 +6,7 @@ import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.templete.execute.AsyncStudentDataImportService;
 import com.qmth.paper.library.common.bean.params.BasicStudentParams;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
@@ -41,7 +42,7 @@ import java.util.stream.Stream;
  */
 @Api(tags = "学生管理controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/student")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_BASIC + "/student")
 @Validated
 public class BasicStudentController {
     @Resource

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/ClientController.java

@@ -9,6 +9,7 @@ import com.qmth.paper.library.business.bean.params.ClientLoginParam;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.ClientService;
 import com.qmth.paper.library.common.bean.result.LoginResult;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.BasicSchool;
 import com.qmth.paper.library.common.entity.SysUser;
@@ -39,7 +40,7 @@ import java.util.Objects;
  */
 @Api(tags = "扫描端Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.client}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_CLIENT)
 @Validated
 public class ClientController {
 

+ 2 - 3
paper-library/src/main/java/com/qmth/paper/library/api/ConditionController.java

@@ -2,8 +2,6 @@ package com.qmth.paper.library.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.paper.library.business.bean.result.DictionaryResult;
 import com.qmth.paper.library.business.bean.result.EditResult;
@@ -12,6 +10,7 @@ import com.qmth.paper.library.business.enums.DictionaryEnum;
 import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.business.service.PaperArchivesTypeService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.BasicSemester;
 import com.qmth.paper.library.common.entity.BasicStudent;
@@ -38,7 +37,7 @@ import java.util.stream.Stream;
  */
 @Api(tags = "查询条件Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_COMMON)
 @Validated
 public class ConditionController {
 

+ 6 - 5
paper-library/src/main/java/com/qmth/paper/library/api/EnumsController.java

@@ -1,7 +1,8 @@
 package com.qmth.paper.library.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.paper.library.business.enums.*;
+import com.qmth.paper.library.business.enums.EnumType;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.enums.*;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
@@ -21,7 +22,7 @@ import java.util.List;
  */
 @Api(tags = "枚举类型Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/get_enums")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_COMMON + "/get_enums")
 public class EnumsController {
 
     /**
@@ -40,13 +41,13 @@ public class EnumsController {
         if (type.equals(EnumType.PRIVILEGE_TYPE.name())) {
             //菜单类型
             list = PrivilegeEnum.listTypes();
-        }  else if (type.equals(EnumType.ROLE_TYPE.name())) {
+        } else if (type.equals(EnumType.ROLE_TYPE.name())) {
             //内置角色类型
             list = RoleTypeEnum.listTypes(false);
-        }   else if (type.equals(EnumType.SYSTEM_CODE_ENUM.name())){
+        } else if (type.equals(EnumType.SYSTEM_CODE_ENUM.name())) {
             // 系统自生成编码
             list = SystemCodeEnum.listTypes();
-        } else if (type.equals(EnumType.TB_TASK_STATUS.name())){
+        } else if (type.equals(EnumType.TB_TASK_STATUS.name())) {
             // 同步云阅卷日志表状态类型
             list = TaskStatusEnum.listTypes();
         }

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/MenuCustomController.java

@@ -7,6 +7,7 @@ import com.qmth.paper.library.business.bean.params.TSchoolPrivilegeParam;
 import com.qmth.paper.library.business.bean.result.CustomPrivilegeResult;
 import com.qmth.paper.library.business.bean.result.TSchoolPrivilegeResult;
 import com.qmth.paper.library.common.bean.dto.PrivilegeDto;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.service.*;
 import com.qmth.paper.library.common.util.Result;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "菜单权限修改Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.menu}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_MENU)
 public class MenuCustomController {
 
     @Resource

+ 2 - 3
paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesController.java

@@ -2,14 +2,13 @@ package com.qmth.paper.library.api;
 
 
 import com.alibaba.fastjson.JSON;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
 import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.business.templete.execute.AsyncDownloadPaperService;
 import com.qmth.paper.library.common.bean.params.DownLoadPaperParams;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
@@ -37,7 +36,7 @@ import java.util.Objects;
  */
 @Api(tags = "档案管理表controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/archives")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_PAPER + "/archives")
 @Validated
 public class PaperArchivesController {
     @Resource

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesTypeController.java

@@ -5,6 +5,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 import com.qmth.paper.library.business.service.PaperArchivesTypeService;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
@@ -25,7 +26,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "档案类型controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/archives_type")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_PAPER + "/archives_type")
 @Validated
 public class PaperArchivesTypeController {
     @Resource

+ 4 - 3
paper-library/src/main/java/com/qmth/paper/library/api/PaperLibraryController.java

@@ -4,6 +4,7 @@ package com.qmth.paper.library.api;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.PaperLibraryService;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
@@ -25,7 +26,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "数据检查Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/library")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_PAPER + "/library")
 @Validated
 public class PaperLibraryController {
     @Resource
@@ -67,8 +68,8 @@ public class PaperLibraryController {
     @PostMapping("/page_abnormal")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result pageAbnormal(@ApiParam(value = "任务") @RequestParam(required = false) Long paperScanTaskId,
-                             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                               @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                               @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(paperLibraryService.pageAbnormalData(paperScanTaskId, pageNumber, pageSize));
     }
 

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/PaperScanTaskController.java

@@ -6,6 +6,7 @@ import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
 import com.qmth.paper.library.business.templete.execute.AsyncPaperScanTaskImportService;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
@@ -37,7 +38,7 @@ import java.util.stream.Stream;
 
 @Api(tags = "扫描任务管理controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/scan_task")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_PAPER + "/scan_task")
 @Validated
 public class PaperScanTaskController {
     @Resource

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/SysController.java

@@ -13,6 +13,7 @@ import com.qmth.paper.library.common.bean.auth.AuthBean;
 import com.qmth.paper.library.common.bean.result.LoginResult;
 import com.qmth.paper.library.common.bean.result.UserLoginCheckResult;
 import com.qmth.paper.library.common.config.DictionaryConfig;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.BasicAttachment;
 import com.qmth.paper.library.common.entity.BasicSchool;
@@ -47,7 +48,7 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "系统Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_COMMON)
 public class SysController {
     private final static Logger log = LoggerFactory.getLogger(SysController.class);
 

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/SysOrgController.java

@@ -4,6 +4,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.templete.execute.AsyncSysOrgImportService;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysOrg;
 import com.qmth.paper.library.common.entity.SysUser;
@@ -33,7 +34,7 @@ import java.util.Objects;
  */
 @Api(tags = "组织架构Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/org")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_SYS + "/org")
 public class SysOrgController {
 
     @Resource

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/SysPrivilegeController.java

@@ -1,6 +1,7 @@
 package com.qmth.paper.library.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.entity.SysPrivilege;
 import com.qmth.paper.library.common.service.SysPrivilegeService;
 import com.qmth.paper.library.common.util.Result;
@@ -20,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "菜单权限Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/privilege")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_SYS + "/privilege")
 public class SysPrivilegeController {
 
     @Autowired

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/SysRoleController.java

@@ -1,6 +1,7 @@
 package com.qmth.paper.library.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysRole;
 import com.qmth.paper.library.common.service.SysRoleService;
@@ -28,7 +29,7 @@ import java.security.NoSuchAlgorithmException;
  */
 @Api(tags = "角色Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_SYS + "/role")
 @Validated
 public class SysRoleController {
 

+ 2 - 1
paper-library/src/main/java/com/qmth/paper/library/api/SysSettingController.java

@@ -3,6 +3,7 @@ package com.qmth.paper.library.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.entity.SysSetting;
 import com.qmth.paper.library.common.service.SysSettingService;
 import com.qmth.paper.library.common.util.Result;
@@ -28,7 +29,7 @@ import javax.validation.Valid;
  */
 @Api(tags = "系统设置controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/setting")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_SYS + "/setting")
 @Validated
 public class SysSettingController {
 

+ 2 - 2
paper-library/src/main/java/com/qmth/paper/library/api/SysUserController.java

@@ -7,11 +7,11 @@ import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.templete.execute.AsyncSysUserDataImportService;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
 import com.qmth.paper.library.common.enums.TaskTypeEnum;
-import com.qmth.paper.library.common.service.LibraryCommonService;
 import com.qmth.paper.library.common.service.SysUserService;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
@@ -45,7 +45,7 @@ import java.util.stream.Stream;
  */
 @Api(tags = "用户Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_SYS + "/user")
 @Validated
 public class SysUserController {
     private final static Logger log = LoggerFactory.getLogger(SysUserController.class);

+ 2 - 3
paper-library/src/main/java/com/qmth/paper/library/api/TBTaskController.java

@@ -2,10 +2,9 @@ package com.qmth.paper.library.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.common.bean.result.TaskListResult;
+import com.qmth.paper.library.common.contant.ApiPrefixConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.enums.TaskResultEnum;
 import com.qmth.paper.library.common.enums.TaskStatusEnum;
@@ -36,7 +35,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "数据管理-任务管理Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.data}")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + ApiPrefixConstant.PREFIX_DATA)
 @Validated
 public class TBTaskController {
     private final static Logger log = LoggerFactory.getLogger(TBTaskController.class);

+ 0 - 10
paper-library/src/main/resources/application-dev.properties

@@ -52,16 +52,6 @@ com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
 com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 #com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
-#----------------api prefix-----------------
-prefix.url.common=admin/common
-prefix.url.sys=admin/sys
-prefix.url.basic=admin/basic
-prefix.url.data=admin/data
-prefix.url.menu=admin/menu
-prefix.url.auth=admin/auth
-prefix.url.paper=admin/paper
-prefix.url.client=admin/client
-
 spring.cache.ehcache.config=classpath:static/ehcache.xml
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8