rename file

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

@@ -8,7 +8,7 @@ import com.backendsys.modules.system.entity.SysAuth;
 import com.backendsys.modules.system.entity.SysAuthPhone;
 import com.backendsys.modules.system.entity.SysMobileArea;
 import com.backendsys.modules.system.entity.SysUserDTO;
-import com.backendsys.modules.system.service.SysAuthV2Service;
+import com.backendsys.modules.system.service.SysAuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
@@ -27,20 +27,20 @@ import java.io.IOException;
 public class SysAuthController {
 
     @Autowired
-    private SysAuthV2Service sysAuthV2Service;
+    private SysAuthService sysAuthService;
 
     // -------------------------------------------------------------------------------------------------
 
     @Operation(summary = "获取图形验证码")
     @GetMapping("/api/system/auth/getCaptcha")
     public void getCaptcha(HttpServletResponse response) throws IOException {
-        sysAuthV2Service.renderCaptcha(response);
+        sysAuthService.renderCaptcha(response);
     }
     @SysLog("系统用户登录 (用户名)")
     @Operation(summary = "系统用户登录 (用户名)")
     @PostMapping(value = "/api/system/auth/login")
     public Result systemLogin(@Validated(SysAuth.Login.class) @RequestBody SysAuth sysAuth) {
-        return Result.success().put("data", sysAuthV2Service.login(sysAuth));
+        return Result.success().put("data", sysAuthService.login(sysAuth));
     }
     // -------------------------------------------------------------------------------------------------
 
@@ -49,13 +49,13 @@ public class SysAuthController {
     @RateLimiting(key = "getMobileAreaCode")
     @GetMapping("/api/system/getMobileAreaCode")
     public Result getMobileAreaCode(@Validated SysMobileArea sysMobileArea) {
-        return Result.success().put("data", sysAuthV2Service.getMobileAreaList(sysMobileArea));
+        return Result.success().put("data", sysAuthService.getMobileAreaList(sysMobileArea));
     }
     @Operation(summary = "系统用户登录 (手机号码)")
     @PostMapping(value = "/api/system/auth/loginWithPhone")
     @RateLimiting(key = "systemLoginWithPhone")
     public Result systemLoginWithPhone(@Validated(SysAuthPhone.Login.class) @RequestBody SysAuthPhone sysAuthPhone) {
-        return Result.success().put("data", sysAuthV2Service.loginWithPhone(sysAuthPhone));
+        return Result.success().put("data", sysAuthService.loginWithPhone(sysAuthPhone));
     }
 
     @Anonymous
@@ -63,20 +63,20 @@ public class SysAuthController {
     @PostMapping("/api/system/auth/register")
     @RateLimiting(key = "registerUser", limit = 5)
     public Result register(@Validated(SysUserDTO.Register.class) @RequestBody SysUserDTO sysUserDTO) {
-        return Result.success().put("data", sysAuthV2Service.register(sysUserDTO));
+        return Result.success().put("data", sysAuthService.register(sysUserDTO));
     }
 
     @Anonymous
     @Operation(summary = "忘记密码")
     @PostMapping("/api/system/user/forgotPassword")
     public Result forgotPassword(@Validated(SysUserDTO.ForgotPassword.class) @RequestBody SysUserDTO sysUserDTO) {
-        return Result.success().put("data", sysAuthV2Service.forgotPassword(sysUserDTO));
+        return Result.success().put("data", sysAuthService.forgotPassword(sysUserDTO));
     }
 
     @Operation(summary = "退出登录")
     @PostMapping(value = "/api/system/user/logout")
     public Result systemLogout() {
-        return Result.success().put("data", sysAuthV2Service.logout());
+        return Result.success().put("data", sysAuthService.logout());
     }
 
 }

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

@@ -3,7 +3,7 @@ package com.backendsys.modules.system.controller;
 import com.backendsys.exception.CustException;
 import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.system.entity.SysUserRole;
-import com.backendsys.modules.system.service.SysUserRoleV2Service;
+import com.backendsys.modules.system.service.SysUserRoleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,34 +18,34 @@ import java.util.Arrays;
 public class SysUserRoleController {
 
     @Autowired
-    private SysUserRoleV2Service sysUserRoleV2Service;
+    private SysUserRoleService sysUserRoleService;
 
     @Operation(summary = "获取系统用户角色列表")
     @PreAuthorize("@sr.hasPermission('4.1')")
     @GetMapping("/api/system/user/getUserRoleList")
     public Result getUserRoleList(@Validated SysUserRole sysUserRole) {
-        return Result.success().put("data", sysUserRoleV2Service.selectUserRoleList(sysUserRole));
+        return Result.success().put("data", sysUserRoleService.selectUserRoleList(sysUserRole));
     }
 
     @Operation(summary = "获取系统用户角色详情")
     @PreAuthorize("@sr.hasPermission('4.1.1')")
     @GetMapping("/api/system/user/getUserRoleDetail")
     public Result getUserRoleDetail(@Validated(SysUserRole.Detail.class) SysUserRole sysUserRole) {
-        return Result.success().put("data", sysUserRoleV2Service.selectUserRoleDetail(sysUserRole));
+        return Result.success().put("data", sysUserRoleService.selectUserRoleDetail(sysUserRole));
     }
 
     @Operation(summary = "创建系统用户角色")
     @PreAuthorize("@sr.hasPermission('4.1.2')")
     @PostMapping("/api/system/user/createUserRole")
     public Result createUserRole(@Validated(SysUserRole.Create.class) @RequestBody SysUserRole sysUserRole) {
-        return Result.success().put("data", sysUserRoleV2Service.insertUserRole(sysUserRole));
+        return Result.success().put("data", sysUserRoleService.insertUserRole(sysUserRole));
     }
 
     @Operation(summary = "更新系统用户角色")
     @PreAuthorize("@sr.hasPermission('4.1.3')")
     @PutMapping("/api/system/user/updateUserRole")
     public Result updateUserRole(@Validated(SysUserRole.Update.class) @RequestBody SysUserRole sysUserRole) {
-        return Result.success().put("data", sysUserRoleV2Service.updateUserRole(sysUserRole));
+        return Result.success().put("data", sysUserRoleService.updateUserRole(sysUserRole));
     }
 
     @Operation(summary = "删除系统用户角色")
@@ -54,7 +54,7 @@ public class SysUserRoleController {
     public Result deleteUserRole(@Validated(SysUserRole.Delete.class) @RequestBody SysUserRole sysUserRole) {
         // 不可删除 角色ID: (1管理员, 2游客)
         if (Arrays.asList(1L, 2L).contains(sysUserRole.getRole_id())) throw new CustException("该角色不可删除");
-        return Result.success().put("data", sysUserRoleV2Service.deleteUserRole(sysUserRole));
+        return Result.success().put("data", sysUserRoleService.deleteUserRole(sysUserRole));
     }
 
 }

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

@@ -1,7 +1,7 @@
 package com.backendsys.modules.system.controller;
 
 import com.backendsys.modules.common.utils.Result;
-import com.backendsys.modules.system.service.SysUserRolePermissionV2Service;
+import com.backendsys.modules.system.service.SysUserRolePermissionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
 public class SysUserRolePermissionController {
 
     @Autowired
-    private SysUserRolePermissionV2Service sysUserRolePermissionV2Service;
+    private SysUserRolePermissionService sysUserRolePermissionService;
 
     @Operation(summary = "获取系统用户角色权限列表")
     @PreAuthorize("@sr.hasPermission('4.1.5')")
     @GetMapping("/api/system/user/getUserRolePermission")
     public Result getUserRolePermission(Long role_id) {
-        return Result.success().put("data", sysUserRolePermissionV2Service.getUserRolePermission(role_id));
+        return Result.success().put("data", sysUserRolePermissionService.getUserRolePermission(role_id));
     }
 
 }

src/main/java/com/backendsys/modules/system/service/SysAuthV2Service.java → src/main/java/com/backendsys/modules/system/service/SysAuthService.java

@@ -1,14 +1,13 @@
 package com.backendsys.modules.system.service;
 
 import com.backendsys.modules.system.entity.*;
-import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-public interface SysAuthV2Service {
+public interface SysAuthService {
 
     void renderCaptcha(HttpServletResponse response) throws IOException;
     List<SysMobileArea> getMobileAreaList(SysMobileArea sysMobileArea);

src/main/java/com/backendsys/modules/system/service/SysUserRolePermissionV2Service.java → src/main/java/com/backendsys/modules/system/service/SysUserRolePermissionService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
 import java.util.Map;
 
-public interface SysUserRolePermissionV2Service extends IService<SysUserRolePermission> {
+public interface SysUserRolePermissionService extends IService<SysUserRolePermission> {
 
     List<Map<String, Object>> getUserRolePermission(Long role_id);
 

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

@@ -1,13 +1,12 @@
 package com.backendsys.modules.system.service;
 
-import com.backendsys.entity.System.SysUserRoleDTO;
 import com.backendsys.modules.system.entity.SysUserRole;
 import com.backendsys.utils.response.PageEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Map;
 
-public interface SysUserRoleV2Service extends IService<SysUserRole> {
+public interface SysUserRoleService extends IService<SysUserRole> {
 
     PageEntity selectUserRoleList(SysUserRole sysUserRole);
     SysUserRole selectUserRoleDetail(SysUserRole sysUserRole);

src/main/java/com/backendsys/modules/system/service/impl/SysAuthV2ServiceImpl.java → src/main/java/com/backendsys/modules/system/service/impl/SysAuthServiceImpl.java

@@ -10,7 +10,7 @@ import com.backendsys.modules.system.dao.SysMobileAreaDao;
 import com.backendsys.modules.system.dao.SysUserDao;
 import com.backendsys.modules.system.dao.SysUserInfoDao;
 import com.backendsys.modules.system.entity.*;
-import com.backendsys.modules.system.service.SysAuthV2Service;
+import com.backendsys.modules.system.service.SysAuthService;
 import com.backendsys.modules.system.service.SysUserIntegralService;
 import com.backendsys.modules.system.service.SysUserService;
 import com.backendsys.utils.response.ResultEnum;
@@ -32,7 +32,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @Service
-public class SysAuthV2ServiceImpl implements SysAuthV2Service {
+public class SysAuthServiceImpl implements SysAuthService {
 
     @Autowired
     private JwtUtil jwtUtil;

src/main/java/com/backendsys/modules/system/service/impl/SysUserRolePermissionV2ServiceImpl.java → src/main/java/com/backendsys/modules/system/service/impl/SysUserRolePermissionServiceImpl.java

@@ -2,7 +2,7 @@ package com.backendsys.modules.system.service.impl;
 
 import com.backendsys.modules.system.dao.SysUserRolePermissionDao;
 import com.backendsys.modules.system.entity.SysUserRolePermission;
-import com.backendsys.modules.system.service.SysUserRolePermissionV2Service;
+import com.backendsys.modules.system.service.SysUserRolePermissionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class SysUserRolePermissionV2ServiceImpl extends ServiceImpl<SysUserRolePermissionDao, SysUserRolePermission> implements SysUserRolePermissionV2Service {
+public class SysUserRolePermissionServiceImpl extends ServiceImpl<SysUserRolePermissionDao, SysUserRolePermission> implements SysUserRolePermissionService {
 
     @Autowired
     private SysUserRolePermissionDao sysUserRolePermissionDao;

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

@@ -10,7 +10,7 @@ import com.backendsys.modules.system.entity.SysUserRole;
 import com.backendsys.modules.system.entity.SysUserRolePermission;
 import com.backendsys.modules.system.entity.SysUserRolePermissionRelation;
 import com.backendsys.modules.system.entity.SysUserRoleRelation;
-import com.backendsys.modules.system.service.SysUserRoleV2Service;
+import com.backendsys.modules.system.service.SysUserRoleService;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageInfoResult;
 import com.backendsys.utils.v2.PageUtils;
@@ -24,7 +24,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
-public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserRole> implements SysUserRoleV2Service {
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserRole> implements SysUserRoleService {
 
     @Autowired
     private SysUserRoleDao sysUserRoleDao;