【CHG】修改角色管理接口

railway-admin/src/main/java/com/railway/web/controller/system/SysProfileController.java

@@ -13,6 +13,7 @@ import com.railway.framework.web.service.TokenService;
 import com.railway.system.service.ISysFileService;
 import com.railway.system.service.ISysUserService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -27,7 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author railway
  */
-@Api(tags = "个人信息")
+@Api(tags = "系统管理 - 个人信息")
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {
@@ -46,6 +47,7 @@ public class SysProfileController extends BaseController {
   /**
    * 个人信息
    */
+  @ApiOperation(value = "获取个人信息", response = AjaxResult.class)
   @GetMapping
   public AjaxResult profile() {
     LoginUser loginUser = getLoginUser();
@@ -59,6 +61,7 @@ public class SysProfileController extends BaseController {
   /**
    * 修改用户
    */
+  @ApiOperation(value = "修改用户", response = AjaxResult.class)
   @Log(title = "个人信息", businessType = BusinessType.UPDATE)
   @PutMapping
   public AjaxResult updateProfile(@RequestBody SysUser user) {
@@ -89,6 +92,7 @@ public class SysProfileController extends BaseController {
   /**
    * 重置密码
    */
+  @ApiOperation(value = "修改密码", response = AjaxResult.class)
   @Log(title = "个人信息", businessType = BusinessType.UPDATE)
   @PutMapping("/updatePwd")
   public AjaxResult updatePwd(String oldPassword, String newPassword) {
@@ -113,6 +117,7 @@ public class SysProfileController extends BaseController {
   /**
    * 头像上传
    */
+  @ApiOperation(value = "头像上传", response = AjaxResult.class)
   @Log(title = "用户头像", businessType = BusinessType.UPDATE)
   @PostMapping("/avatar")
   public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception {

railway-admin/src/main/java/com/railway/web/controller/system/SysUserController.java

@@ -129,7 +129,6 @@ public class SysUserController extends BaseController {
       return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
     }
     user.setCreateBy(getUsername());
-    user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
     return toAjax(userService.insertUser(user));
   }
 
@@ -176,7 +175,6 @@ public class SysUserController extends BaseController {
   @PutMapping("/resetPwd")
   public AjaxResult resetPwd(@RequestBody SysUser user) {
     userService.checkUserAllowed(user);
-    user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
     user.setUpdateBy(getUsername());
     return toAjax(userService.resetPwd(user));
   }

railway-system/src/main/java/com/railway/system/service/impl/SysRoleServiceImpl.java

@@ -208,10 +208,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
    * @return 结果
    */
   @Override
-  @Transactional
+  @Transactional(rollbackFor = Exception.class)
   public int insertRole(SysRole role) {
     // 新增角色信息
     roleMapper.insertRole(role);
+    authDataScope(role);
     return insertRoleMenu(role);
   }
 
@@ -228,6 +229,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
     roleMapper.updateRole(role);
     // 删除角色与菜单关联
     roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+    authDataScope(role);
     return insertRoleMenu(role);
   }
 

railway-system/src/main/java/com/railway/system/service/impl/SysUserServiceImpl.java

@@ -229,8 +229,13 @@ public class SysUserServiceImpl implements ISysUserService {
    * @return 结果
    */
   @Override
-  @Transactional
+  @Transactional(rollbackFor = Exception.class)
   public int insertUser(SysUser user) {
+    String password = user.getPassword();
+    if(StringUtils.isEmpty(password)){
+      password = configService.selectConfigByKey("sys.user.initPassword");
+    }
+    user.setPassword(SecurityUtils.encryptPassword(password));
     // 新增用户信息
     int rows = userMapper.insertUser(user);
     // 新增用户岗位关联
@@ -327,6 +332,8 @@ public class SysUserServiceImpl implements ISysUserService {
    */
   @Override
   public int resetPwd(SysUser user) {
+    String password = configService.selectConfigByKey("sys.user.initPassword");
+    user.setPassword(SecurityUtils.encryptPassword(password));
     return userMapper.updateUser(user);
   }