refactor: 项目结构合理性优化

2023-06-03 11:03:12 +08:00
parent 808c33789c
commit 532b632ccc
124 changed files with 419 additions and 414 deletions
--- a/src/main/java/com/youlai/system/controller/AuthController.java
+++ b/src/main/java/com/youlai/system/controller/AuthController.java
@@ -4,10 +4,10 @@ import cn.hutool.core.util.StrUtil;
 import com.youlai.system.common.constant.SecurityConstants;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.common.util.RequestUtils;
-import com.youlai.system.framework.easycaptcha.service.EasyCaptchaService;
-import com.youlai.system.pojo.dto.CaptchaResult;
-import com.youlai.system.pojo.dto.LoginResult;
-import com.youlai.system.framework.security.JwtTokenManager;
+import com.youlai.system.security.captcha.EasyCaptchaService;
+import com.youlai.system.model.dto.CaptchaResult;
+import com.youlai.system.model.dto.LoginResult;
+import com.youlai.system.security.JwtTokenManager;
 import io.jsonwebtoken.Claims;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
--- a/src/main/java/com/youlai/system/controller/SysDeptController.java
+++ b/src/main/java/com/youlai/system/controller/SysDeptController.java
@@ -1,11 +1,11 @@
 package com.youlai.system.controller;

-import com.youlai.system.framework.resubmit.Resubmit;
-import com.youlai.system.pojo.vo.Option;
+import com.youlai.system.common.annotation.PreventDuplicateSubmit;
+import com.youlai.system.common.model.Option;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.pojo.form.DeptForm;
-import com.youlai.system.pojo.query.DeptQuery;
-import com.youlai.system.pojo.vo.DeptVO;
+import com.youlai.system.model.form.DeptForm;
+import com.youlai.system.model.query.DeptQuery;
+import com.youlai.system.model.vo.DeptVO;
 import com.youlai.system.service.SysDeptService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -59,7 +59,7 @@ public class SysDeptController {
    @Operation(summary = "新增部门", security = {@SecurityRequirement(name = "Authorization")})
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:dept:add')")
-    @Resubmit
+    @PreventDuplicateSubmit
    public Result saveDept(
            @Valid @RequestBody DeptForm formData
    ) {
--- a/src/main/java/com/youlai/system/controller/SysDictController.java
+++ b/src/main/java/com/youlai/system/controller/SysDictController.java
@@ -3,14 +3,14 @@ package com.youlai.system.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.framework.resubmit.Resubmit;
-import com.youlai.system.pojo.form.DictForm;
-import com.youlai.system.pojo.form.DictTypeForm;
-import com.youlai.system.pojo.query.DictPageQuery;
-import com.youlai.system.pojo.query.DictTypePageQuery;
-import com.youlai.system.pojo.vo.DictPageVO;
-import com.youlai.system.pojo.vo.DictTypePageVO;
-import com.youlai.system.pojo.vo.Option;
+import com.youlai.system.common.annotation.PreventDuplicateSubmit;
+import com.youlai.system.model.form.DictForm;
+import com.youlai.system.model.form.DictTypeForm;
+import com.youlai.system.model.query.DictPageQuery;
+import com.youlai.system.model.query.DictTypePageQuery;
+import com.youlai.system.model.vo.DictPageVO;
+import com.youlai.system.model.vo.DictTypePageVO;
+import com.youlai.system.common.model.Option;
 import com.youlai.system.service.SysDictService;
 import com.youlai.system.service.SysDictTypeService;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -55,7 +55,7 @@ public class SysDictController {
    @Operation(summary = "新增字典", security = {@SecurityRequirement(name = "Authorization")})
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:dict:add')")
-    @Resubmit
+    @PreventDuplicateSubmit
    public Result saveDict(
            @RequestBody DictForm DictForm
    ) {
@@ -117,7 +117,7 @@ public class SysDictController {
    @Operation(summary = "新增字典类型", security = {@SecurityRequirement(name = "Authorization")})
    @PostMapping("/types")
    @PreAuthorize("@ss.hasPerm('sys:dict_type:add')")
-    @Resubmit
+    @PreventDuplicateSubmit
    public Result saveDictType(@RequestBody DictTypeForm dictTypeForm) {
        boolean result = dictTypeService.saveDictType(dictTypeForm);
        return Result.judge(result);
--- a/src/main/java/com/youlai/system/controller/SysMenuController.java
+++ b/src/main/java/com/youlai/system/controller/SysMenuController.java
@@ -1,12 +1,12 @@
 package com.youlai.system.controller;

 import com.youlai.system.common.result.Result;
-import com.youlai.system.framework.resubmit.Resubmit;
-import com.youlai.system.pojo.form.MenuForm;
-import com.youlai.system.pojo.query.MenuQuery;
-import com.youlai.system.pojo.vo.MenuVO;
-import com.youlai.system.pojo.vo.Option;
-import com.youlai.system.pojo.vo.RouteVO;
+import com.youlai.system.common.annotation.PreventDuplicateSubmit;
+import com.youlai.system.model.form.MenuForm;
+import com.youlai.system.model.query.MenuQuery;
+import com.youlai.system.model.vo.MenuVO;
+import com.youlai.system.common.model.Option;
+import com.youlai.system.model.vo.RouteVO;
 import com.youlai.system.service.SysMenuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -25,7 +25,7 @@ import java.util.List;
 * 菜单控制器
 *
 * @author haoxr
- * @date 2020/11/06
+ * @since 2020/11/06
 */
@Tag(name = "04.菜单接口")
@RestController
@@ -69,7 +69,7 @@ public class SysMenuController {
    @Operation(summary = "新增菜单",security = {@SecurityRequirement(name = "Authorization")})
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:menu:add')")
-    @Resubmit
+    @PreventDuplicateSubmit
    @CacheEvict(cacheNames = "system", key = "'routes'")
    public Result addMenu(@RequestBody MenuForm menuForm) {
        boolean result = menuService.saveMenu(menuForm);
--- a/src/main/java/com/youlai/system/controller/SysRoleController.java
+++ b/src/main/java/com/youlai/system/controller/SysRoleController.java
@@ -1,13 +1,13 @@
 package com.youlai.system.controller;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.framework.resubmit.Resubmit;
-import com.youlai.system.pojo.vo.Option;
+import com.youlai.system.common.annotation.PreventDuplicateSubmit;
+import com.youlai.system.common.model.Option;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.pojo.form.RoleForm;
-import com.youlai.system.pojo.query.RolePageQuery;
-import com.youlai.system.pojo.vo.RolePageVO;
+import com.youlai.system.model.form.RoleForm;
+import com.youlai.system.model.query.RolePageQuery;
+import com.youlai.system.model.vo.RolePageVO;
 import com.youlai.system.service.SysRoleService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -48,7 +48,7 @@ public class SysRoleController {
    @Operation(summary = "新增角色",security = {@SecurityRequirement(name = "Authorization")})
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:role:add')")
-    @Resubmit
+    @PreventDuplicateSubmit
    public Result addRole(@Valid @RequestBody RoleForm roleForm) {
        boolean result = roleService.saveRole(roleForm);
        return Result.judge(result);
--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -8,15 +8,15 @@ import com.youlai.system.common.constant.ExcelConstants;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.common.util.ExcelUtils;
-import com.youlai.system.framework.resubmit.Resubmit;
-import com.youlai.system.listener.UserImportListener;
-import com.youlai.system.pojo.vo.UserImportVO;
-import com.youlai.system.pojo.form.UserForm;
-import com.youlai.system.pojo.entity.SysUser;
-import com.youlai.system.pojo.query.UserPageQuery;
-import com.youlai.system.pojo.vo.UserExportVO;
-import com.youlai.system.pojo.vo.UserInfoVO;
-import com.youlai.system.pojo.vo.UserPageVO;
+import com.youlai.system.common.annotation.PreventDuplicateSubmit;
+import com.youlai.system.listener.easyexcel.UserImportListener;
+import com.youlai.system.model.vo.UserImportVO;
+import com.youlai.system.model.form.UserForm;
+import com.youlai.system.model.entity.SysUser;
+import com.youlai.system.model.query.UserPageQuery;
+import com.youlai.system.model.vo.UserExportVO;
+import com.youlai.system.model.vo.UserInfoVO;
+import com.youlai.system.model.vo.UserPageVO;
 import com.youlai.system.service.SysUserService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -43,7 +43,7 @@ import java.util.List;
 * 用户控制器
 *
 * @author haoxr
- * @date 2022/10/16
+ * @since 2022/10/16
 */
@Tag(name = "02.用户接口")
@RestController
@@ -65,7 +65,7 @@ public class SysUserController {
    @Operation(summary = "新增用户", security = {@SecurityRequirement(name = "Authorization")})
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:user:add')")
-    @Resubmit
+    @PreventDuplicateSubmit
    public Result saveUser(
            @RequestBody @Valid UserForm userForm
    ) {