sa-token update

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java

@@ -105,7 +105,6 @@ public class EmployeePermissionService implements StpInterface {
 
     /**
      * 清理角色关联权限 缓存
-     * TODO listen 待调用
      *
      * @param roleId
      */
@@ -115,7 +114,6 @@ public class EmployeePermissionService implements StpInterface {
 
     /**
      * 清理 员工关联角色 缓存
-     * TODO listen 待调用
      *
      * @param employeeId
      */

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java

@@ -72,12 +72,4 @@ public class LoginController {
     public ResponseDTO<CaptchaVO> getCaptcha() {
         return loginService.getCaptcha();
     }
-
-    // TODO listen 测试待删除
-    @NoNeedLogin
-    @ApiOperation("测试权限 @listen")
-    @GetMapping("/listen/test")
-    public ResponseDTO<String> test() {
-        return ResponseDTO.ok();
-    }
 }

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -93,7 +93,7 @@ public class LoginService {
         // 校验 图形验证码
         ResponseDTO<String> checkCaptcha = captchaService.checkCaptcha(loginForm);
         if (!checkCaptcha.getOk()) {
-            // TODO listen 待放开 return ResponseDTO.error(checkCaptcha);
+           return ResponseDTO.error(checkCaptcha);
         }
 
         /**
@@ -160,8 +160,6 @@ public class LoginService {
         List<MenuVO> menuAndPointsList = employeePermissionService.getEmployeeMenuAndPointsList(employeeEntity.getEmployeeId(), employeeEntity.getAdministratorFlag());
         //前端菜单
         loginEmployeeDetail.setMenuList(menuAndPointsList);
-        // TODO listen 原先为什么返回权限
-        // loginEmployeeDetail.setAuthorities(employeePermissionService.buildAuthorities(menuAndPointsList));
 
         //上次登录信息
         LoginLogVO loginLogVO = loginLogService.queryLastByUserId(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java

@@ -1,23 +1,23 @@
 package net.lab1024.sa.admin.module.system.role.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
+import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
+import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
+import net.lab1024.sa.admin.module.system.employee.service.EmployeePermissionService;
 import net.lab1024.sa.admin.module.system.role.dao.RoleDao;
 import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
+import net.lab1024.sa.admin.module.system.role.domain.entity.RoleEmployeeEntity;
 import net.lab1024.sa.admin.module.system.role.domain.entity.RoleEntity;
 import net.lab1024.sa.admin.module.system.role.domain.form.RoleEmployeeQueryForm;
 import net.lab1024.sa.admin.module.system.role.domain.form.RoleEmployeeUpdateForm;
 import net.lab1024.sa.admin.module.system.role.domain.vo.RoleSelectedVO;
-import net.lab1024.sa.common.common.code.UserErrorCode;
+import net.lab1024.sa.admin.module.system.role.manager.RoleEmployeeManager;
 import net.lab1024.sa.common.common.constant.StringConst;
 import net.lab1024.sa.common.common.domain.PageResult;
 import net.lab1024.sa.common.common.domain.ResponseDTO;
 import net.lab1024.sa.common.common.util.SmartBeanUtil;
 import net.lab1024.sa.common.common.util.SmartPageUtil;
-import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
-import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
-import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
-import net.lab1024.sa.admin.module.system.role.domain.entity.RoleEmployeeEntity;
-import net.lab1024.sa.admin.module.system.role.manager.RoleEmployeeManager;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -90,6 +90,9 @@ public class RoleEmployeeService {
             return ResponseDTO.userErrorParam();
         }
         roleEmployeeDao.deleteByEmployeeIdRoleId(employeeId, roleId);
+
+        // 清理员工角色缓存
+        EmployeePermissionService.clearUserRoleCache(employeeId);
         return ResponseDTO.ok();
     }
 
@@ -100,7 +103,11 @@ public class RoleEmployeeService {
      * @return ResponseDTO<String>
      */
     public ResponseDTO<String> batchRemoveRoleEmployee(RoleEmployeeUpdateForm roleEmployeeUpdateForm) {
-        roleEmployeeDao.batchDeleteEmployeeRole(roleEmployeeUpdateForm.getRoleId(), roleEmployeeUpdateForm.getEmployeeIdList());
+        List<Long> employeeIdList = roleEmployeeUpdateForm.getEmployeeIdList();
+        roleEmployeeDao.batchDeleteEmployeeRole(roleEmployeeUpdateForm.getRoleId(), employeeIdList);
+
+        // 清理员工角色缓存
+        employeeIdList.forEach(EmployeePermissionService::clearUserRoleCache);
         return ResponseDTO.ok();
     }
 
@@ -122,6 +129,9 @@ public class RoleEmployeeService {
         }
         // 保存数据
         roleEmployeeManager.saveRoleEmployee(roleId, roleEmployeeList);
+
+        // 清理员工角色缓存
+        employeeIdList.forEach(EmployeePermissionService::clearUserRoleCache);
         return ResponseDTO.ok();
     }
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java

@@ -1,6 +1,7 @@
 package net.lab1024.sa.admin.module.system.role.service;
 
 import com.google.common.collect.Lists;
+import net.lab1024.sa.admin.module.system.employee.service.EmployeePermissionService;
 import net.lab1024.sa.admin.module.system.menu.dao.MenuDao;
 import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity;
 import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuSimpleTreeVO;
@@ -67,7 +68,10 @@ public class RoleMenuService {
             roleMenuEntity.setMenuId(menuId);
             roleMenuEntityList.add(roleMenuEntity);
         }
-        roleMenuManager.updateRoleMenu(roleMenuUpdateForm.getRoleId(), roleMenuEntityList);
+        roleMenuManager.updateRoleMenu(roleId, roleMenuEntityList);
+
+        // 清理角色缓存
+        EmployeePermissionService.clearRoleCache(roleId);
         return ResponseDTO.ok();
     }
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.system.role.service;
 
+import net.lab1024.sa.admin.module.system.employee.service.EmployeePermissionService;
 import net.lab1024.sa.admin.module.system.role.dao.RoleDao;
 import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
 import net.lab1024.sa.admin.module.system.role.dao.RoleMenuDao;
@@ -68,6 +69,9 @@ public class RoleService {
         roleDao.deleteById(roleId);
         roleMenuDao.deleteByRoleId(roleId);
         roleEmployeeDao.deleteByRoleId(roleId);
+
+        // 清理角色缓存
+        EmployeePermissionService.clearRoleCache(roleId);
         return ResponseDTO.ok();
     }