Rename api url

src/main/java/com/backendsys/controller/Systems/SysAuthController.java

@@ -40,23 +40,23 @@ public class SysAuthController {
     @Autowired
     private SysAuthService sysAuthService;
 
-    /**
-     * 获得图形验证码
-     */
-    @GetMapping("/api/system/auth/getCaptcha")
-    public void getCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        sysAuthService.renderCaptcha(request, response);
-    }
+//    /**
+//     * 获得图形验证码
+//     */
+//    @GetMapping("/api/system/auth/getCaptcha")
+//    public void getCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        sysAuthService.renderCaptcha(request, response);
+//    }
 
     /** --------------------------------------------------------------------------------------- */
-    /**
-     * 登录 (用户名)
-     */
-    @PostMapping(value = "/api/system/auth/login")
-    @RateLimiting(key = "systemLogin", limit = 5)
-    public Result systemLogin(HttpServletRequest request, @Validated(SysUserDTO.Login.class) @RequestBody SysUserDTO sysUserDTO) {
-        return Result.success(sysAuthService.login(request, sysUserDTO));
-    }
+//    /**
+//     * 登录 (用户名)
+//     */
+//    @PostMapping(value = "/api/system/auth/login")
+//    @RateLimiting(key = "systemLogin", limit = 5)
+//    public Result systemLogin(HttpServletRequest request, @Validated(SysUserDTO.Login.class) @RequestBody SysUserDTO sysUserDTO) {
+//        return Result.success(sysAuthService.login(request, sysUserDTO));
+//    }
     /**
      * 登录 (手机号码)
      */

src/main/java/com/backendsys/controller/Systems/SysMobileAreaCodeController.java

@@ -1,26 +1,26 @@
-package com.backendsys.controller.Systems;
-
-import com.backendsys.entity.System.SysMobileAreaCodeDTO;
-import com.backendsys.mapper.System.SysMobileAreaCodeMapper;
-import com.backendsys.utils.response.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Validated
-@RestController
-public class SysMobileAreaCodeController {
-
-    @Autowired
-    private SysMobileAreaCodeMapper sysMobileAreaCodeMapper;
-
-    /**
-     * 获得手机号地区列表
-     */
-    @GetMapping("/api/public/system/getMobileAreaCode")
-    public Result getMobileAreaCode(@Validated SysMobileAreaCodeDTO sysMobileAreaCodeDTO) {
-        return Result.success(sysMobileAreaCodeMapper.queryMobileAreaCodeList(sysMobileAreaCodeDTO));
-    }
-
-}
+//package com.backendsys.controller.Systems;
+//
+//import com.backendsys.entity.System.SysMobileAreaCodeDTO;
+//import com.backendsys.mapper.System.SysMobileAreaCodeMapper;
+//import com.backendsys.utils.response.Result;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@Validated
+//@RestController
+//public class SysMobileAreaCodeController {
+//
+//    @Autowired
+//    private SysMobileAreaCodeMapper sysMobileAreaCodeMapper;
+//
+//    /**
+//     * 获得手机号地区列表
+//     */
+//    @GetMapping("/api/public/system/getMobileAreaCode")
+//    public Result getMobileAreaCode(@Validated SysMobileAreaCodeDTO sysMobileAreaCodeDTO) {
+//        return Result.success(sysMobileAreaCodeMapper.queryMobileAreaCodeList(sysMobileAreaCodeDTO));
+//    }
+//
+//}

src/main/java/com/backendsys/controller/Systems/SysUserController.java

@@ -60,34 +60,34 @@ public class SysUserController {
         return Result.success(sysUserService.queryUserWithLogined(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserDTO));
     }
 
-    @PreAuthorize("@ss.hasPermi('3.2')")
-    @GetMapping("/api/system/user/getUser")
-    public Result getUser(@Validated PageDTO pageDTO, @Validated SysUserDTO sysUserDTO) {
-        return Result.success(sysUserService.queryUserList(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserDTO));
-    }
-
-    /**
-     * 查看用户详情
-     * - 1.如果不传 user_id 则查看自己的用户信息
-     * - 2.如果传 user_id，需要具备权限才能查看他人用户信息
-     * - 3.除了超管自己其他人不可以查看超管信息
-     */
-    @QueryNullCheck(serviceClass = SysUserService.class, serviceMethod = "queryUserById", argField = "user_id", message = "用户不存在")
-    @GetMapping("/api/system/user/getUserDetail")
-    public Result getUserDetail(@Validated(SysUserDTO.Detail.class) SysUserDTO sysUserDTO) {
-
-        // [查询] 自身 UserId
-        Long user_id = httpRequestAspect.getUserId();
-
-        // 1.如果 user_id 为空，则查看自己
-        if (sysUserDTO.getUser_id() == null) sysUserDTO.setUser_id(user_id);
-        // 2.判断是否匹配当前 {用户ID} 与 {用户权限}，不是则抛出错误
-        permissionUtil.checkUserIdAndPermission(sysUserDTO.getUser_id(), Arrays.asList("3.2.1"));
-        // 3.判断是否 首位超级管理员 (id:1)，不是则抛出错误
-        permissionUtil.checkSuperAdminOfFirst(sysUserDTO.getUser_id());
-
-        return Result.success(sysUserService.queryUserById(sysUserDTO.getUser_id()));
-    }
+//    @PreAuthorize("@ss.hasPermi('3.2')")
+//    @GetMapping("/api/system/user/getUser")
+//    public Result getUser(@Validated PageDTO pageDTO, @Validated SysUserDTO sysUserDTO) {
+//        return Result.success(sysUserService.queryUserList(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserDTO));
+//    }
+
+//    /**
+//     * 查看用户详情
+//     * - 1.如果不传 user_id 则查看自己的用户信息
+//     * - 2.如果传 user_id，需要具备权限才能查看他人用户信息
+//     * - 3.除了超管自己其他人不可以查看超管信息
+//     */
+//    @QueryNullCheck(serviceClass = SysUserService.class, serviceMethod = "queryUserById", argField = "user_id", message = "用户不存在")
+//    @GetMapping("/api/system/user/getUserDetail")
+//    public Result getUserDetail(@Validated(SysUserDTO.Detail.class) SysUserDTO sysUserDTO) {
+//
+//        // [查询] 自身 UserId
+//        Long user_id = httpRequestAspect.getUserId();
+//
+//        // 1.如果 user_id 为空，则查看自己
+//        if (sysUserDTO.getUser_id() == null) sysUserDTO.setUser_id(user_id);
+//        // 2.判断是否匹配当前 {用户ID} 与 {用户权限}，不是则抛出错误
+//        permissionUtil.checkUserIdAndPermission(sysUserDTO.getUser_id(), Arrays.asList("3.2.1"));
+//        // 3.判断是否 首位超级管理员 (id:1)，不是则抛出错误
+//        permissionUtil.checkSuperAdminOfFirst(sysUserDTO.getUser_id());
+//
+//        return Result.success(sysUserService.queryUserById(sysUserDTO.getUser_id()));
+//    }
 
     @PreAuthorize("@ss.hasPermi('3.2.2')")
     @PostMapping("/api/system/user/createUser")
@@ -214,24 +214,24 @@ public class SysUserController {
         return Result.success(sysUserService.deleteUserBatch(sysUserDTO.getUser_ids()), "删除成功 (批量)");
     }
 
-    @PreAuthorize("@ss.hasPermi('3.2.7')")
-    @PostMapping("/api/system/user/kickUser")
-    public Result kickUser(@Validated(SysUserDTO.Delete.class) @RequestBody SysUserDTO sysUserDTO) {
-
-        // 判断不可为超级管理员(首位)
-        Boolean isOnlySuperAdmin = OnlySuperAdmin(sysUserDTO);
-        if (!isOnlySuperAdmin) {
-            return Result.error(ResultEnum.AUTH_USER_ERROR.getCode(), ResultEnum.AUTH_USER_ERROR.getMessage());
-        }
-
-        // 判断是否为自身账号
-        Long self_user_id = httpRequestAspect.getUserId();
-        Long request_user_id = sysUserDTO.getUser_id();
-        if (self_user_id.longValue() == request_user_id) {
-            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "不能踢除自身账号");
-        }
-
-        return Result.success(sysUserService.kickUser(sysUserDTO.getUser_id()), "操作成功");
-    }
+//    @PreAuthorize("@ss.hasPermi('3.2.7')")
+//    @PostMapping("/api/system/user/kickUser")
+//    public Result kickUser(@Validated(SysUserDTO.Delete.class) @RequestBody SysUserDTO sysUserDTO) {
+//
+//        // 判断不可为超级管理员(首位)
+//        Boolean isOnlySuperAdmin = OnlySuperAdmin(sysUserDTO);
+//        if (!isOnlySuperAdmin) {
+//            return Result.error(ResultEnum.AUTH_USER_ERROR.getCode(), ResultEnum.AUTH_USER_ERROR.getMessage());
+//        }
+//
+//        // 判断是否为自身账号
+//        Long self_user_id = httpRequestAspect.getUserId();
+//        Long request_user_id = sysUserDTO.getUser_id();
+//        if (self_user_id.longValue() == request_user_id) {
+//            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "不能踢除自身账号");
+//        }
+//
+//        return Result.success(sysUserService.kickUser(sysUserDTO.getUser_id()), "操作成功");
+//    }
 
 }

src/main/java/com/backendsys/controller/Systems/SysUserPointController.java

@@ -49,13 +49,14 @@ public class SysUserPointController {
     private void inspectPointOperation(SysUserPointsDTO sysUserPointsDTO) {
         Long user_id = httpRequestAspect.getUserId();
         // 如果目标用户ID为空，则设置为当前用户ID
+
         if (sysUserPointsDTO.getTarget_user_id() == null) {
             sysUserPointsDTO.setTarget_user_id(user_id);
         }
         // 检查是否为超级管理员
         boolean isSuper = permissionUtil.isSuper();
         // 如果非超级管理员且目标用户ID与当前用户ID不匹配，则抛出权限异常
-        if (!isSuper && !sysUserPointsDTO.getTarget_user_id().equals(user_id)) {
+        if (!isSuper && sysUserPointsDTO.getTarget_user_id() != null && !sysUserPointsDTO.getTarget_user_id().equals(user_id)) {
             throw new CustException("当前用户没有权限查看或操作其他用户积分");
         }
     }

src/main/java/com/backendsys/controller/Systems/SysUserRoleController.java

@@ -41,12 +41,12 @@ public class SysUserRoleController {
         return CollUtil.isNotEmpty(ids) && ids.size() != CollUtil.distinct(ids).size();
     }
 
-    // @Operation(summary = "系统用户角色列表")
-    @PreAuthorize("@ss.hasPermi('4.1')")
-    @GetMapping("/api/system/user/getUserRole")
-    public Result getUserRole(@Validated PageDTO pageDTO, @Validated SysUserRoleDTO sysUserRoleDTO) {
-        return Result.success(sysUserRoleService.queryUserRole(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserRoleDTO));
-    }
+//    // @Operation(summary = "系统用户角色列表")
+//    @PreAuthorize("@ss.hasPermi('4.1')")
+//    @GetMapping("/api/system/user/getUserRole")
+//    public Result getUserRole(@Validated PageDTO pageDTO, @Validated SysUserRoleDTO sysUserRoleDTO) {
+//        return Result.success(sysUserRoleService.queryUserRole(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserRoleDTO));
+//    }
 
     //@Operation(summary = "系统用户角色详情")
     @PreAuthorize("@ss.hasPermi('4.1.1')")

src/main/java/com/backendsys/modules/system/controller/SysAuthV2Controller.java

@@ -28,22 +28,22 @@ public class SysAuthV2Controller {
     private SysAuthV2Service sysAuthV2Service;
 
     @Operation(summary = "获取图形验证码")
-    @GetMapping("/api/v2/system/auth/getCaptcha")
+    @GetMapping("/api/system/auth/getCaptcha")
     public void getCaptcha(HttpServletResponse response) throws IOException {
         sysAuthV2Service.renderCaptcha(response);
     }
 
     @Operation(summary = "获取手机号地区列表")
-    @GetMapping("/api/v2/public/system/getMobileAreaCode")
+    @GetMapping("/api/public/system/getMobileAreaCode")
     public Result getMobileAreaCode(@Validated SysMobileArea sysMobileArea) {
         return Result.success().put("data", sysAuthV2Service.getMobileAreaList(sysMobileArea));
     }
 
     @Operation(summary = "系统用户登录")
-    @PostMapping(value = "/api/v2/system/auth/login")
+    @PostMapping(value = "/api/system/auth/login")
     // @RateLimiting(key = "systemLogin", limit = 5) // 限流？
     public Result systemLogin(@Validated(SysAuth.Login.class) @RequestBody SysAuth sysAuth) {
-        return Result.success().put("data", sysAuthV2Service.login(sysAuth)); // sysAuthService.login(request, sysUserDTO));
+        return Result.success().put("data", sysAuthV2Service.login(sysAuth));
     }
 
 }

src/main/java/com/backendsys/modules/system/controller/SysDictionaryController.java

@@ -0,0 +1,20 @@
+package com.backendsys.modules.system.controller;
+
+import com.backendsys.modules.common.utils.Result;
+import com.backendsys.service.System.SysDictionaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class SysDictionaryController {
+
+    @Autowired
+    private SysDictionaryService sysDictionaryService;
+
+    @GetMapping("/api/public/system/sysDictionary")
+    public Result getDictionary() {
+        return Result.success().put("data", sysDictionaryService.queryDictionary());
+    }
+
+}

src/main/java/com/backendsys/modules/system/controller/SysUserRoleV2Controller.java

@@ -25,9 +25,9 @@ public class SysUserRoleV2Controller {
 
     @Operation(summary = "获取系统用户角色列表")
     @PreAuthorize("@ss.hasPermi('4.1')")
-    @GetMapping("/api/v2/system/user/getUserRole")
-    public Result getUserRole(@Validated SysUserRoleDTO sysUserRoleDTO) {
-        return Result.success().put("data", sysUserRoleV2Service.getUserRole(sysUserRoleDTO));
+    @GetMapping("/api/system/user/getUserRoleList")
+    public Result getUserRoleList(@Validated SysUserRoleDTO sysUserRoleDTO) {
+        return Result.success().put("data", sysUserRoleV2Service.getUserRoleList(sysUserRoleDTO));
     }
 
     @Operation(summary = "获取系统用户角色详情")

src/main/java/com/backendsys/modules/system/controller/SysUserV2Controller.java

@@ -32,10 +32,11 @@ public class SysUserV2Controller {
 
     @Operation(summary = "获取系统用户列表")
     @PreAuthorize("@sr.hasPermission('3.2')")
-    @GetMapping("/api/v2/system/user/getUserList")
+    @GetMapping("/api/system/user/getUserList")
     public Result getUserList(SysUserDTO sysUserDTO) {
         return Result.success().put("data", sysUserV2Service.selectUserList(sysUserDTO));
     }
+
     @Operation(summary = "获取系统用户列表 (在线的)")
     @PreAuthorize("@ss.hasPermi('3.1')")
     @GetMapping("/api/v2/system/user/getUserOnlineList")
@@ -50,7 +51,7 @@ public class SysUserV2Controller {
      */
     @Operation(summary = "获取系统用户详情")
     @PreAuthorize("@sr.hasPermission('3.2.1')")
-    @GetMapping("/api/v2/system/user/getUserDetail")
+    @GetMapping("/api/system/user/getUserDetail")
     public Result getUserDetail(@Parameter(description = "用户ID") Long user_id) {
 
         // 查询自身的用户信息 (不传参数)
@@ -170,7 +171,7 @@ public class SysUserV2Controller {
 
     @Operation(summary = "踢出系统用户")
     @PreAuthorize("@ss.hasPermi('3.2.7')")
-    @PostMapping("/api/v2/system/user/kickUser")
+    @PostMapping("/api/system/user/kickUser")
     public Result kickUser(@Validated(SysUserDTO.Kick.class) @RequestBody SysUserDTO sysUserDTO) {
 
         Long user_id = sysUserDTO.getUser_id();

src/main/java/com/backendsys/modules/system/service/SysUserRoleV2Service.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 public interface SysUserRoleV2Service extends IService<SysUserRole> {
 
-    PageEntity getUserRole(SysUserRoleDTO sysUserRoleDTO);
+    PageEntity getUserRoleList(SysUserRoleDTO sysUserRoleDTO);
     SysUserRole getUserRoleDetail(SysUserRoleDTO sysUserRoleDTO);
     Map<String, Object> insertUserRole(SysUserRoleDTO sysUserRoleDTO);
     Map<String, Object> updateUserRole(SysUserRoleDTO sysUserRoleDTO);

src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleV2ServiceImpl.java

@@ -33,7 +33,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
     private SysUserRoleModuleRelationDao sysUserRoleModuleRelationDao;
 
     @Override
-    public PageEntity getUserRole(SysUserRoleDTO sysUserRoleDTO) {
+    public PageEntity getUserRoleList(SysUserRoleDTO sysUserRoleDTO) {
         PageUtils.startPage();  // 分页
         List<SysUserRole> list = sysUserRoleDao.selectUserRoleList(sysUserRoleDTO);
         return new PageInfoResult(list).toEntity();