超级管理员 角色-菜单-权限 逻辑调整

opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserAndOrgModel.java

@@ -57,7 +57,7 @@ public class UserAndOrgModel extends ApiWrapper {
     @ApiModelProperty(value = "盐值，密码秘钥")
     @ExcelIgnore
     @ValidationArgsLenMax(50)
-    private String secretkey;
+    private String secretKey;
 
     /** 是否锁定 */
     @ApiModelProperty(value = "是否锁定")

opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java

@@ -57,7 +57,7 @@ public class UserModel extends ApiWrapper {
     @ApiModelProperty(value = "盐值，密码秘钥")
     @ExcelIgnore
     @ValidationArgsLenMax(50)
-    private String secretkey;
+    private String secretKey;
 
     /** 是否锁定 */
     @ApiModelProperty(value = "是否锁定")

opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java

@@ -589,11 +589,11 @@ public class UserUtil {
     /**
      * 处理密码
      * @param password 密码
-     * @param secretkey 盐值
+     * @param secretKey 盐值
      * @return String
      */
-    public static String handlePassword(String password, String secretkey){
+    public static String handlePassword(String password, String secretKey){
-        return new Md5Hash(password, secretkey).toHex();
+        return new Md5Hash(password, secretKey).toHex();
     }
 
     // =====================================

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java

@@ -99,7 +99,7 @@ public class LoginRestController {
 
         // 账号不存在、密码错误
         if(user == null ||
-                !user.getPassword().equals(UserUtil.handlePassword(form.getPassword(), user.getSecretkey()))) {
+                !user.getPassword().equals(UserUtil.handlePassword(form.getPassword(), user.getSecretKey()))) {
             // 判断是否需要锁定账号 这里没有直接抛异常 而是返回错误信息， 其中包含 是否开启验证码状态
             TokenMsg lockAccountMsg = UserTokenUtil.lockAccount(form.getUsername());
             throw new TokenException(lockAccountMsg);
@@ -213,8 +213,8 @@ public class LoginRestController {
     // =================
 
     public static void main(String[] args) {
-        String passwordStr = "Aa123456";
+        String passwordStr = "Bb123456";
-        String password = UserUtil.handlePassword(passwordStr, "system");
+        String password = UserUtil.handlePassword(passwordStr, "z25fk1otoj45ref83shq");
         System.out.println(password);
     }
 }

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleMenuRefService.java

@@ -43,6 +43,13 @@ public interface IRoleMenuRefService {
      */
     boolean setPerms(String roleId,String[] permsIds);
 
+    /**
+     * 根据角色ID 移除对应 权限数据
+     * @param roleIds 角色ID
+     * @return boolean
+     */
+    boolean delPermsByRoleIds(List<String> roleIds);
+
     /**
      * 根据菜单ID 移除对应 权限数据
      * @param menuIds 菜单ID

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java

@@ -96,6 +96,14 @@ public class RoleMenuRefServiceImpl extends ServiceImpl<RoleMenuRefMapper,SysRol
         return this.remove(queryWrapper);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delPermsByRoleIds(List<String> menuIds){
+        QueryWrapper<SysRoleMenuRef> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("role_id", menuIds);
+        return this.remove(queryWrapper);
+    }
+
     // =========================
 
     /**

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleServiceImpl.java

@@ -15,7 +15,9 @@
  */
 package org.opsli.modulars.system.role.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.opsli.api.wrapper.system.role.RoleModel;
 import org.opsli.common.constants.MyBatisConstants;
@@ -26,11 +28,15 @@ import org.opsli.core.persistence.querybuilder.chain.TenantHandler;
 import org.opsli.modulars.system.SystemMsg;
 import org.opsli.modulars.system.role.entity.SysRole;
 import org.opsli.modulars.system.role.mapper.RoleMapper;
+import org.opsli.modulars.system.role.service.IRoleMenuRefService;
 import org.opsli.modulars.system.role.service.IRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
+import java.util.List;
+
 
 /**
  * @BelongsProject: opsli-boot
@@ -44,6 +50,8 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
 
     @Autowired(required = false)
     private RoleMapper mapper;
+    @Autowired
+    private IRoleMenuRefService iRoleMenuRefService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -79,6 +87,41 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
         return super.update(model);
     }
 
+    @Override
+    public boolean delete(String id) {
+        // 删除角色下 权限
+        iRoleMenuRefService.delPermsByRoleIds(Convert.toList(String.class, id));
+        return super.delete(id);
+    }
+
+    @Override
+    public boolean deleteAll(String[] ids) {
+        // 删除角色下 权限
+        iRoleMenuRefService.delPermsByRoleIds(Convert.toList(String.class, ids));
+        return super.deleteAll(ids);
+    }
+
+    @Override
+    public boolean delete(RoleModel model) {
+        if(model == null){
+            return false;
+        }
+        // 删除角色下 权限
+        iRoleMenuRefService.delPermsByRoleIds(Convert.toList(String.class, model.getId()));
+        return super.delete(model);
+    }
+
+    @Override
+    public boolean deleteAll(Collection<RoleModel> models) {
+        List<String> roleIds = Lists.newArrayList();
+        for (RoleModel model : models) {
+            roleIds.add(model.getId());
+        }
+        // 删除角色下 权限
+        iRoleMenuRefService.delPermsByRoleIds(roleIds);
+        return super.deleteAll(models);
+    }
+
     /**
      * 唯一验证
      * @param model model

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java

@@ -95,13 +95,13 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
         // 新增可以直接设置密码
         if(StringUtils.isNotEmpty(model.getPassword())){
             // 设置随机新盐值
-            model.setSecretkey(
+            model.setSecretKey(
                     RandomUtil.randomString(20)
             );
             // 处理密码
             model.setPassword(
                     UserUtil.handlePassword(model.getPassword(),
-                            model.getSecretkey())
+                            model.getSecretKey())
             );
         }
 
@@ -142,7 +142,7 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
         // 需要注意的是 不要轻易改修改策略
         model.setUsername(null);
         model.setPassword(null);
-        model.setSecretkey(null);
+        model.setSecretKey(null);
         model.setLoginIp(null);
 
         UserModel update = super.update(model);
@@ -381,7 +381,7 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
 
         // 获得 处理后 老密码
         String orlPassword = UserUtil.handlePassword(userPassword.getOldPassword(),
-                userModel.getSecretkey());
+                userModel.getSecretKey());
 
         // 判断老密码是否正确
         if(!userModel.getPassword().equals(orlPassword)){

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java

@@ -328,7 +328,7 @@ public class UserRestController extends BaseRestController<SysUser, UserModel, I
         page = IService.findPageByCus(page);
         // 密码防止分页泄露处理
         for (UserAndOrgModel userModel : page.getList()) {
-            userModel.setSecretkey(null);
+            userModel.setSecretKey(null);
             userModel.setPassword(null);
         }
         return ResultVo.success(page.getBootstrapData());