fix(ruoyi3.8.9): 后端代码同步

2025-12-17 16:36:03 +08:00 · 2025-04-27 11:21:09 +08:00
parent f545198645
commit 5b6ec185c4
47 changed files with 685 additions and 309 deletions
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/CacheController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/CacheController.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.TreeSet;

 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +27,7 @@ import com.fastbee.system.domain.SysCache;

 /**
 * 缓存监控
- * 
+ *
 * @author ruoyi
 */
@Api(tags = "缓存监控")
@@ -87,7 +88,7 @@ public class CacheController
    public AjaxResult getCacheKeys(@PathVariable String cacheName)
    {
        Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
-        return AjaxResult.success(cacheKeys);
+        return AjaxResult.success(new TreeSet<>(cacheKeys));
    }

    @ApiOperation("缓存内容")
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysUserOnlineController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysUserOnlineController.java
@@ -28,7 +28,7 @@ import com.fastbee.system.service.ISysUserOnlineService;

 /**
 * 在线用户监控
- * 
+ *
 * @author ruoyi
 */
@Api(tags = "在线用户监控")
@@ -54,24 +54,15 @@ public class SysUserOnlineController extends BaseController
            LoginUser user = redisCache.getCacheObject(key);
            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-                }
+                userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
            }
            else if (StringUtils.isNotEmpty(ipaddr))
            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
+                userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
            }
            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-                }
+                userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
            }
            else
            {
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysConfigController.java
@@ -93,7 +93,7 @@ public class SysConfigController extends BaseController
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysConfig config)
    {
-        if (configService.checkConfigKeyUnique(config))
+        if (!configService.checkConfigKeyUnique(config))
        {
            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
@@ -110,7 +110,7 @@ public class SysConfigController extends BaseController
    @PutMapping
    public AjaxResult edit(@Validated @RequestBody SysConfig config)
    {
-        if (configService.checkConfigKeyUnique(config))
+        if (!configService.checkConfigKeyUnique(config))
        {
            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java
@@ -84,7 +84,7 @@ public class SysDeptController extends BaseController
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysDept dept)
    {
-        if (deptService.checkDeptNameUnique(dept))
+        if (!deptService.checkDeptNameUnique(dept))
        {
            return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
        }
@@ -103,7 +103,7 @@ public class SysDeptController extends BaseController
    {
        Long deptId = dept.getDeptId();
        deptService.checkDeptDataScope(deptId);
-        if (deptService.checkDeptNameUnique(dept))
+        if (!deptService.checkDeptNameUnique(dept))
        {
            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
        }
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDictTypeController.java
@@ -80,7 +80,7 @@ public class SysDictTypeController extends BaseController
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysDictType dict)
    {
-        if (dictTypeService.checkDictTypeUnique(dict))
+        if (!dictTypeService.checkDictTypeUnique(dict))
        {
            return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
        }
@@ -97,7 +97,7 @@ public class SysDictTypeController extends BaseController
    @PutMapping
    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
    {
-        if (dictTypeService.checkDictTypeUnique(dict))
+        if (!dictTypeService.checkDictTypeUnique(dict))
        {
            return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
        }
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysMenuController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysMenuController.java
@@ -94,7 +94,7 @@ public class SysMenuController extends BaseController
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysMenu menu)
    {
-        if (menuService.checkMenuNameUnique(menu))
+        if (!menuService.checkMenuNameUnique(menu))
        {
            return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
        }
@@ -115,7 +115,7 @@ public class SysMenuController extends BaseController
    @PutMapping
    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
    {
-        if (menuService.checkMenuNameUnique(menu))
+        if (!menuService.checkMenuNameUnique(menu))
        {
            return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
        }
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysPostController.java
@@ -83,11 +83,11 @@ public class SysPostController extends BaseController
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysPost post)
    {
-        if (postService.checkPostNameUnique(post))
+        if (!postService.checkPostNameUnique(post))
        {
            return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
        }
-        else if (postService.checkPostCodeUnique(post))
+        else if (!postService.checkPostCodeUnique(post))
        {
            return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
        }
@@ -104,11 +104,11 @@ public class SysPostController extends BaseController
    @PutMapping
    public AjaxResult edit(@Validated @RequestBody SysPost post)
    {
-        if (postService.checkPostNameUnique(post))
+        if (!postService.checkPostNameUnique(post))
        {
            return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
        }
-        else if (postService.checkPostCodeUnique(post))
+        else if (!postService.checkPostCodeUnique(post))
        {
            return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
        }
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysProfileController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysProfileController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

 import java.util.List;
+import java.util.Map;

 /**
 * 个人信息 业务处理
@@ -78,29 +79,22 @@ public class SysProfileController extends BaseController
    public AjaxResult updateProfile(@RequestBody SysUser user)
    {
        LoginUser loginUser = getLoginUser();
-        SysUser sysUser = loginUser.getUser();
-        user.setUserName(sysUser.getUserName());
-        if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && userService.checkPhoneUnique(user))
+        SysUser currentUser = loginUser.getUser();
+        currentUser.setNickName(user.getNickName());
+        currentUser.setEmail(user.getEmail());
+        currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setSex(user.getSex());
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
        {
            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
-        if (StringUtils.isNotEmpty(user.getEmail())
-                && userService.checkEmailUnique(user))
+        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
        {
-            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
        }
-        user.setUserId(sysUser.getUserId());
-        user.setPassword(null);
-        user.setAvatar(null);
-        user.setDeptId(null);
-        if (userService.updateUserProfile(user) > 0)
+        if (userService.updateUserProfile(currentUser) > 0)
        {
            // 更新缓存用户信息
-            sysUser.setNickName(user.getNickName());
-            sysUser.setPhonenumber(user.getPhonenumber());
-            sysUser.setEmail(user.getEmail());
-            sysUser.setSex(user.getSex());
            tokenService.setLoginUser(loginUser);
            return success();
        }
@@ -113,8 +107,10 @@ public class SysProfileController extends BaseController
    @ApiOperation("重置密码")
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
    {
+        String oldPassword = params.get("oldPassword");
+        String newPassword = params.get("newPassword");
        LoginUser loginUser = getLoginUser();
        String userName = loginUser.getUsername();
        String password = loginUser.getPassword();
@@ -126,10 +122,11 @@ public class SysProfileController extends BaseController
        {
            return error("新密码不能与旧密码相同");
        }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        newPassword = SecurityUtils.encryptPassword(newPassword);
+        if (userService.resetUserPwd(userName, newPassword) > 0)
        {
            // 更新缓存用户密码
-            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            loginUser.getUser().setPassword(newPassword);
            tokenService.setLoginUser(loginUser);
            return success();
        }
--- a/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
+++ b/springboot/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
@@ -102,11 +102,11 @@ public class SysRoleController extends BaseController
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysRole role)
    {
-        if (roleService.checkRoleNameUnique(role))
+        if (!roleService.checkRoleNameUnique(role))
        {
            return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
        }
-        else if (roleService.checkRoleKeyUnique(role))
+        else if (!roleService.checkRoleKeyUnique(role))
        {
            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }
@@ -126,11 +126,11 @@ public class SysRoleController extends BaseController
    {
        roleService.checkRoleAllowed(role);
        roleService.checkRoleDataScope(role.getRoleId());
-        if (roleService.checkRoleNameUnique(role))
+        if (!roleService.checkRoleNameUnique(role))
        {
            return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
        }
-        else if (roleService.checkRoleKeyUnique(role))
+        else if (!roleService.checkRoleKeyUnique(role))
        {
            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }
@@ -142,8 +142,8 @@ public class SysRoleController extends BaseController
            LoginUser loginUser = getLoginUser();
            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
            {
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                tokenService.setLoginUser(loginUser);
            }
            return success();
--- a/springboot/fastbee-admin/src/main/resources/i18n/messages.properties
+++ b/springboot/fastbee-admin/src/main/resources/i18n/messages.properties
@@ -9,13 +9,14 @@ user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分
 user.password.delete=对不起，您的账号已被删除
 user.blocked=用户已封禁，请联系管理员
 role.blocked=角色已封禁，请联系管理员
+login.blocked=很遗憾，访问IP已被列入系统黑名单
 user.logout.success=退出成功

 length.not.valid=长度必须在{min}到{max}个字符之间

 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
 user.password.not.valid=* 5-50个字符
- 
+
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功