From 7834ca58d2ac1d9a3ba85f20ca03a8c902d0d6a9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 23 七月 2025 10:58:07 +0800
Subject: [PATCH] 自动退出修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 44 ++++++++++----------------------------------
1 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index d011a75..f78876d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;
-import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
@@ -12,7 +11,6 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -88,7 +86,6 @@
SysUser sysUser = userService.selectUserById(userId);
SysUserVO sysUserVO = new SysUserVO();
BeanUtils.copyProperties(sysUser,sysUserVO);
-
return AjaxResult.success(sysUser);
}
@@ -149,10 +146,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:add')")
@ApiOperation(value = "新增用户管理",response = SysUser.class)
@Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
- @PostMapping("/api/system/user/add")
- public R<String> add(@RequestBody String param)
+ @PostMapping("/system/user/add")
+ public R<String> add(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
@@ -163,9 +159,7 @@
return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setCreateBy(getUsername());
- user.setPassword(SecurityUtils.encryptPassword("123456"));
- user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
- user.setUserIdentification(CodeGenerateUtils.generateVolumeSn());
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
userService.insertUser(user);
return R.ok();
}
@@ -176,10 +170,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
@ApiOperation(value = "修改用户管理")
@Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/edit")
- public R edit(@RequestBody String param)
+ @PostMapping("/system/user/edit")
+ public R edit(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
@@ -196,23 +189,7 @@
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
- user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
return R.ok(userService.updateUser(user));
- }
-
- /**
- * 修改用户签名
- */
- // @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @ApiOperation(value = "修改用户签名")
- @Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/editSignPicture")
- public R editSignPicture(@RequestBody String param)
- {
- Long userId = tokenService.getLoginUser().getUserId();
- SysUser user = JSON.parseObject(param,SysUser.class);
- user.setUserId(userId);
- return R.ok(userService.editSignPicture(user));
}
/**
@@ -242,10 +219,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@ApiOperation(value = "重置密码")
@Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/resetPwd")
- public AjaxResult resetPwd(@RequestBody String param)
+ @PostMapping("/system/user/resetPwd")
+ public AjaxResult resetPwd(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -272,9 +248,9 @@
user.setOperatingTime(LocalDateTime.now());
user.setOperatingPerson(sysUser.getNickName()+"("+sysUser.getUserName()+")");
- if(dto.getStatus()==1){
- redisCache.deleteObject(tokenService.getTokenKey(loginUser.getToken()));
- }
+// if(dto.getStatus()==1){
+// redisCache.deleteObject(tokenService.getTokenKey(loginUser.getToken()));
+// }
return AjaxResult.success(userService.updateUserStatus(user));
}
--
Gitblit v1.7.1