From c894c3d934288aa78ee120dcd341fd074f517cef Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Wed, 12 Jul 2023 20:13:22 +0800 Subject: [PATCH 01/11] add sa-token --- smart-admin-api/pom.xml | 18 ++ .../sa/admin/config/JweAspectConfig.java | 4 +- .../sa/admin/config/SecurityConfig.java | 40 ---- .../sa/admin/config/SecurityMethodConfig.java | 50 ---- .../goods/controller/GoodsController.java | 12 +- .../business/oa/bank/BankController.java | 2 +- .../oa/enterprise/EnterpriseController.java | 2 +- .../oa/invoice/InvoiceController.java | 2 +- .../notice/controller/NoticeController.java | 6 +- .../service/DataScopeSqlConfigService.java | 4 +- .../controller/DepartmentController.java | 8 +- .../controller/EmployeeController.java | 16 +- .../service/EmployeePermissionService.java | 41 ---- .../employee/service/EmployeeService.java | 8 +- .../login/controller/LoginController.java | 34 ++- .../login/domain/LoginEmployeeDetail.java | 80 +------ .../module/system/login/domain/LoginForm.java | 9 +- .../system/login/service/LoginService.java | 63 ++--- .../menu/controller/MenuController.java | 14 +- .../role/controller/RoleController.java | 8 +- .../controller/RoleDataScopeController.java | 4 +- .../controller/RoleEmployeeController.java | 8 +- .../role/controller/RoleMenuController.java | 4 +- .../system/support/AdminCacheController.java | 6 +- .../support/AdminChangeLogController.java | 10 +- .../system/support/AdminConfigController.java | 8 +- .../system/support/AdminFileController.java | 4 +- .../support/AdminHelpDocController.java | 14 +- .../support/AdminLoginLogController.java | 4 +- .../support/AdminOperateLogController.java | 6 +- .../system/support/AdminReloadController.java | 6 +- .../support/AdminSerialNumberController.java | 6 +- smart-admin-api/sa-common/pom.xml | 11 +- .../interceptor/AbstractInterceptor.java | 2 +- .../security/AbstractSecurityConfig.java | 93 -------- .../SecurityAuthenticationFailHandler.java | 43 ---- .../common/security/SecurityMethodSource.java | 66 ------ .../SecurityPermissionCheckService.java | 74 ------ .../common/security/SecurityTokenFilter.java | 64 ------ .../common/common/util/SmartRequestUtil.java | 18 +- .../sa/common/config/RepeatSubmitConfig.java | 2 +- .../handler/GlobalExceptionHandler.java | 10 - .../datatracer/service/DataTracerService.java | 4 +- .../controller/FeedbackController.java | 3 +- .../file/controller/FileController.java | 10 +- .../helpdoc/controller/HelpDocController.java | 2 +- .../operatelog/core/OperateLogAspect.java | 2 +- .../support/table/TableColumnController.java | 6 +- .../module/support/token/LoginDeviceEnum.java | 24 +- .../module/support/token/TokenService.java | 215 +++--------------- .../src/main/resources/dev/sa-common.yaml | 36 ++- 51 files changed, 227 insertions(+), 959 deletions(-) delete mode 100644 smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java delete mode 100644 smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/AbstractSecurityConfig.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityAuthenticationFailHandler.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityMethodSource.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityPermissionCheckService.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityTokenFilter.java diff --git a/smart-admin-api/pom.xml b/smart-admin-api/pom.xml index 7211de26..37e2f4ae 100644 --- a/smart-admin-api/pom.xml +++ b/smart-admin-api/pom.xml @@ -46,6 +46,7 @@ 0.9.1 0.9.0 3.1 + 1.35.0.RC @@ -109,6 +110,23 @@ ${swagger.version} + + + + cn.dev33 + sa-token-spring-boot-starter + ${sa-token-version} + + + + + cn.dev33 + sa-token-redis-jackson + ${sa-token-version} + + + + com.alibaba fastjson diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java index c4e74ff9..3c6147c1 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java @@ -4,8 +4,6 @@ import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.module.support.jwe.JweAspect; import net.lab1024.sa.common.module.support.jwe.JweUserKey; -import net.lab1024.sa.common.module.support.operatelog.core.OperateLogAspect; -import net.lab1024.sa.common.module.support.operatelog.core.OperateLogConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -27,7 +25,7 @@ public class JweAspectConfig { @Bean public JweAspect jweConfig() { return new JweAspect((request -> { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); JweUserKey userKey = new JweUserKey(); userKey.setUserId(requestUser.getUserId()); userKey.setUserName(requestUser.getUserName()); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java deleted file mode 100644 index 8f12ba27..00000000 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.lab1024.sa.admin.config; - -import net.lab1024.sa.admin.module.system.login.service.LoginService; -import net.lab1024.sa.common.common.security.AbstractSecurityConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.core.userdetails.UserDetails; - -import javax.servlet.http.HttpServletRequest; -import java.util.function.BiFunction; - -/** - * 权限配置 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2022-05-30 21:22:12 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -@Configuration -public class SecurityConfig extends AbstractSecurityConfig { - /** - * 获取TOKEN 解析类 - */ - @Autowired - private LoginService loginService; - - @Override - protected BiFunction userFunction() { - return (token, request) -> loginService.getLoginUserDetail(token, request); - } - - @Override - protected String[] getAuthenticatedUrlPatterns() { - return new String[]{"/**"}; - } - - -} diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java deleted file mode 100644 index 772b2d5d..00000000 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.lab1024.sa.admin.config; - -import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail; -import net.lab1024.sa.common.common.annoation.SaAuth; -import net.lab1024.sa.common.common.security.SecurityMethodSource; -import net.lab1024.sa.common.common.security.SecurityPermissionCheckService; -import org.springframework.context.annotation.Bean; -import org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory; -import org.springframework.security.access.method.MethodSecurityMetadataSource; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration; -import org.springframework.security.core.Authentication; - -/** - * 1、以类名加方法名为权限字符串的校验模式
- * 2、重写MethodSecurityMetadataSource将优化security配置，只需在方法上加上@saAuth注解，方法上就会存在权限（权限字符串为类名加方法名），而无需另外手动设置，减轻后端开发成本
- * 3、security将不再依据权限字符串进行权限控制，
- * 4、security将依据对应权限字符串下的接口权限进行控制
- * 5、采用此配置原@PreAuthorize依然有效
- * 6、如若无需此配置，需将@EnableGlobalMethodSecurity注解添加至SecurityConfig类上 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2021-08-31 0:01 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class SecurityMethodConfig extends GlobalMethodSecurityConfiguration { - - @Bean(SaAuth.saAuth) - public SecurityPermissionCheckService securityPermissionCheckService() { - return new SecurityPermissionCheckService() { - @Override - public boolean checkPermission(Authentication authentication, String permission) { - LoginEmployeeDetail loginEmployeeDetail = (LoginEmployeeDetail) authentication.getPrincipal(); - if (loginEmployeeDetail.getAdministratorFlag()) { - return true; - } - return super.permissionJudge(loginEmployeeDetail, permission); - } - }; - } - - @Override - public MethodSecurityMetadataSource customMethodSecurityMetadataSource() { - ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory(this.getExpressionHandler()); - return new SecurityMethodSource(attributeFactory, SaAuth.saAuth); - } -} diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java index 7fa863c2..9652c258 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.goods.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -14,7 +15,6 @@ import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.domain.ValidateList; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -38,35 +38,35 @@ public class GoodsController extends AdminBaseController { @ApiOperation("分页查询 @author 胡克") @PostMapping("/goods/query") - @PreAuthorize("@saAuth.checkPermission('goods:query')") + @SaCheckPermission("@saAuth.checkPermission('goods:query')") public ResponseDTO> query(@RequestBody @Valid GoodsQueryForm queryForm) { return goodsService.query(queryForm); } @ApiOperation("添加商品 @author 胡克") @PostMapping("/goods/add") - @PreAuthorize("@saAuth.checkPermission('goods:add')") + @SaCheckPermission("@saAuth.checkPermission('goods:add')") public ResponseDTO add(@RequestBody @Valid GoodsAddForm addForm) { return goodsService.add(addForm); } @ApiOperation("更新商品 @author 胡克") @PostMapping("/goods/update") - @PreAuthorize("@saAuth.checkPermission('goods:update')") + @SaCheckPermission("@saAuth.checkPermission('goods:update')") public ResponseDTO update(@RequestBody @Valid GoodsUpdateForm updateForm) { return goodsService.update(updateForm); } @ApiOperation("删除 @author 卓大") @GetMapping("/goods/delete/{goodsId}") - @PreAuthorize("@saAuth.checkPermission('goods:delete')") + @SaCheckPermission("@saAuth.checkPermission('goods:delete')") public ResponseDTO delete(@PathVariable Long goodsId) { return goodsService.delete(goodsId); } @ApiOperation("批量 @author 卓大") @PostMapping("/goods/batchDelete") - @PreAuthorize("@saAuth.checkPermission('goods:batchDelete')") + @SaCheckPermission("@saAuth.checkPermission('goods:batchDelete')") public ResponseDTO batchDelete(@RequestBody @Valid ValidateList idList) { return goodsService.batchDelete(idList); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java index 96fbea31..bc99f346 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java @@ -54,7 +54,7 @@ public class BankController { @ApiOperation(value = "新建银行信息 @author 善逸") @PostMapping("/oa/bank/create") public ResponseDTO createBank(@RequestBody @Valid BankCreateForm createVO) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); createVO.setCreateUserId(requestUser.getUserId()); createVO.setCreateUserName(requestUser.getUserName()); return bankService.createBank(createVO); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java index efc0143b..6f36b68b 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java @@ -56,7 +56,7 @@ public class EnterpriseController { @PostMapping("/oa/enterprise/create") @SaAuth public ResponseDTO createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); createVO.setCreateUserId(requestUser.getUserId()); createVO.setCreateUserName(requestUser.getUserName()); return enterpriseService.createEnterprise(createVO); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java index 40909dc9..fb9d1bcd 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java @@ -52,7 +52,7 @@ public class InvoiceController { @ApiOperation(value = "新建发票信息 @author 善逸") @PostMapping("/oa/invoice/create") public ResponseDTO createInvoice(@RequestBody @Valid InvoiceAddForm createVO) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); createVO.setCreateUserId(requestUser.getUserId()); createVO.setCreateUserName(requestUser.getUserName()); return invoiceService.createInvoice(createVO); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java index 8ac0f311..42eff483 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java @@ -83,7 +83,7 @@ public class NoticeController { @RepeatSubmit @SaAuth public ResponseDTO add(@RequestBody @Valid NoticeAddForm addForm) { - addForm.setCreateUserId(SmartRequestUtil.getRequestUserId()); + addForm.setCreateUserId(SmartRequestUtil.getUserId()); return noticeService.add(addForm); } @@ -114,7 +114,7 @@ public class NoticeController { @GetMapping("/oa/notice/employee/view/{noticeId}") public ResponseDTO view(@PathVariable Long noticeId, HttpServletRequest request) { return noticeEmployeeService.view( - SmartRequestUtil.getRequestUserId(), + SmartRequestUtil.getUserId(), noticeId, ServletUtil.getClientIP(request), request.getHeader("User-Agent") @@ -124,7 +124,7 @@ public class NoticeController { @ApiOperation("【员工】通知公告-查询全部 @author 卓大") @PostMapping("/oa/notice/employee/query") public ResponseDTO> queryEmployeeNotice(@RequestBody @Valid NoticeEmployeeQueryForm noticeEmployeeQueryForm) { - return noticeEmployeeService.queryList(SmartRequestUtil.getRequestUserId(), noticeEmployeeQueryForm); + return noticeEmployeeService.queryList(SmartRequestUtil.getUserId(), noticeEmployeeQueryForm); } @ApiOperation("【员工】通知公告-查询 查看记录 @author 卓大") diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java index fc98e24b..1148d030 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java @@ -1,11 +1,11 @@ package net.lab1024.sa.admin.module.system.datascope.service; import lombok.extern.slf4j.Slf4j; +import net.lab1024.sa.admin.module.system.datascope.DataScope; import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeTypeEnum; import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeViewTypeEnum; import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeWhereInTypeEnum; import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeSqlConfig; -import net.lab1024.sa.admin.module.system.datascope.DataScope; import net.lab1024.sa.admin.module.system.datascope.strategy.DataScopePowerStrategy; import net.lab1024.sa.common.common.util.SmartRequestUtil; import org.apache.commons.collections4.CollectionUtils; @@ -108,7 +108,7 @@ public class DataScopeSqlConfigService { public String getJoinSql(Map paramMap, DataScopeSqlConfig sqlConfigDTO) { DataScopeTypeEnum dataScopeTypeEnum = sqlConfigDTO.getDataScopeType(); String joinSql = sqlConfigDTO.getJoinSql(); - Long employeeId = SmartRequestUtil.getRequestUserId(); + Long employeeId = SmartRequestUtil.getUserId(); if (employeeId == null) { return ""; } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java index 62e2fe33..fba5bcfa 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.department.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -12,7 +13,6 @@ import net.lab1024.sa.admin.module.system.department.service.DepartmentService; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -43,21 +43,21 @@ public class DepartmentController extends AdminBaseController { @ApiOperation(value = "添加部门 @author 卓大") @PostMapping("/department/add") - @PreAuthorize("@saAuth.checkPermission('system:department:add')") + @SaCheckPermission("@saAuth.checkPermission('system:department:add')") public ResponseDTO addDepartment(@Valid @RequestBody DepartmentAddForm createDTO) { return departmentService.addDepartment(createDTO); } @ApiOperation(value = "更新部门 @author 卓大") @PostMapping("/department/update") - @PreAuthorize("@saAuth.checkPermission('system:department:update')") + @SaCheckPermission("@saAuth.checkPermission('system:department:update')") public ResponseDTO updateDepartment(@Valid @RequestBody DepartmentUpdateForm updateDTO) { return departmentService.updateDepartment(updateDTO); } @ApiOperation(value = "删除部门 @author 卓大") @GetMapping("/department/delete/{departmentId}") - @PreAuthorize("@saAuth.checkPermission('system:department:delete')") + @SaCheckPermission("@saAuth.checkPermission('system:department:delete')") public ResponseDTO deleteDepartment(@PathVariable Long departmentId) { return departmentService.deleteDepartment(departmentId); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java index c5f0f325..d5455bef 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.employee.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -12,7 +13,6 @@ import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -43,35 +43,35 @@ public class EmployeeController extends AdminBaseController { @ApiOperation(value = "添加员工(返回添加员工的密码) @author 卓大") @PostMapping("/employee/add") - @PreAuthorize("@saAuth.checkPermission('system:employee:add')") + @SaCheckPermission("@saAuth.checkPermission('system:employee:add')") public ResponseDTO addEmployee(@Valid @RequestBody EmployeeAddForm employeeAddForm) { return employeeService.addEmployee(employeeAddForm); } @ApiOperation(value = "更新员工 @author 卓大") @PostMapping("/employee/update") - @PreAuthorize("@saAuth.checkPermission('system:employee:update')") + @SaCheckPermission("@saAuth.checkPermission('system:employee:update')") public ResponseDTO updateEmployee(@Valid @RequestBody EmployeeUpdateForm employeeUpdateForm) { return employeeService.updateEmployee(employeeUpdateForm); } @ApiOperation(value = "更新员工禁用/启用状态 @author 卓大") @GetMapping("/employee/update/disabled/{employeeId}") - @PreAuthorize("@saAuth.checkPermission('system:employee:disabled')") + @SaCheckPermission("@saAuth.checkPermission('system:employee:disabled')") public ResponseDTO updateDisableFlag(@PathVariable Long employeeId) { return employeeService.updateDisableFlag(employeeId); } @ApiOperation(value = "批量删除员工 @author 卓大") @PostMapping("/employee/update/batch/delete") - @PreAuthorize("@saAuth.checkPermission('system:employee:delete')") + @SaCheckPermission("@saAuth.checkPermission('system:employee:delete')") public ResponseDTO batchUpdateDeleteFlag(@RequestBody List employeeIdList) { return employeeService.batchUpdateDeleteFlag(employeeIdList); } @ApiOperation(value = "批量调整员工部门 @author 卓大") @PostMapping("/employee/update/batch/department") - @PreAuthorize("@saAuth.checkPermission('system:employee:department:update')") + @SaCheckPermission("@saAuth.checkPermission('system:employee:department:update')") public ResponseDTO batchUpdateDepartment(@Valid @RequestBody EmployeeBatchUpdateDepartmentForm batchUpdateDepartmentForm) { return employeeService.batchUpdateDepartment(batchUpdateDepartmentForm); } @@ -79,13 +79,13 @@ public class EmployeeController extends AdminBaseController { @ApiOperation(value = "修改密码 @author 卓大") @PostMapping("/employee/update/password") public ResponseDTO updatePassword(@Valid @RequestBody EmployeeUpdatePasswordForm updatePasswordForm) { - updatePasswordForm.setEmployeeId(SmartRequestUtil.getRequestUserId()); + updatePasswordForm.setEmployeeId(SmartRequestUtil.getUserId()); return employeeService.updatePassword(updatePasswordForm); } @ApiOperation(value = "重置员工密码 @author 卓大") @GetMapping("/employee/update/password/reset/{employeeId}") - @PreAuthorize("@saAuth.checkPermission('system:employee:password:reset')") + @SaCheckPermission("@saAuth.checkPermission('system:employee:password:reset')") public ResponseDTO resetPassword(@PathVariable Integer employeeId) { return employeeService.resetPassword(employeeId); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java index 3e6a0297..6457edd0 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java @@ -1,19 +1,12 @@ package net.lab1024.sa.admin.module.system.employee.service; -import net.lab1024.sa.admin.module.system.menu.constant.MenuPermsTypeEnum; import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO; import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService; import net.lab1024.sa.admin.module.system.role.service.RoleMenuService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Service; -import java.util.HashSet; import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; /** * 员工权限校验 @@ -33,40 +26,6 @@ public class EmployeePermissionService { @Autowired private RoleMenuService roleMenuService; - /** - * 构建权限集合 - * - * @param menuAndPointsList - */ - public Set buildAuthorities(List menuAndPointsList) { - HashSet permissionList = new HashSet<>(); - for (MenuVO menu : menuAndPointsList) { - if(menu.getPermsType() == null){ - continue; - } - - String perms = null; - if(menu.getPermsType().equals(MenuPermsTypeEnum.SPRING_SECURITY.getValue())){ - perms = menu.getWebPerms(); - }else{ - perms = menu.getApiPerms(); - } - - if (StringUtils.isEmpty(perms)) { - continue; - } - //接口权限 - String[] split = perms.split(","); - for (String perm : split) { - permissionList.add(perm); - } - } - - Set authorities = new HashSet<>(); - authorities.addAll(permissionList.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toSet())); - return authorities; - } - /** * 查询用户拥有的前端菜单项 用于登陆返回 前端动态路由配置 * diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java index a315397d..3606d781 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java @@ -206,12 +206,12 @@ public class EmployeeService { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - boolean disableFlag=!employeeEntity.getDisabledFlag(); + boolean disableFlag = !employeeEntity.getDisabledFlag(); employeeEntity.setDisabledFlag(disableFlag); employeeDao.updateDisableFlag(employeeId, disableFlag); if (employeeEntity.getDisabledFlag()) { - tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE); + tokenService.removeToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE); } return ResponseDTO.ok(); @@ -240,9 +240,7 @@ public class EmployeeService { }).collect(Collectors.toList()); employeeManager.updateBatchById(deleteList); - for (Long employeeId : employeeIdList) { - tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE); - } + tokenService.removeToken(employeeIdList, UserTypeEnum.ADMIN_EMPLOYEE); return ResponseDTO.ok(); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java index 1d28888d..ad945a02 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java @@ -8,17 +8,15 @@ import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail; import net.lab1024.sa.admin.module.system.login.domain.LoginForm; import net.lab1024.sa.admin.module.system.login.service.LoginService; import net.lab1024.sa.common.common.annoation.NoNeedLogin; -import net.lab1024.sa.common.common.code.UserErrorCode; import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.module.support.captcha.domain.CaptchaVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -40,26 +38,25 @@ public class LoginController { private LoginService loginService; @NoNeedLogin - @PostMapping("/login") @ApiOperation("登录 @author 卓大") - public ResponseDTO login(@Valid @RequestBody LoginForm loginForm) { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + @PostMapping("/login") + public ResponseDTO login(@Valid @RequestBody LoginForm loginForm, HttpServletRequest request) { String ip = ServletUtil.getClientIP(request); String userAgent = ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT); return loginService.login(loginForm, ip, userAgent); } - @GetMapping("/login/refresh") @ApiOperation("刷新用户信息（包含用户基础信息、权限信息等等） @author 卓大") + @GetMapping("/login/refresh") public ResponseDTO refresh() { - loginService.removeLoginUserDetailCache(SmartRequestUtil.getRequestUserId()); + loginService.removeLoginUserDetailCache(SmartRequestUtil.getUserId()); return ResponseDTO.ok(); } - @GetMapping("/login/getLoginInfo") @ApiOperation("获取登录结果信息 @author 卓大") + @GetMapping("/login/getLoginInfo") public ResponseDTO getLoginInfo() { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + /* Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null) { return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); } @@ -71,18 +68,19 @@ public class LoginController { LoginEmployeeDetail loginEmployeeDetail = (LoginEmployeeDetail) authentication.getPrincipal(); loginEmployeeDetail.setLoginPassword(null); - return ResponseDTO.ok(loginEmployeeDetail); + return ResponseDTO.ok(loginEmployeeDetail);*/ + return ResponseDTO.ok(); } - @ApiOperation("退出登陆 @author 卓大") + @ApiOperation("退出登录 @author 卓大") @GetMapping("/login/logout") - public ResponseDTO logout(@RequestHeader(value = RequestHeaderConst.TOKEN, required = false) String token) { - return loginService.logout(token, SmartRequestUtil.getRequestUser()); + public ResponseDTO logout() { + return loginService.logout(SmartRequestUtil.getUser()); } + @NoNeedLogin @ApiOperation("获取验证码 @author 卓大") @GetMapping("/login/getCaptcha") - @NoNeedLogin public ResponseDTO getCaptcha() { return loginService.getCaptcha(); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java index a8be6eef..00596b76 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java @@ -8,13 +8,9 @@ import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.enumeration.GenderEnum; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; import java.time.LocalDateTime; -import java.util.Collection; import java.util.List; -import java.util.Set; /** * 员工登录 @@ -26,7 +22,7 @@ import java.util.Set; * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022 */ @Data -public class LoginEmployeeDetail implements UserDetails, RequestUser { +public class LoginEmployeeDetail implements RequestUser { @ApiModelProperty("token") private String token; @@ -79,65 +75,6 @@ public class LoginEmployeeDetail implements UserDetails, RequestUser { @ApiModelProperty("请求user-agent") private String userAgent; - /** - * security 权限串 - */ - private Set authorities; - - @Override - public Collection getAuthorities() { - return authorities; - } - - @Override - @JsonIgnore - public String getPassword() { - return this.loginPassword; - } - - @Override - public String getUsername() { - return this.getLoginName(); - } - - /** - * 账户是否未过期,过期无法验证 - */ - @Override - public boolean isAccountNonExpired() { - return true; - } - - /** - * 指定用户是否解锁,锁定的用户无法进行身份验证 - * - * @return - */ - @Override - public boolean isAccountNonLocked() { - return true; - } - - /** - * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证 - * - * @return - */ - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - /** - * 是否可用 ,禁用的用户不能身份验证 - * - * @return - */ - @Override - public boolean isEnabled() { - return true; - } - @Override public Long getUserId() { return employeeId; @@ -147,19 +84,4 @@ public class LoginEmployeeDetail implements UserDetails, RequestUser { public String getUserName() { return actualName; } - - @Override - public UserTypeEnum getUserType() { - return userType; - } - - @Override - public String getIp() { - return this.ip; - } - - @Override - public String getUserAgent() { - return this.userAgent; - } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java index c7e9ffb3..7a859946 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java @@ -24,8 +24,8 @@ import javax.validation.constraints.Pattern; @Data public class LoginForm extends CaptchaForm { - @ApiModelProperty("登录名") - @NotBlank(message = "登录名不能为空") + @ApiModelProperty("登录账号") + @NotBlank(message = "登录账号不能为空") @Length(max = 30, message = "登录账号最多30字符") private String loginName; @@ -34,8 +34,7 @@ public class LoginForm extends CaptchaForm { @Pattern(regexp = SmartVerificationUtil.PWD_REGEXP, message = "请输入6-15位密码(数字|大小写字母|小数点)") private String password; - @ApiModelProperty(value = "登录终端") - @ApiModelPropertyEnum(LoginDeviceEnum.class) - @CheckEnum(value = LoginDeviceEnum.class, required = true, message = "此终端不允许登录") + @ApiModelPropertyEnum(desc = "登录终端", value = LoginDeviceEnum.class) + @CheckEnum(value = LoginDeviceEnum.class, required = true, message = "登录终端类型错误") private Integer loginDevice; } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index 95dafbe6..6dc36ff3 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.login.service; -import cn.hutool.extra.servlet.ServletUtil; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO; @@ -11,7 +10,6 @@ import net.lab1024.sa.admin.module.system.employee.service.EmployeeService; import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail; import net.lab1024.sa.admin.module.system.login.domain.LoginForm; import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO; -import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.constant.StringConst; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; @@ -31,7 +29,6 @@ import net.lab1024.sa.common.module.support.token.TokenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.ConcurrentMap; @@ -55,9 +52,6 @@ public class LoginService { @Autowired private DepartmentService departmentService; - @Autowired - private TokenService tokenService; - @Autowired private CaptchaService captchaService; @@ -70,6 +64,9 @@ public class LoginService { @Autowired private LoginLogService loginLogService; + @Autowired + private TokenService tokenService; + /** * 登录信息二级缓存 */ @@ -88,17 +85,15 @@ public class LoginService { * 员工登陆 * * @param loginForm + * @param ip + * @param userAgent * @return 返回用户登录信息 */ public ResponseDTO login(LoginForm loginForm, String ip, String userAgent) { - LoginDeviceEnum loginDeviceEnum = SmartEnumUtil.getEnumByValue(loginForm.getLoginDevice(), LoginDeviceEnum.class); - if (loginDeviceEnum == null) { - return ResponseDTO.userErrorParam("登录设备暂不支持！"); - } // 校验 图形验证码 ResponseDTO checkCaptcha = captchaService.checkCaptcha(loginForm); if (!checkCaptcha.getOk()) { - return ResponseDTO.error(checkCaptcha); + // TODO listen 待放开 return ResponseDTO.error(checkCaptcha); } /** @@ -126,8 +121,9 @@ public class LoginService { } // 生成 登录token，保存token - Boolean superPasswordFlag = superPassword.equals(requestPassword); - String token = tokenService.generateToken(employeeEntity.getEmployeeId(), employeeEntity.getActualName(), UserTypeEnum.ADMIN_EMPLOYEE, loginDeviceEnum, superPasswordFlag); + boolean superPasswordFlag = superPassword.equals(requestPassword); + LoginDeviceEnum loginDeviceEnum = SmartEnumUtil.getEnumByValue(loginForm.getLoginDevice(), LoginDeviceEnum.class); + String token = tokenService.generateToken(employeeEntity.getEmployeeId(), employeeEntity.getActualName(), UserTypeEnum.ADMIN_EMPLOYEE, loginDeviceEnum); //获取员工登录信息 LoginEmployeeDetail loginEmployeeDetail = loadLoginInfo(employeeEntity); @@ -165,7 +161,7 @@ public class LoginService { //前端菜单 loginEmployeeDetail.setMenuList(menuAndPointsList); //后端权限 - loginEmployeeDetail.setAuthorities(employeePermissionService.buildAuthorities(menuAndPointsList)); + // loginEmployeeDetail.setAuthorities(employeePermissionService.buildAuthorities(menuAndPointsList)); //上次登录信息 LoginLogVO loginLogVO = loginLogService.queryLastByUserId(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE); @@ -209,48 +205,15 @@ public class LoginService { loginUserDetailCache.remove(requestUserId); } - /** - * 根据登陆token 获取员请求工信息 - * - * @param - * @return - */ - public LoginEmployeeDetail getLoginUserDetail(String token, HttpServletRequest request) { - Long requestUserId = tokenService.getUserIdAndValidateToken(token); - if (requestUserId == null) { - return null; - } - // 查询用户信息 - LoginEmployeeDetail loginEmployeeDetail = loginUserDetailCache.get(requestUserId); - if (loginEmployeeDetail == null) { - // 员工基本信息 - EmployeeEntity employeeEntity = employeeService.getById(requestUserId); - if (employeeEntity == null) { - return null; - } - - loginEmployeeDetail = this.loadLoginInfo(employeeEntity); - loginEmployeeDetail.setToken(token); - loginUserDetailCache.put(requestUserId, loginEmployeeDetail); - } - - //更新请求ip和user agent - loginEmployeeDetail.setUserAgent(ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT)); - loginEmployeeDetail.setIp(ServletUtil.getClientIP(request)); - - return loginEmployeeDetail; - } - - /** * 退出登陆，清除token缓存 * * @return */ - public ResponseDTO logout(String token, RequestUser requestUser) { + public ResponseDTO logout(RequestUser requestUser) { loginUserDetailCache.remove(requestUser.getUserId()); - tokenService.removeToken(token); - //保存登出日志 + tokenService.removeToken(); + // 保存登出日志 saveLogoutLog(requestUser, requestUser.getIp(), requestUser.getUserAgent()); return ResponseDTO.ok(); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java index d0b921e7..ab39a213 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.menu.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -14,7 +15,6 @@ import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -39,25 +39,25 @@ public class MenuController extends AdminBaseController { @ApiOperation(value = "添加菜单 @author 卓大") @PostMapping("/menu/add") - @PreAuthorize("@saAuth.checkPermission('system:menu:add')") + @SaCheckPermission("@saAuth.checkPermission('system:menu:add')") public ResponseDTO addMenu(@RequestBody @Valid MenuAddForm menuAddForm) { - menuAddForm.setCreateUserId(SmartRequestUtil.getRequestUserId()); + menuAddForm.setCreateUserId(SmartRequestUtil.getUserId()); return menuService.addMenu(menuAddForm); } @ApiOperation(value = "更新菜单 @author 卓大") @PostMapping("/menu/update") - @PreAuthorize("@saAuth.checkPermission('system:menu:update')") + @SaCheckPermission("@saAuth.checkPermission('system:menu:update')") public ResponseDTO updateMenu(@RequestBody @Valid MenuUpdateForm menuUpdateForm) { - menuUpdateForm.setUpdateUserId(SmartRequestUtil.getRequestUserId()); + menuUpdateForm.setUpdateUserId(SmartRequestUtil.getUserId()); return menuService.updateMenu(menuUpdateForm); } @ApiOperation(value = "批量删除菜单 @author 卓大") @GetMapping("/menu/batchDelete") - @PreAuthorize("@saAuth.checkPermission('system:menu:delete,system:menu:batch:delete')") + @SaCheckPermission("@saAuth.checkPermission('system:menu:delete,system:menu:batch:delete')") public ResponseDTO batchDeleteMenu(@RequestParam("menuIdList") List menuIdList) { - return menuService.batchDeleteMenu(menuIdList, SmartRequestUtil.getRequestUserId()); + return menuService.batchDeleteMenu(menuIdList, SmartRequestUtil.getUserId()); } @ApiOperation(value = "查询菜单列表 @author 卓大") diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java index 4fcdc2d2..690bb17d 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.role.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -11,7 +12,6 @@ import net.lab1024.sa.admin.module.system.role.service.RoleService; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,21 +36,21 @@ public class RoleController extends AdminBaseController { @ApiOperation("添加角色 @author 卓大") @PostMapping("/role/add") - @PreAuthorize("@saAuth.checkPermission('system:role:add')") + @SaCheckPermission("@saAuth.checkPermission('system:role:add')") public ResponseDTO addRole(@Valid @RequestBody RoleAddForm roleAddForm) { return roleService.addRole(roleAddForm); } @ApiOperation("删除角色 @author 卓大") @GetMapping("/role/delete/{roleId}") - @PreAuthorize("@saAuth.checkPermission('system:role:delete')") + @SaCheckPermission("@saAuth.checkPermission('system:role:delete')") public ResponseDTO deleteRole(@PathVariable Long roleId) { return roleService.deleteRole(roleId); } @ApiOperation("更新角色 @author 卓大") @PostMapping("/role/update") - @PreAuthorize("@saAuth.checkPermission('system:role:update')") + @SaCheckPermission("@saAuth.checkPermission('system:role:update')") public ResponseDTO updateRole(@Valid @RequestBody RoleUpdateForm roleUpdateDTO) { return roleService.updateRole(roleUpdateDTO); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java index a2814595..945294e4 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.role.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -10,7 +11,6 @@ import net.lab1024.sa.admin.module.system.role.service.RoleDataScopeService; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -41,7 +41,7 @@ public class RoleDataScopeController extends AdminBaseController { @ApiOperation(value = "批量设置某角色数据范围 @author 卓大") @PostMapping("/role/dataScope/updateRoleDataScopeList") - @PreAuthorize("@saAuth.checkPermission('system:role:dataScope:update')") + @SaCheckPermission("@saAuth.checkPermission('system:role:dataScope:update')") public ResponseDTO updateRoleDataScopeList(@RequestBody @Valid RoleDataScopeUpdateForm roleDataScopeUpdateForm) { return roleDataScopeService.updateRoleDataScopeList(roleDataScopeUpdateForm); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java index 19ad623c..ca9f9f1c 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.role.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -13,7 +14,6 @@ import net.lab1024.sa.common.common.domain.PageResult; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -50,21 +50,21 @@ public class RoleEmployeeController extends AdminBaseController { @ApiOperation(value = "从角色成员列表中移除员工 @author 卓大") @GetMapping("/role/employee/removeEmployee") - @PreAuthorize("@saAuth.checkPermission('system:role:employee:delete')") + @SaCheckPermission("@saAuth.checkPermission('system:role:employee:delete')") public ResponseDTO removeEmployee(Long employeeId, Long roleId) { return roleEmployeeService.removeRoleEmployee(employeeId, roleId); } @ApiOperation(value = "从角色成员列表中批量移除员工 @author 卓大") @PostMapping("/role/employee/batchRemoveRoleEmployee") - @PreAuthorize("@saAuth.checkPermission('system:role:employee:batch:delete')") + @SaCheckPermission("@saAuth.checkPermission('system:role:employee:batch:delete')") public ResponseDTO batchRemoveEmployee(@Valid @RequestBody RoleEmployeeUpdateForm updateForm) { return roleEmployeeService.batchRemoveRoleEmployee(updateForm); } @ApiOperation(value = "角色成员列表中批量添加员工 @author 卓大") @PostMapping("/role/employee/batchAddRoleEmployee") - @PreAuthorize("@saAuth.checkPermission('system:role:employee:add')") + @SaCheckPermission("@saAuth.checkPermission('system:role:employee:add')") public ResponseDTO addEmployeeList(@Valid @RequestBody RoleEmployeeUpdateForm addForm) { return roleEmployeeService.batchAddRoleEmployee(addForm); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java index 02e7b8c3..7c519f3c 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.role.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -10,7 +11,6 @@ import net.lab1024.sa.admin.module.system.role.service.RoleMenuService; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -34,7 +34,7 @@ public class RoleMenuController extends AdminBaseController { @ApiOperation("更新角色权限 @author 卓大") @PostMapping("/role/menu/updateRoleMenu") - @PreAuthorize("@saAuth.checkPermission('system:role:menu:update')") + @SaCheckPermission("@saAuth.checkPermission('system:role:menu:update')") public ResponseDTO updateRoleMenu(@Valid @RequestBody RoleMenuUpdateForm updateDTO) { return roleMenuService.updateRoleMenu(updateDTO); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java index 492a063b..103ab12d 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -7,7 +8,6 @@ import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.constant.SwaggerTagConst; import net.lab1024.sa.common.module.support.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @@ -38,7 +38,7 @@ public class AdminCacheController extends SupportBaseController { @ApiOperation(value = "移除某个缓存 @author 罗伊") - @PreAuthorize("@saAuth.checkPermission('support:cache:delete')") + @SaCheckPermission("@saAuth.checkPermission('support:cache:delete')") @GetMapping("/cache/remove/{cacheName}") public ResponseDTO removeCache(@PathVariable String cacheName) { cacheService.removeCache(cacheName); @@ -47,7 +47,7 @@ public class AdminCacheController extends SupportBaseController { @ApiOperation(value = "获取某个缓存的所有key @author 罗伊") - @PreAuthorize("@saAuth.checkPermission('support:cache:keys')") + @SaCheckPermission("@saAuth.checkPermission('support:cache:keys')") @GetMapping("/cache/keys/{cacheName}") public ResponseDTO> cacheKeys(@PathVariable String cacheName) { return ResponseDTO.ok(cacheService.cacheKey(cacheName)); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java index 7c4b1eec..49079729 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.domain.ResponseDTO; @@ -9,7 +10,6 @@ import net.lab1024.sa.common.module.support.changelog.domain.form.ChangeLogAddFo import net.lab1024.sa.common.module.support.changelog.domain.form.ChangeLogUpdateForm; import net.lab1024.sa.common.module.support.changelog.service.ChangeLogService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -31,27 +31,27 @@ public class AdminChangeLogController { @ApiOperation("添加 @author 卓大") @PostMapping("/changeLog/add") - @PreAuthorize("@saAuth.checkPermission('changeLog:add')") + @SaCheckPermission("@saAuth.checkPermission('changeLog:add')") public ResponseDTO add(@RequestBody @Valid ChangeLogAddForm addForm) { return changeLogService.add(addForm); } @ApiOperation("更新 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('changeLog:update')") + @SaCheckPermission("@saAuth.checkPermission('changeLog:update')") @PostMapping("/changeLog/update") public ResponseDTO update(@RequestBody @Valid ChangeLogUpdateForm updateForm) { return changeLogService.update(updateForm); } @ApiOperation("批量删除 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('changeLog:batchDelete')") + @SaCheckPermission("@saAuth.checkPermission('changeLog:batchDelete')") @PostMapping("/changeLog/batchDelete") public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return changeLogService.batchDelete(idList); } @ApiOperation("单个删除 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('changeLog:delete')") + @SaCheckPermission("@saAuth.checkPermission('changeLog:delete')") @GetMapping("/changeLog/delete/{changeLogId}") public ResponseDTO batchDelete(@PathVariable Long changeLogId) { return changeLogService.delete(changeLogId); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java index 78ab1722..d776b079 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -12,7 +13,6 @@ import net.lab1024.sa.common.module.support.config.domain.ConfigQueryForm; import net.lab1024.sa.common.module.support.config.domain.ConfigUpdateForm; import net.lab1024.sa.common.module.support.config.domain.ConfigVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -36,21 +36,21 @@ public class AdminConfigController extends SupportBaseController { private ConfigService configService; @ApiOperation("分页查询系统配置 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('support:config:query')") + @SaCheckPermission("@saAuth.checkPermission('support:config:query')") @PostMapping("/config/query") public ResponseDTO> querySystemConfigPage(@RequestBody @Valid ConfigQueryForm queryForm) { return configService.queryConfigPage(queryForm); } @ApiOperation("添加配置参数 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('support:config:add')") + @SaCheckPermission("@saAuth.checkPermission('support:config:add')") @PostMapping("/config/add") public ResponseDTO addSystemConfig(@RequestBody @Valid ConfigAddForm configAddForm) { return configService.add(configAddForm); } @ApiOperation("修改配置参数 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('support:config:update')") + @SaCheckPermission("@saAuth.checkPermission('support:config:update')") @PostMapping("/config/update") public ResponseDTO updateSystemConfig(@RequestBody @Valid ConfigUpdateForm updateForm) { return configService.updateSystemConfig(updateForm); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java index b4528715..674571d4 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -10,7 +11,6 @@ import net.lab1024.sa.common.module.support.file.domain.form.FileQueryForm; import net.lab1024.sa.common.module.support.file.domain.vo.FileVO; import net.lab1024.sa.common.module.support.file.service.FileService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -34,7 +34,7 @@ public class AdminFileController extends SupportBaseController { private FileService fileService; @ApiOperation("分页查询 @author 1024创新实验室-主任-卓大") - @PreAuthorize("@saAuth.checkPermission('support:file:query')") + @SaCheckPermission("@saAuth.checkPermission('support:file:query')") @PostMapping("/file/queryPage") public ResponseDTO> queryPage(@RequestBody @Valid FileQueryForm queryForm) { return ResponseDTO.ok(fileService.queryPage(queryForm)); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java index 5d0949e2..ae08aa6c 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -13,7 +14,6 @@ import net.lab1024.sa.common.module.support.helpdoc.service.HelpDocCatalogServic import net.lab1024.sa.common.module.support.helpdoc.service.HelpDocService; import net.lab1024.sa.common.module.support.repeatsubmit.annoation.RepeatSubmit; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -42,14 +42,14 @@ public class AdminHelpDocController extends SupportBaseController { @ApiOperation("帮助文档目录-添加 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('helpDocCatalog:addCategory')") + @SaCheckPermission("@saAuth.checkPermission('helpDocCatalog:addCategory')") @PostMapping("/helpDoc/helpDocCatalog/add") public ResponseDTO addHelpDocCatalog(@RequestBody @Valid HelpDocCatalogAddForm helpDocCatalogAddForm) { return helpDocCatalogService.add(helpDocCatalogAddForm); } @ApiOperation("帮助文档目录-更新 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('helpDocCatalog:edit')") + @SaCheckPermission("@saAuth.checkPermission('helpDocCatalog:edit')") @PostMapping("/helpDoc/helpDocCatalog/update") public ResponseDTO updateHelpDocCatalog(@RequestBody @Valid HelpDocCatalogUpdateForm helpDocCatalogUpdateForm) { return helpDocCatalogService.update(helpDocCatalogUpdateForm); @@ -64,7 +64,7 @@ public class AdminHelpDocController extends SupportBaseController { // --------------------- 帮助文档 【管理:增、删、查、改】------------------------- @ApiOperation("【管理】帮助文档-分页查询 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('helpDoc:query')") + @SaCheckPermission("@saAuth.checkPermission('helpDoc:query')") @PostMapping("/helpDoc/query") public ResponseDTO> query(@RequestBody @Valid HelpDocQueryForm queryForm) { return ResponseDTO.ok(helpDocService.query(queryForm)); @@ -77,7 +77,7 @@ public class AdminHelpDocController extends SupportBaseController { } @ApiOperation("【管理】帮助文档-添加 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('helpDoc:add')") + @SaCheckPermission("@saAuth.checkPermission('helpDoc:add')") @PostMapping("/helpDoc/add") @RepeatSubmit public ResponseDTO add(@RequestBody @Valid HelpDocAddForm addForm) { @@ -85,7 +85,7 @@ public class AdminHelpDocController extends SupportBaseController { } @ApiOperation("【管理】帮助文档-更新 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('helpDoc:update')") + @SaCheckPermission("@saAuth.checkPermission('helpDoc:update')") @PostMapping("/helpDoc/update") @RepeatSubmit public ResponseDTO update(@RequestBody @Valid HelpDocUpdateForm updateForm) { @@ -93,7 +93,7 @@ public class AdminHelpDocController extends SupportBaseController { } @ApiOperation("【管理】帮助文档-删除 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('helpDoc:delete')") + @SaCheckPermission("@saAuth.checkPermission('helpDoc:delete')") @GetMapping("/helpDoc/delete/{helpDocId}") public ResponseDTO delete(@PathVariable Long helpDocId) { return helpDocService.delete(helpDocId); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java index 0fd71522..33ec9f90 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -10,7 +11,6 @@ import net.lab1024.sa.common.module.support.loginlog.LoginLogService; import net.lab1024.sa.common.module.support.loginlog.domain.LoginLogQueryForm; import net.lab1024.sa.common.module.support.loginlog.domain.LoginLogVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -32,7 +32,7 @@ public class AdminLoginLogController extends SupportBaseController { private LoginLogService loginLogService; @ApiOperation(value = "分页查询 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('loginLog:query')") + @SaCheckPermission("@saAuth.checkPermission('loginLog:query')") @PostMapping("/loginLog/page/query") public ResponseDTO> queryByPage(@RequestBody LoginLogQueryForm queryForm) { return loginLogService.queryByPage(queryForm); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java index 85161a6f..3594eaf3 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -10,7 +11,6 @@ import net.lab1024.sa.common.module.support.operatelog.OperateLogService; import net.lab1024.sa.common.module.support.operatelog.domain.OperateLogQueryForm; import net.lab1024.sa.common.module.support.operatelog.domain.OperateLogVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -30,14 +30,14 @@ public class AdminOperateLogController extends SupportBaseController { private OperateLogService operateLogService; @ApiOperation(value = "分页查询 @author 罗伊") - @PreAuthorize("@saAuth.checkPermission('operateLog:query')") + @SaCheckPermission("@saAuth.checkPermission('operateLog:query')") @PostMapping("/operateLog/page/query") public ResponseDTO> queryByPage(@RequestBody OperateLogQueryForm queryForm) { return operateLogService.queryByPage(queryForm); } @ApiOperation(value = "详情 @author 罗伊") - @PreAuthorize("@saAuth.checkPermission('operateLog:detail')") + @SaCheckPermission("@saAuth.checkPermission('operateLog:detail')") @GetMapping("/operateLog/detail/{operateLogId}") public ResponseDTO detail(@PathVariable Long operateLogId) { return operateLogService.detail(operateLogId); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java index 24637f6e..56cadbe7 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -10,7 +11,6 @@ import net.lab1024.sa.common.module.support.reload.domain.ReloadForm; import net.lab1024.sa.common.module.support.reload.domain.ReloadItemVO; import net.lab1024.sa.common.module.support.reload.domain.ReloadResultVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -39,14 +39,14 @@ public class AdminReloadController extends SupportBaseController { } @ApiOperation(value = "获取reload result @author 开云") - @PreAuthorize("@saAuth.checkPermission('support:reload:result')") + @SaCheckPermission("@saAuth.checkPermission('support:reload:result')") @GetMapping("/reload/result/{tag}") public ResponseDTO> queryReloadResult(@PathVariable("tag") String tag) { return reloadService.queryReloadItemResult(tag); } @ApiOperation(value = "通过tag更新标识 @author 开云") - @PreAuthorize("@saAuth.checkPermission('support:reload:execute')") + @SaCheckPermission("@saAuth.checkPermission('support:reload:execute')") @PostMapping("/reload/update") public ResponseDTO updateByTag(@RequestBody @Valid ReloadForm reloadForm) { return reloadService.updateByTag(reloadForm); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java index 329a2aaf..670b3985 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.support; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -16,7 +17,6 @@ import net.lab1024.sa.common.module.support.serialnumber.domain.SerialNumberReco import net.lab1024.sa.common.module.support.serialnumber.service.SerialNumberRecordService; import net.lab1024.sa.common.module.support.serialnumber.service.SerialNumberService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -48,7 +48,7 @@ public class AdminSerialNumberController extends SupportBaseController { private SerialNumberRecordService serialNumberRecordService; @ApiOperation("生成单号 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('support:serial:number:generate')") + @SaCheckPermission("@saAuth.checkPermission('support:serial:number:generate')") @PostMapping("/serialNumber/generate") public ResponseDTO> generate(@RequestBody @Valid SerialNumberGenerateForm generateForm) { SerialNumberIdEnum serialNumberIdEnum = SmartEnumUtil.getEnumByValue(generateForm.getSerialNumberId(), SerialNumberIdEnum.class); @@ -65,7 +65,7 @@ public class AdminSerialNumberController extends SupportBaseController { } @ApiOperation("获取生成记录 @author 卓大") - @PreAuthorize("@saAuth.checkPermission('support:serial:number:record')") + @SaCheckPermission("@saAuth.checkPermission('support:serial:number:record')") @PostMapping("/serialNumber/queryRecord") public ResponseDTO> queryRecord(@RequestBody @Valid SerialNumberRecordQueryForm queryForm) { return ResponseDTO.ok(serialNumberRecordService.query(queryForm)); diff --git a/smart-admin-api/sa-common/pom.xml b/smart-admin-api/sa-common/pom.xml index 6a5d2b38..9620d010 100644 --- a/smart-admin-api/sa-common/pom.xml +++ b/smart-admin-api/sa-common/pom.xml @@ -49,10 +49,15 @@ - + - org.springframework.boot - spring-boot-starter-security + cn.dev33 + sa-token-spring-boot-starter + + + + cn.dev33 + sa-token-redis-jackson diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java index 62f2042d..0cb82222 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java @@ -97,7 +97,7 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { if (StringUtils.isNotBlank(xAccessToken)) { RequestUser requestUser = userFunction().apply(xAccessToken); if (requestUser != null) { - SmartRequestUtil.setRequestUser(requestUser); + // SmartRequestUtil.setRequestUser(requestUser); } // 有token 无需登录 if (null != noNeedLogin) { diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/AbstractSecurityConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/AbstractSecurityConfig.java deleted file mode 100644 index 30fc239b..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/AbstractSecurityConfig.java +++ /dev/null @@ -1,93 +0,0 @@ -package net.lab1024.sa.common.common.security; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.web.filter.CorsFilter; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.function.BiFunction; -import java.util.function.Function; - -/** - * Spring Security - * - * @Author 1024创新实验室-主任: 卓大 - * @Date 2021/8/3 17:50 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -public abstract class AbstractSecurityConfig extends WebSecurityConfigurerAdapter { - @Autowired - private CorsFilter corsFilter; - - @Autowired - private List noNeedLoginUrlList; - - @Autowired - private List ignoreUrlList; - - /** - * Token获取用户信息 - * - * @return - */ - protected abstract BiFunction userFunction(); - - /** - * 需要认证的url集合 - * - * @return - */ - protected abstract String[] getAuthenticatedUrlPatterns(); - - /** - * 不需要登录的url集合 - * - * @return - */ - protected String[] getNoNeedLoginUrl() { - return noNeedLoginUrlList.toArray(new String[noNeedLoginUrlList.size()]); - } - - /** - * 忽略的url集合 - * - * @return - */ - protected String[] getIgnoreUrlList() { - return ignoreUrlList.toArray(new String[ignoreUrlList.size()]); - } - - @Override - protected void configure(HttpSecurity httpSecurity) throws Exception { - httpSecurity - // CSRF禁用，因为不使用session - .csrf().disable() - // 认证失败处理类 - .exceptionHandling().authenticationEntryPoint(new SecurityAuthenticationFailHandler()).and() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() - // 过滤请求 - .authorizeRequests() - //忽略的url - .antMatchers(this.getIgnoreUrlList()).permitAll() - // 不需要登陆的url - .antMatchers(this.getNoNeedLoginUrl()).permitAll() - //需要校验权限的url - .antMatchers(getAuthenticatedUrlPatterns()).authenticated(); - - // token filter 进行校验 - httpSecurity.addFilterBefore(new SecurityTokenFilter(this.userFunction()), UsernamePasswordAuthenticationFilter.class); - httpSecurity.addFilterBefore(corsFilter, SecurityTokenFilter.class); - // 禁用spring security 使用 X-Frame-Options防止网页被Frame - httpSecurity.headers().frameOptions().disable(); - - } - - -} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityAuthenticationFailHandler.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityAuthenticationFailHandler.java deleted file mode 100644 index 3e146f18..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityAuthenticationFailHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.lab1024.sa.common.common.security; - -import com.alibaba.fastjson.JSONObject; -import net.lab1024.sa.common.common.code.ErrorCode; -import net.lab1024.sa.common.common.code.UserErrorCode; -import net.lab1024.sa.common.common.domain.ResponseDTO; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * 登录认证失败处理 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2022-08-26 20:21:10 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -public class SecurityAuthenticationFailHandler implements AuthenticationEntryPoint { - - @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException { - this.outputResult(response, UserErrorCode.LOGIN_STATE_INVALID); - } - - /** - * 输出 - * - * @param response - * @param errorCode - * @throws IOException - */ - private void outputResult(HttpServletResponse response, ErrorCode errorCode) throws IOException { - String msg = JSONObject.toJSONString(ResponseDTO.error(errorCode)); - response.setContentType("application/json;charset=UTF-8"); - response.getWriter().write(msg); - response.flushBuffer(); - } -} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityMethodSource.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityMethodSource.java deleted file mode 100644 index 290b3d9c..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityMethodSource.java +++ /dev/null @@ -1,66 +0,0 @@ -package net.lab1024.sa.common.common.security; - -import net.lab1024.sa.common.common.annoation.SaAuth; -import org.apache.commons.lang3.StringUtils; -import org.springframework.security.access.ConfigAttribute; -import org.springframework.security.access.prepost.PreInvocationAttribute; -import org.springframework.security.access.prepost.PrePostAnnotationSecurityMetadataSource; -import org.springframework.security.access.prepost.PrePostInvocationAttributeFactory; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; - -/** - * 此类用于默认给所有接口添加权限 @saAuth.checkPermission('%s') - * %s 为类名.方法名 - * 和使用@PreAuthorize("@saAuth.checkPermission('%s')") 效果一致 - * 避免所有接口都添加一遍 减轻工作量 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2021-08-30 23:08 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -public class SecurityMethodSource extends PrePostAnnotationSecurityMetadataSource { - - - private static String EXPRESSION_FORMAT = "@%s.checkPermission('%s')"; - - private final PrePostInvocationAttributeFactory attributeFactory; - - private String beanName; - - - public SecurityMethodSource(PrePostInvocationAttributeFactory attributeFactory, String beanName) { - super(attributeFactory); - this.attributeFactory = attributeFactory; - this.beanName = beanName; - } - - - @Override - public Collection getAttributes(Method method, Class targetClass) { - //如果不存在SaAuth采用security认证模式 - SaAuth saAuth = method.getAnnotation(SaAuth.class); - if (saAuth == null) { - return super.getAttributes(method, targetClass); - } - - //存在添加以URL为权限字符串的校验模式 - ArrayList configAttributes = new ArrayList(1); - String classFullName = targetClass.getName(); - String methodName = method.getName(); - String[] classNameArray = StringUtils.split(classFullName, "\\."); - String controllerName = classNameArray[classNameArray.length - 1]; - String privilegeName = controllerName + "." + methodName; - String preAuthorizeAttribute = String.format(EXPRESSION_FORMAT, beanName, privilegeName); - PreInvocationAttribute pre = this.attributeFactory.createPreInvocationAttribute(null, null, preAuthorizeAttribute); - if (pre != null) { - configAttributes.add(pre); - } - return configAttributes; - } - -} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityPermissionCheckService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityPermissionCheckService.java deleted file mode 100644 index 29e46559..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityPermissionCheckService.java +++ /dev/null @@ -1,74 +0,0 @@ -package net.lab1024.sa.common.common.security; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; - -import java.util.Arrays; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 校验权限 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2022/5/12 21:50 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -public abstract class SecurityPermissionCheckService { - - - /** - * 校验是否有权限 - * - * @param permission - * @return - */ - public boolean checkPermission(String permission) { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication == null) { - return false; - } - return checkPermission(authentication, permission); - } - - /** - * 校验是否有权限 - * - * @param authentication - * @param permission - * @return - */ - public abstract boolean checkPermission(Authentication authentication, String permission); - - /** - * 判断 - * - * @param userDetails - * @param permissionStr - * @return - */ - protected boolean permissionJudge(UserDetails userDetails, String permissionStr) { - if (CollectionUtils.isEmpty(userDetails.getAuthorities())) { - return false; - } - - if (StringUtils.isBlank(permissionStr)) { - return false; - } - - String[] permissionArray = permissionStr.split(","); - for (String permission : permissionArray) { - if(userDetails.getAuthorities().contains(new SimpleGrantedAuthority(permission))){ - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityTokenFilter.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityTokenFilter.java deleted file mode 100644 index 1a2ef97e..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/SecurityTokenFilter.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.lab1024.sa.common.common.security; - -import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.common.common.constant.RequestHeaderConst; -import net.lab1024.sa.common.common.domain.RequestUser; -import net.lab1024.sa.common.common.util.SmartRequestUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.function.BiFunction; -import java.util.function.Function; - -/** - * 注意此处不能 加入@Component，否则对应ignoreUrl的相关请求 将会进入此Filter，并会覆盖CorsFilter - * - * @Author 1024创新实验室: 罗伊 - * @Date 2022/5/12 21:50 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -@Slf4j -public class SecurityTokenFilter extends OncePerRequestFilter { - - private BiFunction userFunction; - - public SecurityTokenFilter(BiFunction userFunction) { - this.userFunction = userFunction; - } - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { - //需要做token校验, 消息头的token优先于请求query参数的token - String xHeaderToken = request.getHeader(RequestHeaderConst.TOKEN); - String xRequestToken = request.getParameter(RequestHeaderConst.TOKEN); - String xAccessToken = null != xHeaderToken ? xHeaderToken : xRequestToken; - if (StringUtils.isBlank(xAccessToken)) { - chain.doFilter(request, response); - return; - } - //清理spring security - SecurityContextHolder.clearContext(); - - UserDetails loginUserDetail = userFunction.apply(xAccessToken,request); - if (null != loginUserDetail) { - UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUserDetail, null, loginUserDetail.getAuthorities()); - authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); - SecurityContextHolder.getContext().setAuthentication(authenticationToken); - SmartRequestUtil.setRequestUser((RequestUser) loginUserDetail); - } - // 若未给予spring security上下文用户授权 则会授权失败 进入AuthenticationEntryPointImpl - chain.doFilter(request, response); - } -} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java index 40210ba2..03def039 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java @@ -14,24 +14,18 @@ import net.lab1024.sa.common.common.domain.RequestUser; */ @Slf4j public class SmartRequestUtil { - - private static final ThreadLocal requestThreadLocal = new ThreadLocal<>(); - - public static void setRequestUser(RequestUser requestUser) { - requestThreadLocal.set(requestUser); + public static RequestUser getUser() { + // TODO listen + return null; } - public static RequestUser getRequestUser() { - return requestThreadLocal.get(); - } - - public static Long getRequestUserId() { - RequestUser requestUser = getRequestUser(); + public static Long getUserId() { + RequestUser requestUser = getUser(); return null == requestUser ? null : requestUser.getUserId(); } public static void remove() { - requestThreadLocal.remove(); + // TODO listen } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/RepeatSubmitConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/RepeatSubmitConfig.java index fcfdd5ee..9f4083c3 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/RepeatSubmitConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/RepeatSubmitConfig.java @@ -31,7 +31,7 @@ public class RepeatSubmitConfig { * @return */ private String ticket(String servletPath) { - Long userId = SmartRequestUtil.getRequestUserId(); + Long userId = SmartRequestUtil.getUserId(); if (null == userId) { return StringConst.EMPTY; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java index 66da1df0..ea17fd75 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java @@ -9,7 +9,6 @@ import net.lab1024.sa.common.common.exception.BusinessException; import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.security.access.AccessDeniedException; import org.springframework.validation.BindException; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -77,15 +76,6 @@ public class GlobalExceptionHandler { return ResponseDTO.error(UserErrorCode.PARAM_ERROR); } - /** - * 权限异常 - */ - @ResponseBody - @ExceptionHandler({AccessDeniedException.class}) - public ResponseDTO permissionExceptionHandler(AccessDeniedException e) { - return ResponseDTO.error(UserErrorCode.NO_PERMISSION); - } - /** * 业务异常 */ diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/datatracer/service/DataTracerService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/datatracer/service/DataTracerService.java index 2968ed5a..aa05bbc9 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/datatracer/service/DataTracerService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/datatracer/service/DataTracerService.java @@ -157,7 +157,7 @@ public class DataTracerService { * 保存数据变动记录 */ public void addTrace(DataTracerForm tracerForm) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); this.addTrace(tracerForm, requestUser); } @@ -182,7 +182,7 @@ public class DataTracerService { * 批量保存数据变动记录 */ public void addTraceList(List tracerFormList) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); this.addTraceList(tracerFormList, requestUser); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/feedback/controller/FeedbackController.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/feedback/controller/FeedbackController.java index b9a1cd09..a3242326 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/feedback/controller/FeedbackController.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/feedback/controller/FeedbackController.java @@ -13,7 +13,6 @@ import net.lab1024.sa.common.module.support.feedback.domain.FeedbackAddForm; import net.lab1024.sa.common.module.support.feedback.domain.FeedbackQueryForm; import net.lab1024.sa.common.module.support.feedback.domain.FeedbackVO; import net.lab1024.sa.common.module.support.feedback.service.FeedbackService; -import net.lab1024.sa.common.module.support.repeatsubmit.annoation.RepeatSubmit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -47,7 +46,7 @@ public class FeedbackController extends SupportBaseController { @ApiOperation("意见反馈-新增 @author 开云") @PostMapping("/feedback/add") public ResponseDTO add(@RequestBody @Valid FeedbackAddForm addForm) { - RequestUser employee = SmartRequestUtil.getRequestUser(); + RequestUser employee = SmartRequestUtil.getUser(); return feedbackService.add(addForm, employee); } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/file/controller/FileController.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/file/controller/FileController.java index 04dc3f10..4734bfa4 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/file/controller/FileController.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/file/controller/FileController.java @@ -5,17 +5,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.controller.SupportBaseController; -import net.lab1024.sa.common.common.domain.PageResult; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.constant.SwaggerTagConst; -import net.lab1024.sa.common.module.support.file.domain.form.FileQueryForm; +import net.lab1024.sa.common.module.support.file.constant.FileFolderTypeEnum; import net.lab1024.sa.common.module.support.file.domain.form.FileUrlUploadForm; import net.lab1024.sa.common.module.support.file.domain.vo.FileUploadVO; -import net.lab1024.sa.common.module.support.file.domain.vo.FileVO; -import net.lab1024.sa.common.module.support.repeatsubmit.annoation.RepeatSubmit; -import net.lab1024.sa.common.module.support.file.constant.FileFolderTypeEnum; import net.lab1024.sa.common.module.support.file.service.FileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -46,14 +42,14 @@ public class FileController extends SupportBaseController { @PostMapping("/file/upload") public ResponseDTO upload(@RequestParam MultipartFile file, @RequestParam Integer folder) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); return fileService.fileUpload(file, folder, requestUser); } @ApiOperation(value = "文件上传，通过url上传 @author 胡克", notes = FileFolderTypeEnum.INFO) @PostMapping("/file/upload/url") public ResponseDTO uploadByUrl(@RequestBody @Valid FileUrlUploadForm uploadForm) { - RequestUser requestUser = SmartRequestUtil.getRequestUser(); + RequestUser requestUser = SmartRequestUtil.getUser(); return fileService.fileUpload(uploadForm,requestUser); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/helpdoc/controller/HelpDocController.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/helpdoc/controller/HelpDocController.java index cd3eb398..005320e2 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/helpdoc/controller/HelpDocController.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/helpdoc/controller/HelpDocController.java @@ -56,7 +56,7 @@ public class HelpDocController extends SupportBaseController { @RepeatSubmit public ResponseDTO view(@PathVariable Long helpDocId, HttpServletRequest request) { return helpDocUserService.view( - SmartRequestUtil.getRequestUser(), + SmartRequestUtil.getUser(), helpDocId); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java index 3d9da663..75ef250d 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java @@ -179,7 +179,7 @@ public abstract class OperateLogAspect { return; } //设置用户信息 - RequestUser user = SmartRequestUtil.getRequestUser(); + RequestUser user = SmartRequestUtil.getUser(); if (user == null) { return; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/table/TableColumnController.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/table/TableColumnController.java index fd657e09..0c5ca017 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/table/TableColumnController.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/table/TableColumnController.java @@ -33,19 +33,19 @@ public class TableColumnController extends SupportBaseController { @PostMapping("/tableColumn/update") @RepeatSubmit public ResponseDTO updateTableColumn(@RequestBody @Valid TableColumnUpdateForm updateForm) { - return tableColumnService.updateTableColumns(SmartRequestUtil.getRequestUser(), updateForm); + return tableColumnService.updateTableColumns(SmartRequestUtil.getUser(), updateForm); } @ApiOperation("恢复默认（删除） @author 卓大") @GetMapping("/tableColumn/delete/{tableId}") @RepeatSubmit public ResponseDTO deleteTableColumn(@PathVariable Integer tableId) { - return tableColumnService.deleteTableColumn(SmartRequestUtil.getRequestUser(), tableId); + return tableColumnService.deleteTableColumn(SmartRequestUtil.getUser(), tableId); } @ApiOperation("查询表格列 @author 卓大") @GetMapping("/tableColumn/getColumns/{tableId}") public ResponseDTO getColumns(@PathVariable Integer tableId) { - return ResponseDTO.ok(tableColumnService.getTableColumns(SmartRequestUtil.getRequestUser(), tableId)); + return ResponseDTO.ok(tableColumnService.getTableColumns(SmartRequestUtil.getUser(), tableId)); } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/LoginDeviceEnum.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/LoginDeviceEnum.java index 3fa94198..5baa2afa 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/LoginDeviceEnum.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/LoginDeviceEnum.java @@ -1,5 +1,7 @@ package net.lab1024.sa.common.module.support.token; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.sa.common.common.enumeration.BaseEnum; /** @@ -11,6 +13,8 @@ import net.lab1024.sa.common.common.enumeration.BaseEnum; * @Email lab1024@163.com * @Copyright 1024创新实验室 （ https://1024lab.net ） */ +@Getter +@AllArgsConstructor public enum LoginDeviceEnum implements BaseEnum { PC(1, "电脑端"), @@ -21,23 +25,9 @@ public enum LoginDeviceEnum implements BaseEnum { H5(4, "H5"), - WEIXIN_MP(5, "微信小程序"); + WX_MP(5, "微信小程序"); - LoginDeviceEnum(Integer value, String desc) { - this.value = value; - this.desc = desc; - } + private final Integer value; - private Integer value; - private String desc; - - @Override - public Integer getValue() { - return value; - } - - @Override - public String getDesc() { - return desc; - } + private final String desc; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java index e3af8649..13daa2f9 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java @@ -1,21 +1,11 @@ package net.lab1024.sa.common.module.support.token; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.JwtBuilder; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import lombok.extern.slf4j.Slf4j; +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; -import net.lab1024.sa.common.constant.RedisKeyConst; -import net.lab1024.sa.common.module.support.redis.RedisService; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.util.Date; -import java.util.Map; +import java.util.List; /** * 与用户token的相关的服务 @@ -27,194 +17,59 @@ import java.util.Map; * @Copyright 1024创新实验室 （ https://1024lab.net ） */ @Component -@Slf4j public class TokenService { - private static final long HOUR_TIME_MILLI = 60 * 60 * 1000; - @Value("${token.key}") - private String tokenKey; + private static final String EXTRA_KEY_USER_NAME = "userName"; - @Value("${token.expire-day}") - private Integer tokenExpire; - - @Autowired - private RedisService redisService; + private static final String EXTRA_KEY_USER_TYPE = "userType"; /** - * 生成Token，并存入redis + * 生成Token * * @param userId * @param userName * @param userTypeEnum * @param loginDeviceEnum - * @param superPasswordFlag 特殊万能密码标识 * @return */ - public String generateToken(Long userId, String userName, UserTypeEnum userTypeEnum, LoginDeviceEnum loginDeviceEnum, Boolean superPasswordFlag) { - long nowTimeMilli = System.currentTimeMillis(); - Claims jwtClaims = Jwts.claims(); - jwtClaims.put(JwtConst.CLAIM_ID_KEY, userId); - jwtClaims.put(JwtConst.CLAIM_NAME_KEY, userName); - jwtClaims.put(JwtConst.CLAIM_USER_TYPE_KEY, userTypeEnum.getValue()); - jwtClaims.put(JwtConst.CLAIM_DEVICE_KEY, loginDeviceEnum.getValue()); - jwtClaims.put(JwtConst.CLAIM_SUPER_PASSWORD_FLAG, superPasswordFlag); - JwtBuilder jwtBuilder = Jwts.builder() - .setClaims(jwtClaims) - .setIssuedAt(new Date(nowTimeMilli)) - .signWith(SignatureAlgorithm.HS512, tokenKey); + public String generateToken(Long userId, + String userName, + UserTypeEnum userTypeEnum, + LoginDeviceEnum loginDeviceEnum) { - // 如果是万能密码，则不需要记录到redis中;万能密码最多半个小时有效期 - if (superPasswordFlag) { - jwtBuilder.setExpiration(new Date(nowTimeMilli + (HOUR_TIME_MILLI / 2))); - return jwtBuilder.compact(); - } + /** + * 设置登录模式参数 + * 具体参数 @see SaLoginModel 属性 + * 已经写的挺清楚的了 + */ + SaLoginModel loginModel = new SaLoginModel(); + // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 + loginModel.setDevice(String.valueOf(loginDeviceEnum.getDesc())); + // 扩展参数 + loginModel.setExtra(EXTRA_KEY_USER_NAME, userName); + loginModel.setExtra(EXTRA_KEY_USER_TYPE, userTypeEnum.getValue()); - jwtBuilder.setExpiration(new Date(nowTimeMilli + tokenExpire * 24 * HOUR_TIME_MILLI)); - String token = jwtBuilder.compact(); - String redisKey = this.generateTokenRedisKey(userId, userTypeEnum.getValue(), loginDeviceEnum.getValue()); - redisService.set(redisKey, token, tokenExpire * 24 * 3600); - return token; + String loginId = generateLoginId(userId, userTypeEnum); + StpUtil.login(loginId, loginModel); + return StpUtil.getTokenValue(); + } + + public static String generateLoginId(Long userId, UserTypeEnum userType) { + return userType.getValue() + "_" + userId; } /** - * 生成登录信息： 含设备信息 - * - * @param userId - * @param device - * @return + * 退出登录 注销 */ - private String generateTokenRedisKey(Long userId, Integer userType, Integer device) { - String userKey = userType + "_" + userId + "_" + device; - return redisService.generateRedisKey(RedisKeyConst.Support.TOKEN, userKey); + public void removeToken() { + StpUtil.logout(); } - - /** - * 强制移除 此用户各端的登录信息 - * - * @param token - */ - public void removeToken(String token) { - Map tokenData = this.decryptTokenData(token); - if (MapUtils.isEmpty(tokenData)) { - return; - } - - //特殊账号 - if (tokenData.get(JwtConst.CLAIM_SUPER_PASSWORD_FLAG) != null) { - try { - Boolean superPasswordFlag = Boolean.valueOf(tokenData.get(JwtConst.CLAIM_SUPER_PASSWORD_FLAG).toString()); - if (superPasswordFlag) { - return; - } - } catch (Exception e) { - log.error(e.getMessage(), e); - return; - } - } - - boolean isValid = this.checkRedisToken(tokenData, token); - if (!isValid) { - return; - } - - Long userId = Long.valueOf(tokenData.get(JwtConst.CLAIM_ID_KEY).toString()); - Integer userType = Integer.valueOf(tokenData.get(JwtConst.CLAIM_USER_TYPE_KEY).toString()); - Integer device = Integer.valueOf(tokenData.get(JwtConst.CLAIM_DEVICE_KEY).toString()); - - String redisKey = this.generateTokenRedisKey(userId, userType, device); - redisService.delete(redisKey); + public void removeToken(Long userId, UserTypeEnum userType) { + StpUtil.logout(generateLoginId(userId, userType)); } - /** - * 解析并校验token信息 获取 userId - * - * @param token - * @return - */ - public Long getUserIdAndValidateToken(String token) { - Map parseJwtData = this.decryptTokenData(token); - boolean isValid = this.checkRedisToken(parseJwtData, token); - if (!isValid) { - return null; - } - Long userId = Long.valueOf(parseJwtData.get(JwtConst.CLAIM_ID_KEY).toString()); - return userId; - } - - /** - * 解密和解析token - * - * @param token - * @return - */ - private Map decryptTokenData(String token) { - try { - return Jwts.parser() - .setSigningKey(tokenKey) - .parseClaimsJws(token) - .getBody(); - } catch (Exception e) { - } - return null; - } - - /** - * 校验token是否有效 - * - * @param token - * @return - */ - private boolean checkRedisToken(Map parseJwtData, String token) { - if (MapUtils.isEmpty(parseJwtData)) { - return false; - } - //特殊账号 - if (parseJwtData.get(JwtConst.CLAIM_SUPER_PASSWORD_FLAG) != null) { - try { - Boolean superPasswordFlag = Boolean.valueOf(parseJwtData.get(JwtConst.CLAIM_SUPER_PASSWORD_FLAG).toString()); - if (superPasswordFlag) { - return true; - } - } catch (Exception e) { - log.error(e.getMessage(), e); - return false; - } - } - - Long userId = null; - Integer userType = null, device = null; - - if (null != parseJwtData.get(JwtConst.CLAIM_ID_KEY)) { - userId = NumberUtils.toLong(parseJwtData.get(JwtConst.CLAIM_ID_KEY).toString(), -1); - userId = userId == -1 ? null : userId; - } - - if (null != parseJwtData.get(JwtConst.CLAIM_USER_TYPE_KEY)) { - userType = NumberUtils.toInt(parseJwtData.get(JwtConst.CLAIM_USER_TYPE_KEY).toString(), -1); - userType = userType == -1 ? null : userType; - } - - if (null != parseJwtData.get(JwtConst.CLAIM_DEVICE_KEY)) { - device = NumberUtils.toInt(parseJwtData.get(JwtConst.CLAIM_DEVICE_KEY).toString(), -1); - device = device == -1 ? null : device; - } - - if (userId == null || userType == null || device == null) { - return false; - } - - String redisKey = this.generateTokenRedisKey(userId, userType, device); - String redisToken = redisService.get(redisKey); - return token.equals(redisToken); - } - - /** - * 批量移除用户所有设备的token - */ - public void batchRemoveRedisToken(Long userId, UserTypeEnum userTypeEnum) { - for (LoginDeviceEnum device : LoginDeviceEnum.values()) { - redisService.delete(this.generateTokenRedisKey(userId, userTypeEnum.getValue(), device.getValue())); - } + public void removeToken(List userIdList, UserTypeEnum userType) { + userIdList.forEach(id -> StpUtil.logout(generateLoginId(id, userType))); } } \ No newline at end of file diff --git a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml index b6b25c9d..73a3c270 100644 --- a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml +++ b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml @@ -3,7 +3,7 @@ spring: datasource: url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v2?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: Zhuoda1024lab + password: 123456 initial-size: 2 min-idle: 2 max-active: 10 @@ -27,17 +27,17 @@ spring: # redis 连接池配置信息 redis: - database: 1 + database: 12 host: 127.0.0.1 lettuce: pool: - max-active: 5 + max-active: 50 min-idle: 1 max-idle: 3 max-wait: 30000ms port: 6379 - timeout: 10000ms - password: + timeout: 10s + password: 123456 # 上传文件大小配置 servlet: @@ -109,11 +109,6 @@ http: write-timeout: 50000 keep-alive: 300000 -# token相关配置 -token: - key: sa-jwt-key - expire-day: 7 - # 跨域配置 access-control-allow-origin: '*' @@ -123,4 +118,23 @@ heart-beat: # 热加载配置 reload: - interval-seconds: 300 \ No newline at end of file + interval-seconds: 300 + +############## Sa-Token 配置 (文档: https://sa-token.cc) ############## +sa-token: + # token 名称（同时也是 cookie 名称） + token-name: x-access-token + # token 前缀 + token-prefix: + # token 有效期（单位：秒） 默认30天，-1 代表永久有效 + timeout: 2592000 + # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 + active-timeout: 28800 + # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） + is-concurrent: false + # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） + is-share: false + # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik） + token-style: simple-uuid + # 是否输出操作日志 + is-log: true \ No newline at end of file From 1ad96b81e91061fb0bec5832b40a6248dea3e60e Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Wed, 12 Jul 2023 22:33:33 +0800 Subject: [PATCH 02/11] sa-token add login --- smart-admin-api/pom.xml | 7 + .../admin/interceptor/AdminInterceptor.java | 69 ++++++++ .../oa/enterprise/EnterpriseController.java | 11 -- .../notice/controller/NoticeController.java | 6 - .../login/domain/LoginEmployeeDetail.java | 13 +- .../system/menu/service/MenuService.java | 8 +- smart-admin-api/sa-common/pom.xml | 9 +- .../sa/common/common/annoation/SaAuth.java | 22 --- .../sa/common/common/code/UserErrorCode.java | 6 +- .../sa/common/common/domain/RequestUser.java | 38 ++--- .../interceptor/AbstractInterceptor.java | 22 +-- .../common/common/util/SmartRequestUtil.java | 12 +- .../lab1024/sa/common/config/MvcConfig.java | 5 +- .../lab1024/sa/common/config/UrlConfig.java | 150 ------------------ .../common/config/satoken/SaTokenConfig.java | 29 ++++ .../handler/GlobalExceptionHandler.java | 29 ++++ .../module/support/token/TokenService.java | 11 +- .../src/main/resources/dev/sa-common.yaml | 8 +- 18 files changed, 203 insertions(+), 252 deletions(-) create mode 100644 smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/annoation/SaAuth.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java create mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java diff --git a/smart-admin-api/pom.xml b/smart-admin-api/pom.xml index 37e2f4ae..0faa59f4 100644 --- a/smart-admin-api/pom.xml +++ b/smart-admin-api/pom.xml @@ -125,6 +125,13 @@ ${sa-token-version} + + + cn.dev33 + sa-token-jwt + 1.35.0.RC + + diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java new file mode 100644 index 00000000..30e7eb50 --- /dev/null +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java @@ -0,0 +1,69 @@ +package net.lab1024.sa.admin.interceptor; + +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.convert.NumberWithFormat; +import net.lab1024.sa.common.common.domain.RequestUser; +import net.lab1024.sa.common.common.enumeration.UserTypeEnum; +import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; +import net.lab1024.sa.common.common.util.SmartEnumUtil; +import net.lab1024.sa.common.handler.GlobalExceptionHandler; +import net.lab1024.sa.common.module.support.token.TokenService; +import org.springframework.context.annotation.Configuration; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * admin 拦截器 + * + * @author: listen + * @date: 2023/7/12 21:00 + */ +@Configuration +public class AdminInterceptor extends AbstractInterceptor { + + @Override + public RequestUser checkTokenAndGetUser() { + /** + * 检验当前会话是否已经登录, 如果未登录，则抛出异常：`NotLoginException` + * 已在全局异常处理 + * @see GlobalExceptionHandler#handlerNotLoginException + */ + StpUtil.checkLogin(); + + // 获取额外数据 + Integer userType = ((NumberWithFormat) StpUtil.getExtra(TokenService.EXTRA_KEY_USER_TYPE)).intValue(); + UserTypeEnum userTypeEnum = SmartEnumUtil.getEnumByValue(userType, UserTypeEnum.class); + String userName = (String) StpUtil.getExtra(TokenService.EXTRA_KEY_USER_NAME); + String loginId = (String) StpUtil.getLoginId(); + + // 当前请求对象 + RequestUser requestUser = new RequestUser(); + requestUser.setUserId(TokenService.getUserId(loginId)); + requestUser.setUserName(userName); + requestUser.setUserType(userTypeEnum); + return requestUser; + } + + /** + * 配置拦截路径 + * + * @return + */ + @Override + public String[] pathPatterns() { + return new String[]{"/**"}; + } + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + boolean isHandle = super.preHandle(request, response, handler); + if (!isHandle) { + return false; + } + + // TODO listen 校验权限 + + return true; + } +} diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java index 6f36b68b..ed8a35cd 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java @@ -8,7 +8,6 @@ import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; -import net.lab1024.sa.common.common.annoation.SaAuth; import net.lab1024.sa.common.common.domain.PageResult; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; @@ -40,21 +39,18 @@ public class EnterpriseController { @ApiOperation(value = "分页查询企业模块 @author 开云") @PostMapping("/oa/enterprise/page/query") - @SaAuth public ResponseDTO> queryByPage(@RequestBody @Valid EnterpriseQueryForm queryDTO) { return enterpriseService.queryByPage(queryDTO); } @ApiOperation(value = "查询企业详情 @author 开云") @GetMapping("/oa/enterprise/get/{enterpriseId}") - @SaAuth public ResponseDTO getDetail(@PathVariable Long enterpriseId) { return ResponseDTO.ok(enterpriseService.getDetail(enterpriseId)); } @ApiOperation(value = "新建企业 @author 开云") @PostMapping("/oa/enterprise/create") - @SaAuth public ResponseDTO createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) { RequestUser requestUser = SmartRequestUtil.getUser(); createVO.setCreateUserId(requestUser.getUserId()); @@ -64,21 +60,18 @@ public class EnterpriseController { @ApiOperation(value = "编辑企业 @author 开云") @PostMapping("/oa/enterprise/update") - @SaAuth public ResponseDTO updateEnterprise(@RequestBody @Valid EnterpriseUpdateForm updateVO) { return enterpriseService.updateEnterprise(updateVO); } @ApiOperation(value = "删除企业 @author 开云") @GetMapping("/oa/enterprise/delete/{enterpriseId}") - @SaAuth public ResponseDTO deleteEnterprise(@PathVariable Long enterpriseId) { return enterpriseService.deleteEnterprise(enterpriseId); } @ApiOperation(value = "企业列表查询 @author 开云") @GetMapping("/oa/enterprise/query/list") - @SaAuth public ResponseDTO> queryList(@RequestParam(value = "type", required = false) Integer type) { return enterpriseService.queryList(type); } @@ -86,21 +79,18 @@ public class EnterpriseController { @ApiOperation(value = "企业添加员工 @author 罗伊") @PostMapping("/oa/enterprise/employee/add") - @SaAuth public ResponseDTO addEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) { return enterpriseService.addEmployee(enterpriseEmployeeForm); } @ApiOperation(value = "查询企业全部员工 @author 罗伊") @PostMapping("/oa/enterprise/employee/list") - @SaAuth public ResponseDTO> employeeList(@RequestBody @Valid List enterpriseIdList) { return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList)); } @ApiOperation(value = "分页查询企业员工 @author 卓大") @PostMapping("/oa/enterprise/employee/queryPage") - @SaAuth public ResponseDTO> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) { return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm)); } @@ -108,7 +98,6 @@ public class EnterpriseController { @ApiOperation(value = "企业删除员工 @author 罗伊") @PostMapping("/oa/enterprise/employee/delete") - @SaAuth public ResponseDTO deleteEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) { return enterpriseService.deleteEmployee(enterpriseEmployeeForm); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java index 42eff483..f2af3de6 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java @@ -9,7 +9,6 @@ import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*; import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeEmployeeService; import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeService; import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeTypeService; -import net.lab1024.sa.common.common.annoation.SaAuth; import net.lab1024.sa.common.common.domain.PageResult; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; @@ -73,7 +72,6 @@ public class NoticeController { @ApiOperation("【管理】通知公告-分页查询 @author 卓大") @PostMapping("/oa/notice/query") - @SaAuth public ResponseDTO> query(@RequestBody @Valid NoticeQueryForm queryForm) { return ResponseDTO.ok(noticeService.query(queryForm)); } @@ -81,7 +79,6 @@ public class NoticeController { @ApiOperation("【管理】通知公告-添加 @author 卓大") @PostMapping("/oa/notice/add") @RepeatSubmit - @SaAuth public ResponseDTO add(@RequestBody @Valid NoticeAddForm addForm) { addForm.setCreateUserId(SmartRequestUtil.getUserId()); return noticeService.add(addForm); @@ -90,21 +87,18 @@ public class NoticeController { @ApiOperation("【管理】通知公告-更新 @author 卓大") @PostMapping("/oa/notice/update") @RepeatSubmit - @SaAuth public ResponseDTO update(@RequestBody @Valid NoticeUpdateForm updateForm) { return noticeService.update(updateForm); } @ApiOperation("【管理】通知公告-更新详情 @author 卓大") @GetMapping("/oa/notice/getUpdateVO/{noticeId}") - @SaAuth public ResponseDTO getUpdateFormVO(@PathVariable Long noticeId) { return ResponseDTO.ok(noticeService.getUpdateFormVO(noticeId)); } @ApiOperation("【管理】通知公告-删除 @author 卓大") @GetMapping("/oa/notice/delete/{noticeId}") - @SaAuth public ResponseDTO delete(@PathVariable Long noticeId) { return noticeService.delete(noticeId); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java index 00596b76..76b4dbea 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginEmployeeDetail.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO; -import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.enumeration.GenderEnum; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum; @@ -22,7 +21,7 @@ import java.util.List; * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022 */ @Data -public class LoginEmployeeDetail implements RequestUser { +public class LoginEmployeeDetail { @ApiModelProperty("token") private String token; @@ -74,14 +73,4 @@ public class LoginEmployeeDetail implements RequestUser { @ApiModelProperty("请求user-agent") private String userAgent; - - @Override - public Long getUserId() { - return employeeId; - } - - @Override - public String getUserName() { - return actualName; - } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java index 4b3fa693..d480eaab 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -38,10 +39,6 @@ public class MenuService { @Autowired private MenuDao menuDao; - - @Autowired - private List authUrl; - /** * 添加菜单 * @@ -284,7 +281,8 @@ public class MenuService { * @return */ public ResponseDTO> getAuthUrl() { - return ResponseDTO.ok(authUrl); + // TODO listen + return ResponseDTO.ok(Collections.emptyList()); } } diff --git a/smart-admin-api/sa-common/pom.xml b/smart-admin-api/sa-common/pom.xml index 9620d010..57a6c9c9 100644 --- a/smart-admin-api/sa-common/pom.xml +++ b/smart-admin-api/sa-common/pom.xml @@ -49,7 +49,7 @@ - + cn.dev33 sa-token-spring-boot-starter @@ -60,6 +60,13 @@ sa-token-redis-jackson + + + cn.dev33 + sa-token-jwt + + + org.springframework.boot spring-boot-starter-log4j2 diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/annoation/SaAuth.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/annoation/SaAuth.java deleted file mode 100644 index 4d44a2f7..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/annoation/SaAuth.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.lab1024.sa.common.common.annoation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 校验权限注解 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2022-05-30 21:22:12 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface SaAuth { - - String saAuth = "saAuth"; -} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java index 6178661a..39221e87 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java @@ -32,7 +32,11 @@ public enum UserErrorCode implements ErrorCode { USER_STATUS_ERROR(30008, "用户状态异常"), - FORM_REPEAT_SUBMIT(30009, "请勿重复提交"); + FORM_REPEAT_SUBMIT(30009, "请勿重复提交"), + + LOGIN_FROM_OTHER(30010, "您的账号已在其他地方登录"), + + ; private final int code; diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java index afce6da7..e7ef34a9 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java @@ -1,9 +1,11 @@ package net.lab1024.sa.common.common.domain; +import lombok.Data; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; /** * 请求用户 + * 多系统用户 可以继承此类 * * @Author 1024创新实验室-主任: 卓大 * @Date 2021-12-21 19:55:07 @@ -11,39 +13,31 @@ import net.lab1024.sa.common.common.enumeration.UserTypeEnum; * @Email lab1024@163.com * @Copyright 1024创新实验室 （ https://1024lab.net ） */ -public interface RequestUser { +@Data +public class RequestUser { /** - * 请求用户id - * - * @return + * 当前请求用户id */ - Long getUserId(); + private Long userId; /** - * 请求用户名称 - * - * @return + * 当前请求用户名称 */ - String getUserName(); + private String userName; /** - * 获取用户类型 + * 当前请求用户类型 */ - UserTypeEnum getUserType(); + private UserTypeEnum userType; /** - * 获取请求的IP - * - * @return + * TODO listen 准备移除 + * 为了其他地方不报错 */ - String getIp(); - - /** - * 获取请求 user-agent - * - * @return - */ - String getUserAgent(); + @Deprecated + private String ip; + @Deprecated + private String userAgent; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java index 0cb82222..22290a44 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java @@ -1,14 +1,15 @@ package net.lab1024.sa.common.common.interceptor; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; import net.lab1024.sa.common.common.annoation.NoNeedLogin; import net.lab1024.sa.common.common.code.UserErrorCode; import net.lab1024.sa.common.common.constant.RequestHeaderConst; +import net.lab1024.sa.common.common.constant.StringConst; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.util.CollectionUtils; @@ -19,7 +20,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.function.Function; /** * 抽象拦截器 @@ -32,16 +32,12 @@ import java.util.function.Function; */ public abstract class AbstractInterceptor implements HandlerInterceptor { - @Autowired - private List ignoreUrlList; - - /** * Token获取用户信息 * * @return */ - protected abstract Function userFunction(); + public abstract RequestUser checkTokenAndGetUser(); /** * 拦截路径 @@ -56,6 +52,12 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { * @return */ protected List getIgnoreUrlList() { + List ignoreUrlList = Lists.newArrayList(); + ignoreUrlList.add("/swagger-ui.html"); + ignoreUrlList.add("/swagger-resources/**"); + ignoreUrlList.add("/webjars/**"); + ignoreUrlList.add("/druid/**"); + ignoreUrlList.add("/*/api-docs"); return ignoreUrlList; } @@ -83,7 +85,7 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { //放行的Uri前缀 String uri = request.getRequestURI(); String contextPath = request.getContextPath(); - String target = uri.replaceFirst(contextPath, ""); + String target = uri.replaceFirst(contextPath, StringConst.EMPTY); if (this.contain(this.getIgnoreUrlList(), target)) { return true; } @@ -95,9 +97,9 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { String xAccessToken = StringUtils.isNotBlank(xRequestToken) ? xRequestToken : xHeaderToken; // 包含token 则获取用户信息 并保存 if (StringUtils.isNotBlank(xAccessToken)) { - RequestUser requestUser = userFunction().apply(xAccessToken); + RequestUser requestUser = this.checkTokenAndGetUser(); if (requestUser != null) { - // SmartRequestUtil.setRequestUser(requestUser); + SmartRequestUtil.setUser(requestUser); } // 有token 无需登录 if (null != noNeedLogin) { diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java index 03def039..0e22b630 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java @@ -14,9 +14,15 @@ import net.lab1024.sa.common.common.domain.RequestUser; */ @Slf4j public class SmartRequestUtil { + + private static final ThreadLocal LOCAL = new ThreadLocal<>(); + + public static void setUser(RequestUser requestUser) { + LOCAL.set(requestUser); + } + public static RequestUser getUser() { - // TODO listen - return null; + return LOCAL.get(); } public static Long getUserId() { @@ -25,7 +31,7 @@ public class SmartRequestUtil { } public static void remove() { - // TODO listen + LOCAL.remove(); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java index c08339c9..32956ada 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java @@ -4,7 +4,6 @@ import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; @@ -25,7 +24,7 @@ import java.util.List; public class MvcConfig implements WebMvcConfigurer { @Autowired(required = false) - private List interceptorList; + private List interceptorList; @Override public void addInterceptors (InterceptorRegistry registry) { @@ -33,7 +32,7 @@ public class MvcConfig implements WebMvcConfigurer { return; } interceptorList.forEach(e->{ - registry.addInterceptor(e).addPathPatterns("/**"); + registry.addInterceptor(e).addPathPatterns(e.pathPatterns()); }); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java deleted file mode 100644 index 6e8ae116..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java +++ /dev/null @@ -1,150 +0,0 @@ -package net.lab1024.sa.common.config; - -import cn.hutool.core.util.StrUtil; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.common.common.annoation.NoNeedLogin; -import net.lab1024.sa.common.common.annoation.SaAuth; -import net.lab1024.sa.common.common.domain.RequestUrlVO; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.mvc.method.RequestMappingInfo; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * url配置 - * - * @Author 1024创新实验室: 罗伊 - * @Date 2022-05-30 21:22:12 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） - */ -@Configuration -@Slf4j -public class UrlConfig { - @Autowired - private RequestMappingHandlerMapping requestMappingHandlerMapping; - - - /** - * 获取每个方法的请求路径 - * - * @return - */ - @Bean - public Map> methodUrlMap() { - Map> methodUrlMap = Maps.newHashMap(); - //获取url与类和方法的对应信息 - Map map = requestMappingHandlerMapping.getHandlerMethods(); - for (Map.Entry entry : map.entrySet()) { - RequestMappingInfo requestMappingInfo = entry.getKey(); - - Set urls = requestMappingInfo.getPatternsCondition().getPatterns(); - if (CollectionUtils.isEmpty(urls)) { - continue; - } - HandlerMethod handlerMethod = entry.getValue(); - methodUrlMap.put(handlerMethod.getMethod(), urls); - } - return methodUrlMap; - } - - /** - * 需要进行url权限校验的方法 - * - * @param methodUrlMap - * @return - */ - @Bean - public List authUrl(Map> methodUrlMap) { - List authUrlList = Lists.newArrayList(); - for (Map.Entry> entry : methodUrlMap.entrySet()) { - Method method = entry.getKey(); - SaAuth saAuth = method.getAnnotation(SaAuth.class); - if (null == saAuth) { - continue; - } - List requestUrlList = this.buildRequestUrl(method, entry.getValue()); - authUrlList.addAll(requestUrlList); - } - log.info("需要权限校验的URL：{}", authUrlList.stream().map(e -> e.getUrl()).collect(Collectors.toList())); - return authUrlList; - } - - private List buildRequestUrl(Method method, Set urlSet) { - List requestUrlList = Lists.newArrayList(); - if (CollectionUtils.isEmpty(urlSet)) { - return requestUrlList; - } - //url对应的方法名称 - String className = method.getDeclaringClass().getName(); - String methodName = method.getName(); - List list = StrUtil.split(className, "."); - String controllerName = list.get(list.size() - 1); - String name = controllerName + "." + methodName; - //swagger 说明信息 - String methodComment = null; - ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); - if (apiOperation != null) { - methodComment = apiOperation.value(); - } - for (String url : urlSet) { - RequestUrlVO requestUrlVO = new RequestUrlVO(); - requestUrlVO.setUrl(url); - requestUrlVO.setName(name); - requestUrlVO.setComment(methodComment); - requestUrlList.add(requestUrlVO); - } - return requestUrlList; - } - - - /** - * 获取无需登录可以匿名访问的url信息 - * - * @return - */ - @Bean - public List noNeedLoginUrlList(Map> methodUrlMap) { - List noNeedLoginUrlList = Lists.newArrayList(); - for (Map.Entry> entry : methodUrlMap.entrySet()) { - Method method = entry.getKey(); - NoNeedLogin noNeedLogin = method.getAnnotation(NoNeedLogin.class); - if (null == noNeedLogin) { - continue; - } - noNeedLoginUrlList.addAll(entry.getValue()); - } - log.info("不需要登录的URL：{}", noNeedLoginUrlList); - return noNeedLoginUrlList; - } - - /** - * 获取忽略的url信息 - * - * @return - */ - @Bean - public List ignoreUrlList() { - List ignoreUrlList = Lists.newArrayList(); - ignoreUrlList.add("/swagger-ui.html"); - ignoreUrlList.add("/swagger-resources/**"); - ignoreUrlList.add("/webjars/**"); - ignoreUrlList.add("/druid/**"); - ignoreUrlList.add("/*/api-docs"); - return ignoreUrlList; - } - -} \ No newline at end of file diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java new file mode 100644 index 00000000..4475d0ef --- /dev/null +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java @@ -0,0 +1,29 @@ +package net.lab1024.sa.common.config.satoken; + +import cn.dev33.satoken.jwt.StpLogicJwtForSimple; +import cn.dev33.satoken.stp.StpLogic; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * sa token 配置 + * + * @author: listen + * @date: 2023/7/12 20:46 + */ +@Configuration +public class SaTokenConfig { + + /** + * 整合 jwt + * + * @return + * @see https://sa-token.cc/doc.html#/plugin/jwt-extend + */ + @Bean + public StpLogic getStpLogicJwt() { + // Simple 简单模式 + return new StpLogicJwtForSimple(); + } + +} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java index ea17fd75..fa3e1bb9 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java @@ -1,5 +1,6 @@ package net.lab1024.sa.common.handler; +import cn.dev33.satoken.exception.NotLoginException; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.common.common.code.SystemErrorCode; import net.lab1024.sa.common.common.code.UserErrorCode; @@ -88,6 +89,34 @@ public class GlobalExceptionHandler { return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, e.getMessage()); } + /** + * sa-token 登录异常处理 + * + * @param nle + * @return + * @throws Exception + */ + @ResponseBody + @ExceptionHandler(NotLoginException.class) + public ResponseDTO handlerNotLoginException(NotLoginException nle) { + /** + * 判断场景值 自己根据业务在下面 switch 添加分支判断 + * NotLoginException.NOT_TOKEN 无token + * NotLoginException.INVALID_TOKEN token无效 + * NotLoginException.TOKEN_TIMEOUT token过期 + * NotLoginException.NO_PREFIX token缺少前缀 + * NotLoginException.KICK_OUT 已被踢下线 + * NotLoginException.TOKEN_FREEZE 已被冻结 + */ + switch (nle.getType()) { + case NotLoginException.BE_REPLACED: + // token 已被顶下线 + return ResponseDTO.error(UserErrorCode.LOGIN_FROM_OTHER); + default: + return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); + } + } + /** * 其他全部异常 * diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java index 13daa2f9..3a19712a 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java @@ -2,6 +2,7 @@ package net.lab1024.sa.common.module.support.token; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; +import net.lab1024.sa.common.common.constant.StringConst; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import org.springframework.stereotype.Component; @@ -19,9 +20,9 @@ import java.util.List; @Component public class TokenService { - private static final String EXTRA_KEY_USER_NAME = "userName"; + public static final String EXTRA_KEY_USER_NAME = "userName"; - private static final String EXTRA_KEY_USER_TYPE = "userType"; + public static final String EXTRA_KEY_USER_TYPE = "userType"; /** * 生成Token @@ -55,7 +56,11 @@ public class TokenService { } public static String generateLoginId(Long userId, UserTypeEnum userType) { - return userType.getValue() + "_" + userId; + return userType.getValue() + StringConst.UNDERLINE + userId; + } + + public static Long getUserId(String loginId) { + return Long.valueOf(loginId.substring(loginId.indexOf(StringConst.UNDERLINE) + 1)); } /** diff --git a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml index 73a3c270..047a15cd 100644 --- a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml +++ b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml @@ -124,17 +124,19 @@ reload: sa-token: # token 名称（同时也是 cookie 名称） token-name: x-access-token - # token 前缀 + # token 前缀 例如：Bear token-prefix: + # jwt秘钥 + jwt-secret-key: smart-admin # token 有效期（单位：秒） 默认30天，-1 代表永久有效 timeout: 2592000 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 active-timeout: 28800 # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） is-concurrent: false - # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） + # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）(jwt模式下恒false) is-share: false - # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik） + # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）(jwt模式下无用) token-style: simple-uuid # 是否输出操作日志 is-log: true \ No newline at end of file From 0d17270b11a47144e8b8f36deb1513e5d94b4172 Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Wed, 12 Jul 2023 22:58:04 +0800 Subject: [PATCH 03/11] update system env --- .../admin/interceptor/AdminInterceptor.java | 17 +++++++++ ...{SystemEnvironment.java => SystemEnv.java} | 6 +-- ...nvironmentEnum.java => SystemEnvEnum.java} | 2 +- .../interceptor/AbstractInterceptor.java | 37 ++++++++++++++----- .../sa/common/config/DataSourceConfig.java | 2 +- .../sa/common/config/SwaggerConfig.java | 2 +- ...onmentConfig.java => SystemEnvConfig.java} | 16 ++++---- .../handler/GlobalExceptionHandler.java | 4 +- .../support/captcha/CaptchaService.java | 5 +-- .../module/support/redis/RedisService.java | 8 ++-- .../module/support/token/TokenService.java | 2 +- 11 files changed, 67 insertions(+), 34 deletions(-) rename smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/{SystemEnvironment.java => SystemEnv.java} (76%) rename smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/{SystemEnvironmentEnum.java => SystemEnvEnum.java} (94%) rename smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/{SystemEnvironmentConfig.java => SystemEnvConfig.java} (69%) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java index 30e7eb50..59ba1fd1 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java @@ -8,6 +8,7 @@ import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; import net.lab1024.sa.common.common.util.SmartEnumUtil; import net.lab1024.sa.common.handler.GlobalExceptionHandler; import net.lab1024.sa.common.module.support.token.TokenService; +import org.apache.commons.lang3.math.NumberUtils; import org.springframework.context.annotation.Configuration; import javax.servlet.http.HttpServletRequest; @@ -22,6 +23,22 @@ import javax.servlet.http.HttpServletResponse; @Configuration public class AdminInterceptor extends AbstractInterceptor { + /** + * 开发环境 方便调试 默认 user id 1 + * 可以根据id 查询实际用户数据 + * + * @param token + */ + @Override + public RequestUser getDevRequestUser(String token) { + long userId = NumberUtils.toLong(token, 1L); + RequestUser requestUser = new RequestUser(); + requestUser.setUserId(userId); + requestUser.setUserName("dev"); + requestUser.setUserType(UserTypeEnum.ADMIN_EMPLOYEE); + return requestUser; + } + @Override public RequestUser checkTokenAndGetUser() { /** diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/SystemEnvironment.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/SystemEnv.java similarity index 76% rename from smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/SystemEnvironment.java rename to smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/SystemEnv.java index 8cf4b845..4a709a25 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/SystemEnvironment.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/SystemEnv.java @@ -3,7 +3,7 @@ package net.lab1024.sa.common.common.domain; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.sa.common.common.enumeration.SystemEnvironmentEnum; +import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; /** * 系统环境 @@ -16,7 +16,7 @@ import net.lab1024.sa.common.common.enumeration.SystemEnvironmentEnum; */ @AllArgsConstructor @Getter -public class SystemEnvironment { +public class SystemEnv { /** * 是否位生产环境 @@ -31,5 +31,5 @@ public class SystemEnvironment { /** * 当前环境 */ - private SystemEnvironmentEnum currentEnvironment; + private SystemEnvEnum currentEnv; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvironmentEnum.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java similarity index 94% rename from smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvironmentEnum.java rename to smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java index bccaecbd..577f9ed9 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvironmentEnum.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java @@ -15,7 +15,7 @@ import lombok.Getter; */ @AllArgsConstructor @Getter -public enum SystemEnvironmentEnum implements BaseEnum { +public enum SystemEnvEnum implements BaseEnum { /** * dev */ diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java index 22290a44..3b32b623 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java @@ -8,8 +8,12 @@ import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.constant.StringConst; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; +import net.lab1024.sa.common.common.domain.SystemEnv; +import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; import net.lab1024.sa.common.common.util.SmartRequestUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.util.CollectionUtils; @@ -23,6 +27,7 @@ import java.util.List; /** * 抽象拦截器 + * 如果有额外的拦截处理 可以继承此类 * * @Author 1024创新实验室: 罗伊 * @Date 2021-10-09 20:56:14 @@ -32,6 +37,9 @@ import java.util.List; */ public abstract class AbstractInterceptor implements HandlerInterceptor { + @Autowired + private SystemEnv systemEnv; + /** * Token获取用户信息 * @@ -39,6 +47,14 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { */ public abstract RequestUser checkTokenAndGetUser(); + /** + * 获取 dev 开发用户 + * + * @param token + * @return + */ + public abstract RequestUser getDevRequestUser(String token); + /** * 拦截路径 * @@ -89,24 +105,25 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { if (this.contain(this.getIgnoreUrlList(), target)) { return true; } - //不需要登录 - NoNeedLogin noNeedLogin = ((HandlerMethod) handler).getMethodAnnotation(NoNeedLogin.class); // 检查是否包含 token String xRequestToken = request.getParameter(RequestHeaderConst.TOKEN); String xHeaderToken = request.getHeader(RequestHeaderConst.TOKEN); String xAccessToken = StringUtils.isNotBlank(xRequestToken) ? xRequestToken : xHeaderToken; // 包含token 则获取用户信息 并保存 if (StringUtils.isNotBlank(xAccessToken)) { - RequestUser requestUser = this.checkTokenAndGetUser(); - if (requestUser != null) { - SmartRequestUtil.setUser(requestUser); - } - // 有token 无需登录 - if (null != noNeedLogin) { - return true; + // TODO listen 待处理有token 已失效的情况 + RequestUser requestUser; + // 开发环境 token 处理 不需要的话 可以去掉 + if (SystemEnvEnum.DEV == systemEnv.getCurrentEnv() && NumberUtils.isDigits(xAccessToken)) { + requestUser = this.getDevRequestUser(xAccessToken); + } else { + requestUser = this.checkTokenAndGetUser(); } + SmartRequestUtil.setUser(requestUser); } - // 无token 无需登录 + + // 是否需要登录 + NoNeedLogin noNeedLogin = ((HandlerMethod) handler).getMethodAnnotation(NoNeedLogin.class); if (null != noNeedLogin) { return true; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/DataSourceConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/DataSourceConfig.java index cb937a0b..3d4b0bd6 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/DataSourceConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/DataSourceConfig.java @@ -153,7 +153,7 @@ public class DataSourceConfig { * * @return */ - @Conditional(SystemEnvironmentConfig.class) + @Conditional(SystemEnvConfig.class) @Bean public ServletRegistrationBean druidServlet() { ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean<>(); diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java index 901b9246..bf0a0940 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java @@ -57,7 +57,7 @@ import java.util.Map; @Slf4j @EnableSwagger2 @Configuration -@Conditional(SystemEnvironmentConfig.class) +@Conditional(SystemEnvConfig.class) public class SwaggerConfig implements EnvironmentAware, BeanDefinitionRegistryPostProcessor { /** diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SystemEnvironmentConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SystemEnvConfig.java similarity index 69% rename from smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SystemEnvironmentConfig.java rename to smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SystemEnvConfig.java index 1af9577a..bc6b747e 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SystemEnvironmentConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SystemEnvConfig.java @@ -1,7 +1,7 @@ package net.lab1024.sa.common.config; -import net.lab1024.sa.common.common.domain.SystemEnvironment; -import net.lab1024.sa.common.common.enumeration.SystemEnvironmentEnum; +import net.lab1024.sa.common.common.domain.SystemEnv; +import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; import net.lab1024.sa.common.common.util.SmartEnumUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -21,7 +21,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * @Copyright 1024创新实验室 （ https://1024lab.net ） */ @Configuration -public class SystemEnvironmentConfig implements Condition { +public class SystemEnvConfig implements Condition { @Value("${spring.profiles.active}") private String systemEnvironment; @@ -32,18 +32,18 @@ public class SystemEnvironmentConfig implements Condition { @Override public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { String property = conditionContext.getEnvironment().getProperty("spring.profiles.active"); - return StringUtils.isNotBlank(property) && !SystemEnvironmentEnum.PROD.equalsValue(property); + return StringUtils.isNotBlank(property) && !SystemEnvEnum.PROD.equalsValue(property); } @Bean - public SystemEnvironment initEnvironment() { - SystemEnvironmentEnum currentEnvironment = SmartEnumUtil.getEnumByValue(systemEnvironment, SystemEnvironmentEnum.class); - if (currentEnvironment == null) { + public SystemEnv initEnvironment() { + SystemEnvEnum currentEnv = SmartEnumUtil.getEnumByValue(systemEnvironment, SystemEnvEnum.class); + if (currentEnv == null) { throw new ExceptionInInitializerError("无法获取当前环境！请在 application.yaml 配置参数：spring.profiles.active"); } if (StringUtils.isBlank(projectName)) { throw new ExceptionInInitializerError("无法获取当前项目名称！请在 application.yaml 配置参数：project.name"); } - return new SystemEnvironment(currentEnvironment == SystemEnvironmentEnum.PROD, projectName, currentEnvironment); + return new SystemEnv(currentEnv == SystemEnvEnum.PROD, projectName, currentEnv); } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java index fa3e1bb9..25adf2ba 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java @@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.common.common.code.SystemErrorCode; import net.lab1024.sa.common.common.code.UserErrorCode; import net.lab1024.sa.common.common.domain.ResponseDTO; -import net.lab1024.sa.common.common.domain.SystemEnvironment; +import net.lab1024.sa.common.common.domain.SystemEnv; import net.lab1024.sa.common.common.exception.BusinessException; import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; public class GlobalExceptionHandler { @Autowired - private SystemEnvironment systemEnvironment; + private SystemEnv systemEnvironment; /** * json 格式错误 缺少请求体 diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/captcha/CaptchaService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/captcha/CaptchaService.java index 36042c67..8911c7c7 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/captcha/CaptchaService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/captcha/CaptchaService.java @@ -2,10 +2,9 @@ package net.lab1024.sa.common.module.support.captcha; import com.google.code.kaptcha.impl.DefaultKaptcha; import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.common.common.code.UserErrorCode; import net.lab1024.sa.common.common.constant.StringConst; import net.lab1024.sa.common.common.domain.ResponseDTO; -import net.lab1024.sa.common.common.domain.SystemEnvironment; +import net.lab1024.sa.common.common.domain.SystemEnv; import net.lab1024.sa.common.common.exception.BusinessException; import net.lab1024.sa.common.constant.RedisKeyConst; import net.lab1024.sa.common.module.support.captcha.domain.CaptchaForm; @@ -43,7 +42,7 @@ public class CaptchaService { @Autowired private DefaultKaptcha defaultKaptcha; @Autowired - private SystemEnvironment systemEnvironment; + private SystemEnv systemEnvironment; @Autowired private RedisService redisService; diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/redis/RedisService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/redis/RedisService.java index f99f29ef..3c309499 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/redis/RedisService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/redis/RedisService.java @@ -1,8 +1,8 @@ package net.lab1024.sa.common.module.support.redis; import com.alibaba.fastjson.JSON; -import net.lab1024.sa.common.common.domain.SystemEnvironment; -import net.lab1024.sa.common.common.enumeration.SystemEnvironmentEnum; +import net.lab1024.sa.common.common.domain.SystemEnv; +import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; import net.lab1024.sa.common.common.util.SmartStringUtil; import net.lab1024.sa.common.constant.RedisKeyConst; import org.slf4j.Logger; @@ -52,7 +52,7 @@ public class RedisService { private SetOperations redisSetOperations; @Autowired - private SystemEnvironment systemEnvironment; + private SystemEnv systemEnvironment; /** @@ -62,7 +62,7 @@ public class RedisService { * @return */ public String generateRedisKey(String prefix, String key) { - SystemEnvironmentEnum currentEnvironment = systemEnvironment.getCurrentEnvironment(); + SystemEnvEnum currentEnvironment = systemEnvironment.getCurrentEnv(); return systemEnvironment.getProjectName() + RedisKeyConst.SEPARATOR + currentEnvironment.getValue() + RedisKeyConst.SEPARATOR + prefix + key; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java index 3a19712a..40953676 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java @@ -46,7 +46,7 @@ public class TokenService { SaLoginModel loginModel = new SaLoginModel(); // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 loginModel.setDevice(String.valueOf(loginDeviceEnum.getDesc())); - // 扩展参数 + // 扩展参数 只在 jwt 模式下 有效 loginModel.setExtra(EXTRA_KEY_USER_NAME, userName); loginModel.setExtra(EXTRA_KEY_USER_TYPE, userTypeEnum.getValue()); From 54d8d9489a9098d8f61ffcf1ddc97795807c7b88 Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Thu, 13 Jul 2023 18:54:48 +0800 Subject: [PATCH 04/11] sa-token --- .../sa/admin/config/SaTokenConfig.java | 43 ++++++ .../admin/interceptor/AdminInterceptor.java | 42 ++---- .../login/controller/LoginController.java | 9 ++ .../sa/common/common/code/UserErrorCode.java | 2 +- .../sa/common/common/domain/RequestUrlVO.java | 3 - .../interceptor/AbstractInterceptor.java | 126 ++++++++---------- .../lab1024/sa/common/config/MvcConfig.java | 6 +- .../lab1024/sa/common/config/UrlConfig.java | 126 ++++++++++++++++++ ...enConfig.java => SaTokenCommonConfig.java} | 2 +- .../handler/GlobalExceptionHandler.java | 41 +++--- .../module/support/token/TokenService.java | 4 +- 11 files changed, 268 insertions(+), 136 deletions(-) create mode 100644 smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java create mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java rename smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/{SaTokenConfig.java => SaTokenCommonConfig.java} (94%) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java new file mode 100644 index 00000000..fa5b8a6a --- /dev/null +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java @@ -0,0 +1,43 @@ +package net.lab1024.sa.admin.config; + +import cn.dev33.satoken.interceptor.SaInterceptor; +import cn.dev33.satoken.router.SaRouter; +import cn.dev33.satoken.stp.StpUtil; +import net.lab1024.sa.common.config.UrlConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; + +/** + * sa-token 配置 + * + * @author Turbolisten + * @date 2023/7/13 16:57 + */ +@Configuration +public class SaTokenConfig implements WebMvcConfigurer { + + /** + * 注册 Sa-Token 拦截器，定义详细认证规则 + * + * @param registry + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + SaInterceptor interceptor = new SaInterceptor(handler -> { + + // 每个路由 都做为一个权限点 + UrlConfig.URL_LIST.forEach(url -> SaRouter.match(url, r -> StpUtil.checkPermission(url))); + + }); + // 关闭注解鉴权 只做路由拦截校验 + interceptor.isAnnotation(false); + registry.addInterceptor(interceptor).addPathPatterns("/**"); + } + + +} diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java index 59ba1fd1..25a52cb4 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java @@ -2,17 +2,17 @@ package net.lab1024.sa.admin.interceptor; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.NumberWithFormat; +import com.google.common.collect.Lists; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; import net.lab1024.sa.common.common.util.SmartEnumUtil; -import net.lab1024.sa.common.handler.GlobalExceptionHandler; import net.lab1024.sa.common.module.support.token.TokenService; -import org.apache.commons.lang3.math.NumberUtils; import org.springframework.context.annotation.Configuration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * admin 拦截器 @@ -24,30 +24,22 @@ import javax.servlet.http.HttpServletResponse; public class AdminInterceptor extends AbstractInterceptor { /** - * 开发环境 方便调试 默认 user id 1 - * 可以根据id 查询实际用户数据 + * 配置拦截路径 * - * @param token + * @return */ @Override - public RequestUser getDevRequestUser(String token) { - long userId = NumberUtils.toLong(token, 1L); - RequestUser requestUser = new RequestUser(); - requestUser.setUserId(userId); - requestUser.setUserName("dev"); - requestUser.setUserType(UserTypeEnum.ADMIN_EMPLOYEE); - return requestUser; + public List pathPatterns() { + return Lists.newArrayList("/**"); } @Override - public RequestUser checkTokenAndGetUser() { - /** - * 检验当前会话是否已经登录, 如果未登录，则抛出异常：`NotLoginException` - * 已在全局异常处理 - * @see GlobalExceptionHandler#handlerNotLoginException - */ + public void checkSaToken() { StpUtil.checkLogin(); + } + @Override + public RequestUser getRequestUser() { // 获取额外数据 Integer userType = ((NumberWithFormat) StpUtil.getExtra(TokenService.EXTRA_KEY_USER_TYPE)).intValue(); UserTypeEnum userTypeEnum = SmartEnumUtil.getEnumByValue(userType, UserTypeEnum.class); @@ -62,25 +54,13 @@ public class AdminInterceptor extends AbstractInterceptor { return requestUser; } - /** - * 配置拦截路径 - * - * @return - */ - @Override - public String[] pathPatterns() { - return new String[]{"/**"}; - } - @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { boolean isHandle = super.preHandle(request, response, handler); if (!isHandle) { return false; } - - // TODO listen 校验权限 - + // 如有业务需处理 写在此处 return true; } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java index ad945a02..b616ba6d 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.system.login.controller; +import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.extra.servlet.ServletUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -12,6 +13,7 @@ import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.module.support.captcha.domain.CaptchaVO; +import org.checkerframework.checker.units.qual.N; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -85,4 +87,11 @@ public class LoginController { return loginService.getCaptcha(); } + // TODO listen + @NoNeedLogin + @ApiOperation("测试权限 @listen") + @GetMapping("/listen/test") + public ResponseDTO test() { + return ResponseDTO.ok(); + } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java index 39221e87..7c71de96 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/code/UserErrorCode.java @@ -24,7 +24,7 @@ public enum UserErrorCode implements ErrorCode { REPEAT_SUBMIT(30004, "亲~您操作的太快了，请稍等下再操作~"), - NO_PERMISSION(30005, "对不起，您无法访问此资源哦~"), + NO_PERMISSION(30005, "对不起，您无法访问此内容哦~"), DEVELOPING(30006, "系統正在紧急开发中，敬请期待~"), diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUrlVO.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUrlVO.java index 3b8e0be3..3bdca030 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUrlVO.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUrlVO.java @@ -18,9 +18,6 @@ public class RequestUrlVO { @ApiModelProperty("注释说明") private String comment; - @ApiModelProperty("controller.method") - private String name; - @ApiModelProperty("url") private String url; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java index 3b32b623..45f2ba39 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java @@ -1,22 +1,17 @@ package net.lab1024.sa.common.common.interceptor; +import cn.dev33.satoken.exception.NotLoginException; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import net.lab1024.sa.common.common.annoation.NoNeedLogin; import net.lab1024.sa.common.common.code.UserErrorCode; -import net.lab1024.sa.common.common.constant.RequestHeaderConst; -import net.lab1024.sa.common.common.constant.StringConst; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; -import net.lab1024.sa.common.common.domain.SystemEnv; -import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; import net.lab1024.sa.common.common.util.SmartRequestUtil; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; -import org.springframework.util.CollectionUtils; +import org.springframework.http.MediaType; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; @@ -24,50 +19,42 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import java.util.Objects; /** * 抽象拦截器 - * 如果有额外的拦截处理 可以继承此类 + * 只校验了登录处理 + * 自定义的拦截器 可以继承此类 * - * @Author 1024创新实验室: 罗伊 - * @Date 2021-10-09 20:56:14 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） + * @author huke + * @date 2023-07-12 21:56:14 */ public abstract class AbstractInterceptor implements HandlerInterceptor { - - @Autowired - private SystemEnv systemEnv; + /** + * 校验 token + */ + public abstract void checkSaToken(); /** - * Token获取用户信息 + * Token 获取当前请求用户信息 * * @return */ - public abstract RequestUser checkTokenAndGetUser(); - - /** - * 获取 dev 开发用户 - * - * @param token - * @return - */ - public abstract RequestUser getDevRequestUser(String token); + public abstract RequestUser getRequestUser(); /** * 拦截路径 * * @return */ - public abstract String[] pathPatterns(); + public abstract List pathPatterns(); /** * 忽略的url集合 * * @return */ - protected List getIgnoreUrlList() { + public List getIgnoreUrlList() { List ignoreUrlList = Lists.newArrayList(); ignoreUrlList.add("/swagger-ui.html"); ignoreUrlList.add("/swagger-resources/**"); @@ -78,7 +65,7 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { } /** - * 拦截服务器端响应处理ajax请求返回结果 + * 拦截处理登录 token * * @param request * @param response @@ -89,61 +76,62 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { // OPTIONS请求直接return - if (HttpMethod.OPTIONS.toString().equals(request.getMethod())) { + if (StringUtils.equalsIgnoreCase(HttpMethod.OPTIONS.name(), request.getMethod())) { response.setStatus(HttpStatus.NO_CONTENT.value()); return false; } - boolean isHandler = handler instanceof HandlerMethod; if (!isHandler) { return true; } - //放行的Uri前缀 - String uri = request.getRequestURI(); - String contextPath = request.getContextPath(); - String target = uri.replaceFirst(contextPath, StringConst.EMPTY); - if (this.contain(this.getIgnoreUrlList(), target)) { + // 校验 token 获取当前请求用户信息 + ResponseDTO res = this.checkTokenAndGetUser(); + if (res.getOk()) { + SmartRequestUtil.setUser(res.getData()); return true; } - // 检查是否包含 token - String xRequestToken = request.getParameter(RequestHeaderConst.TOKEN); - String xHeaderToken = request.getHeader(RequestHeaderConst.TOKEN); - String xAccessToken = StringUtils.isNotBlank(xRequestToken) ? xRequestToken : xHeaderToken; - // 包含token 则获取用户信息 并保存 - if (StringUtils.isNotBlank(xAccessToken)) { - // TODO listen 待处理有token 已失效的情况 - RequestUser requestUser; - // 开发环境 token 处理 不需要的话 可以去掉 - if (SystemEnvEnum.DEV == systemEnv.getCurrentEnv() && NumberUtils.isDigits(xAccessToken)) { - requestUser = this.getDevRequestUser(xAccessToken); - } else { - requestUser = this.checkTokenAndGetUser(); - } - SmartRequestUtil.setUser(requestUser); - } - - // 是否需要登录 + // 不需要登录 NoNeedLogin noNeedLogin = ((HandlerMethod) handler).getMethodAnnotation(NoNeedLogin.class); if (null != noNeedLogin) { return true; } - if (StringUtils.isBlank(xAccessToken)) { - this.outputResult(response, ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID)); - return false; - } - return true; + this.outputResult(response, res); + return false; } - public Boolean contain(List ignores, String uri) { - if (CollectionUtils.isEmpty(ignores)) { - return false; - } - for (String ignoreUrl : ignores) { - if (uri.startsWith(ignoreUrl)) { - return true; + /** + * 校验 sa token + * 判断 sa-token 未登录场景值 + * 自己根据业务在下面 switch 添加分支判断 + * NotLoginException.NOT_TOKEN 无token + * NotLoginException.INVALID_TOKEN token无效 + * NotLoginException.TOKEN_TIMEOUT token过期 + * NotLoginException.NO_PREFIX token缺少前缀 + * NotLoginException.KICK_OUT 已被踢下线 + * NotLoginException.TOKEN_FREEZE 已被冻结 + *

+ * ps :之所以没有在全局异常里处理 是因为后续还有操作 + */ + public ResponseDTO checkTokenAndGetUser() { + try { + /** + * sa-token 会从当前请求header or body 中获取token + * 检验当前会话是否已经登录, 如果未登录，则抛出异常：`NotLoginException` + */ + this.checkSaToken(); + } catch (NotLoginException e) { + switch (e.getType()) { + case NotLoginException.BE_REPLACED: + // token 已被顶下线 + return ResponseDTO.error(UserErrorCode.LOGIN_FROM_OTHER); + // case NotLoginException.TOKEN_FREEZE: + // case NotLoginException.KICK_OUT: + default: + return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); } } - return false; + RequestUser requestUser = this.getRequestUser(); + return ResponseDTO.ok(requestUser); } /** @@ -155,13 +143,13 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { */ private void outputResult(HttpServletResponse response, ResponseDTO responseDTO) throws IOException { String msg = JSONObject.toJSONString(responseDTO); - response.setContentType("application/json;charset=UTF-8"); + response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); response.getWriter().write(msg); response.flushBuffer(); } @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { SmartRequestUtil.remove(); } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java index 32956ada..0b5f2ce3 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java @@ -27,12 +27,12 @@ public class MvcConfig implements WebMvcConfigurer { private List interceptorList; @Override - public void addInterceptors (InterceptorRegistry registry) { + public void addInterceptors(InterceptorRegistry registry) { if (CollectionUtils.isEmpty(interceptorList)) { return; } - interceptorList.forEach(e->{ - registry.addInterceptor(e).addPathPatterns(e.pathPatterns()); + interceptorList.forEach(e -> { + registry.addInterceptor(e).addPathPatterns(e.pathPatterns()).excludePathPatterns(e.getIgnoreUrlList()); }); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java new file mode 100644 index 00000000..7c8037c8 --- /dev/null +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java @@ -0,0 +1,126 @@ +package net.lab1024.sa.common.config; + +import cn.dev33.satoken.annotation.SaIgnore; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import net.lab1024.sa.common.common.annoation.NoNeedLogin; +import net.lab1024.sa.common.common.domain.RequestUrlVO; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.mvc.method.RequestMappingInfo; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; + +import java.lang.reflect.Method; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * description + * + * @author Turbolisten + * @date 2023/7/13 17:42 + */ +@Slf4j +@Configuration +public class UrlConfig { + + @Autowired + private RequestMappingHandlerMapping requestMappingHandlerMapping; + + public static List URL_LIST = Lists.newArrayList(); + + /** + * 获取每个方法的请求路径 + * + * @return + */ + @Bean + public Map> methodUrlMap() { + Map> methodUrlMap = Maps.newHashMap(); + // 获取url与类和方法的对应信息 + Map map = requestMappingHandlerMapping.getHandlerMethods(); + for (Map.Entry entry : map.entrySet()) { + RequestMappingInfo requestMappingInfo = entry.getKey(); + Set urls = requestMappingInfo.getPatternsCondition().getPatterns(); + if (CollectionUtils.isEmpty(urls)) { + continue; + } + HandlerMethod handlerMethod = entry.getValue(); + methodUrlMap.put(handlerMethod.getMethod(), urls); + } + return methodUrlMap; + } + + /** + * 需要进行url权限校验的方法 + * + * @param methodUrlMap + * @return + */ + @Bean + public List authUrl(Map> methodUrlMap) { + List authUrlList = Lists.newArrayList(); + for (Map.Entry> entry : methodUrlMap.entrySet()) { + Method method = entry.getKey(); + // 忽略权限 + SaIgnore ignore = method.getAnnotation(SaIgnore.class); + if (null != ignore) { + continue; + } + List requestUrlList = this.buildRequestUrl(method, entry.getValue()); + authUrlList.addAll(requestUrlList); + } + log.info("需要权限校验的URL：{}", authUrlList.stream().map(RequestUrlVO::getUrl).collect(Collectors.toList())); + return authUrlList; + } + + private List buildRequestUrl(Method method, Set urlSet) { + List requestUrlList = Lists.newArrayList(); + if (CollectionUtils.isEmpty(urlSet)) { + return requestUrlList; + } + // swagger api 说明 + String methodComment = null; + ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); + if (apiOperation != null) { + methodComment = apiOperation.value(); + } + + for (String url : urlSet) { + RequestUrlVO requestUrlVO = new RequestUrlVO(); + requestUrlVO.setUrl(url); + requestUrlVO.setComment(methodComment); + requestUrlList.add(requestUrlVO); + + URL_LIST.add(url); + } + return requestUrlList; + } + + /** + * 获取无需登录可以匿名访问的url信息 + * + * @return + */ + @Bean + public List noNeedLoginUrlList(Map> methodUrlMap) { + List noNeedLoginUrlList = Lists.newArrayList(); + for (Map.Entry> entry : methodUrlMap.entrySet()) { + Method method = entry.getKey(); + NoNeedLogin noNeedLogin = method.getAnnotation(NoNeedLogin.class); + if (null == noNeedLogin) { + continue; + } + noNeedLoginUrlList.addAll(entry.getValue()); + } + log.info("不需要登录的URL：{}", noNeedLoginUrlList); + return noNeedLoginUrlList; + } +} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java similarity index 94% rename from smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java rename to smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java index 4475d0ef..f229d8f0 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; * @date: 2023/7/12 20:46 */ @Configuration -public class SaTokenConfig { +public class SaTokenCommonConfig { /** * 整合 jwt diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java index 25adf2ba..3f60effe 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/handler/GlobalExceptionHandler.java @@ -1,11 +1,12 @@ package net.lab1024.sa.common.handler; -import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.exception.NotPermissionException; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.common.common.code.SystemErrorCode; import net.lab1024.sa.common.common.code.UserErrorCode; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.domain.SystemEnv; +import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; import net.lab1024.sa.common.common.exception.BusinessException; import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,7 @@ import java.util.stream.Collectors; public class GlobalExceptionHandler { @Autowired - private SystemEnv systemEnvironment; + private SystemEnv systemEnv; /** * json 格式错误 缺少请求体 @@ -45,7 +46,7 @@ public class GlobalExceptionHandler { @ResponseBody @ExceptionHandler({HttpMessageNotReadableException.class}) public ResponseDTO jsonFormatExceptionHandler(Exception e) { - if (!systemEnvironment.isProd()) { + if (!systemEnv.isProd()) { log.error("全局JSON格式错误异常,URL:{}", getCurrentRequestUrl(), e); } return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "参数JSON格式错误"); @@ -57,7 +58,7 @@ public class GlobalExceptionHandler { @ResponseBody @ExceptionHandler({TypeMismatchException.class, BindException.class}) public ResponseDTO paramExceptionHandler(Exception e) { - if (!systemEnvironment.isProd()) { + if (!systemEnv.isProd()) { log.error("全局参数异常,URL:{}", getCurrentRequestUrl(), e); } @@ -83,38 +84,26 @@ public class GlobalExceptionHandler { @ResponseBody @ExceptionHandler(BusinessException.class) public ResponseDTO businessExceptionHandler(BusinessException e) { - if (!systemEnvironment.isProd()) { + if (!systemEnv.isProd()) { log.error("全局业务异常,URL:{}", getCurrentRequestUrl(), e); } return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, e.getMessage()); } /** - * sa-token 登录异常处理 + * sa-token 权限异常处理 * - * @param nle + * @param e * @return - * @throws Exception */ @ResponseBody - @ExceptionHandler(NotLoginException.class) - public ResponseDTO handlerNotLoginException(NotLoginException nle) { - /** - * 判断场景值 自己根据业务在下面 switch 添加分支判断 - * NotLoginException.NOT_TOKEN 无token - * NotLoginException.INVALID_TOKEN token无效 - * NotLoginException.TOKEN_TIMEOUT token过期 - * NotLoginException.NO_PREFIX token缺少前缀 - * NotLoginException.KICK_OUT 已被踢下线 - * NotLoginException.TOKEN_FREEZE 已被冻结 - */ - switch (nle.getType()) { - case NotLoginException.BE_REPLACED: - // token 已被顶下线 - return ResponseDTO.error(UserErrorCode.LOGIN_FROM_OTHER); - default: - return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); + @ExceptionHandler(NotPermissionException.class) + public ResponseDTO permissionException(NotPermissionException e) { + // 开发环境 方便调试 + if (SystemEnvEnum.PROD != systemEnv.getCurrentEnv()) { + return ResponseDTO.error(UserErrorCode.NO_PERMISSION, e.getMessage()); } + return ResponseDTO.error(UserErrorCode.NO_PERMISSION); } /** @@ -127,7 +116,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(Throwable.class) public ResponseDTO errorHandler(Throwable e) { log.error("捕获全局异常,URL:{}", getCurrentRequestUrl(), e); - return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, systemEnvironment.isProd() ? null : e.toString()); + return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, systemEnv.isProd() ? null : e.toString()); } /** diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java index 40953676..65e5c30c 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java @@ -56,11 +56,11 @@ public class TokenService { } public static String generateLoginId(Long userId, UserTypeEnum userType) { - return userType.getValue() + StringConst.UNDERLINE + userId; + return userType.getValue() + StringConst.HORIZONTAL + userId; } public static Long getUserId(String loginId) { - return Long.valueOf(loginId.substring(loginId.indexOf(StringConst.UNDERLINE) + 1)); + return Long.valueOf(loginId.substring(loginId.indexOf(StringConst.HORIZONTAL) + 1)); } /** From ac6921a2782cad5cde34f25d2fd9b8b7d2674f1b Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Thu, 13 Jul 2023 20:15:41 +0800 Subject: [PATCH 05/11] sa-token --- .../sa/admin/config/SaTokenConfig.java | 35 +++++++------------ .../service/EmployeePermissionService.java | 27 +++++++++++++- .../login/controller/LoginController.java | 18 ++-------- .../system/login/service/LoginService.java | 13 +++++-- .../system/menu/service/MenuService.java | 8 +++-- .../system/role/service/RoleMenuService.java | 6 ++-- .../interceptor/AbstractInterceptor.java | 1 - .../lab1024/sa/common/config/MvcConfig.java | 21 ++++++++--- .../lab1024/sa/common/config/UrlConfig.java | 13 ++++--- .../module/support/token/TokenService.java | 13 +++---- .../src/main/resources/dev/sa-common.yaml | 12 +++++-- 11 files changed, 102 insertions(+), 65 deletions(-) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java index fa5b8a6a..598a6530 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java @@ -4,13 +4,8 @@ import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; import net.lab1024.sa.common.config.UrlConfig; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; /** * sa-token 配置 @@ -19,25 +14,21 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl * @date 2023/7/13 16:57 */ @Configuration -public class SaTokenConfig implements WebMvcConfigurer { +public class SaTokenConfig { /** - * 注册 Sa-Token 拦截器，定义详细认证规则 - * - * @param registry + * 定义 Sa-Token 拦截器，定义详细认证规则 */ - @Override - public void addInterceptors(InterceptorRegistry registry) { - SaInterceptor interceptor = new SaInterceptor(handler -> { - - // 每个路由 都做为一个权限点 - UrlConfig.URL_LIST.forEach(url -> SaRouter.match(url, r -> StpUtil.checkPermission(url))); - - }); + @Bean + public SaInterceptor saInterceptor() { // 关闭注解鉴权 只做路由拦截校验 - interceptor.isAnnotation(false); - registry.addInterceptor(interceptor).addPathPatterns("/**"); + return new SaInterceptor(handler -> { + /** + * 每个路由 都做为一个权限点 + * TODO listen from定义的api + * from menu数据表已选择的api + */ + UrlConfig.AUTH_URL_LIST.forEach(url -> SaRouter.match(url, r -> StpUtil.checkPermission(url))); + }).isAnnotation(false); } - - } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java index 6457edd0..d8ef44f3 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java @@ -1,12 +1,18 @@ package net.lab1024.sa.admin.module.system.employee.service; +import cn.dev33.satoken.stp.StpInterface; +import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao; +import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity; +import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum; import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO; import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService; import net.lab1024.sa.admin.module.system.role.service.RoleMenuService; +import net.lab1024.sa.common.module.support.token.TokenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** * 员工权限校验 @@ -18,7 +24,7 @@ import java.util.List; * @Copyright 1024创新实验室 （ https://1024lab.net ） */ @Service -public class EmployeePermissionService { +public class EmployeePermissionService implements StpInterface { @Autowired private RoleEmployeeService roleEmployeeService; @@ -26,6 +32,9 @@ public class EmployeePermissionService { @Autowired private RoleMenuService roleMenuService; + @Autowired + private EmployeeDao employeeDao; + /** * 查询用户拥有的前端菜单项 用于登陆返回 前端动态路由配置 * @@ -37,4 +46,20 @@ public class EmployeePermissionService { return roleMenuService.getMenuList(roleIdList, administratorFlag); } + @Override + public List getPermissionList(Object loginId, String loginType) { + Long employeeId = TokenService.getUserId((String) loginId); + + // TODO listen 待做权限缓存 + EmployeeEntity employeeEntity = employeeDao.selectById(employeeId); + List menuList = this.getEmployeeMenuAndPointsList(employeeId, employeeEntity.getAdministratorFlag()); + return menuList.stream() + .filter(e -> MenuTypeEnum.POINTS.equalsValue(e.getMenuType())) + .map(MenuVO::getApiPerms).distinct().collect(Collectors.toList()); + } + + @Override + public List getRoleList(Object loginId, String loginType) { + return null; + } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java index b616ba6d..5a7fd6e1 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.login.controller; -import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.extra.servlet.ServletUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,7 +12,6 @@ import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.domain.ResponseDTO; import net.lab1024.sa.common.common.util.SmartRequestUtil; import net.lab1024.sa.common.module.support.captcha.domain.CaptchaVO; -import org.checkerframework.checker.units.qual.N; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -58,20 +56,8 @@ public class LoginController { @ApiOperation("获取登录结果信息 @author 卓大") @GetMapping("/login/getLoginInfo") public ResponseDTO getLoginInfo() { - /* Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication == null) { - return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); - } - - Object principal = authentication.getPrincipal(); - if (!(principal instanceof LoginEmployeeDetail)) { - return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); - } - - LoginEmployeeDetail loginEmployeeDetail = (LoginEmployeeDetail) authentication.getPrincipal(); - loginEmployeeDetail.setLoginPassword(null); - return ResponseDTO.ok(loginEmployeeDetail);*/ - return ResponseDTO.ok(); + LoginEmployeeDetail loginEmployeeDetail = loginService.getLoginUserDetailCache(SmartRequestUtil.getUserId()); + return ResponseDTO.ok(loginEmployeeDetail); } @ApiOperation("退出登录 @author 卓大") diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index 6dc36ff3..4460d349 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/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 checkCaptcha = captchaService.checkCaptcha(loginForm); if (!checkCaptcha.getOk()) { - // TODO listen 待放开 return ResponseDTO.error(checkCaptcha); + // TODO listen 待放开 return ResponseDTO.error(checkCaptcha); } /** @@ -160,7 +160,7 @@ public class LoginService { List menuAndPointsList = employeePermissionService.getEmployeeMenuAndPointsList(employeeEntity.getEmployeeId(), employeeEntity.getAdministratorFlag()); //前端菜单 loginEmployeeDetail.setMenuList(menuAndPointsList); - //后端权限 + // TODO listen 原先为什么返回权限 // loginEmployeeDetail.setAuthorities(employeePermissionService.buildAuthorities(menuAndPointsList)); //上次登录信息 @@ -195,6 +195,15 @@ public class LoginService { loginLogService.log(loginEntity); } + /** + * 查询用户信息缓存 + * + * @param requestUserId + */ + public LoginEmployeeDetail getLoginUserDetailCache(Long requestUserId) { + return loginUserDetailCache.get(requestUserId); + } + /** * 移除用户信息缓存 diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java index d480eaab..4b3fa693 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java @@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -39,6 +38,10 @@ public class MenuService { @Autowired private MenuDao menuDao; + + @Autowired + private List authUrl; + /** * 添加菜单 * @@ -281,8 +284,7 @@ public class MenuService { * @return */ public ResponseDTO> getAuthUrl() { - // TODO listen - return ResponseDTO.ok(Collections.emptyList()); + return ResponseDTO.ok(authUrl); } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java index e93d106a..a63858d2 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java @@ -77,9 +77,9 @@ public class RoleMenuService { * @param roleIdList * @return */ - public List getMenuList(List roleIdList, Boolean administratorFlag) { - //管理员返回所有菜单 - if(administratorFlag){ + public List getMenuList(List roleIdList, Boolean adminFlag) { + // 超管返回所有菜单 + if(adminFlag){ List menuEntityList = roleMenuDao.selectMenuListByRoleIdList(Lists.newArrayList(), false); return SmartBeanUtil.copyList(menuEntityList, MenuVO.class); } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java index 45f2ba39..3d0bb442 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java @@ -19,7 +19,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Objects; /** * 抽象拦截器 diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java index 0b5f2ce3..c2bfb480 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java @@ -1,5 +1,6 @@ package net.lab1024.sa.common.config; +import cn.dev33.satoken.interceptor.SaInterceptor; import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -26,14 +27,24 @@ public class MvcConfig implements WebMvcConfigurer { @Autowired(required = false) private List interceptorList; + @Autowired(required = false) + private List saInterceptorList; + @Override public void addInterceptors(InterceptorRegistry registry) { - if (CollectionUtils.isEmpty(interceptorList)) { - return; + // 先注册 登录拦截器 + if (CollectionUtils.isNotEmpty(interceptorList)) { + interceptorList.forEach(e -> { + registry.addInterceptor(e).addPathPatterns(e.pathPatterns()).excludePathPatterns(e.getIgnoreUrlList()); + }); + } + + // 后注册 sa-token 权限拦截器 不需要可以删除 + if (CollectionUtils.isNotEmpty(saInterceptorList)) { + saInterceptorList.forEach(i -> { + registry.addInterceptor(i).addPathPatterns("/**"); + }); } - interceptorList.forEach(e -> { - registry.addInterceptor(e).addPathPatterns(e.pathPatterns()).excludePathPatterns(e.getIgnoreUrlList()); - }); } @Override diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java index 7c8037c8..8de7ed91 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java @@ -34,7 +34,7 @@ public class UrlConfig { @Autowired private RequestMappingHandlerMapping requestMappingHandlerMapping; - public static List URL_LIST = Lists.newArrayList(); + public static List AUTH_URL_LIST = Lists.newArrayList(); /** * 获取每个方法的请求路径 @@ -74,8 +74,15 @@ public class UrlConfig { if (null != ignore) { continue; } - List requestUrlList = this.buildRequestUrl(method, entry.getValue()); + NoNeedLogin noNeedLogin = method.getAnnotation(NoNeedLogin.class); + if (null != noNeedLogin) { + continue; + } + Set urlSet = entry.getValue(); + List requestUrlList = this.buildRequestUrl(method, urlSet); authUrlList.addAll(requestUrlList); + + AUTH_URL_LIST.addAll(urlSet); } log.info("需要权限校验的URL：{}", authUrlList.stream().map(RequestUrlVO::getUrl).collect(Collectors.toList())); return authUrlList; @@ -98,8 +105,6 @@ public class UrlConfig { requestUrlVO.setUrl(url); requestUrlVO.setComment(methodComment); requestUrlList.add(requestUrlVO); - - URL_LIST.add(url); } return requestUrlList; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java index 65e5c30c..4847e0de 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java @@ -9,13 +9,10 @@ import org.springframework.stereotype.Component; import java.util.List; /** - * 与用户token的相关的服务 + * 用户token 相关服务 * - * @Author 1024创新实验室-主任: 卓大 - * @Date 2021-11-29 19:48:35 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 （ https://1024lab.net ） + * @author listen + * @date 2023-07-12 22:48:35 */ @Component public class TokenService { @@ -63,6 +60,10 @@ public class TokenService { return Long.valueOf(loginId.substring(loginId.indexOf(StringConst.HORIZONTAL) + 1)); } + public static Integer getUserType(String loginId) { + return Integer.valueOf(loginId.substring(0, loginId.indexOf(StringConst.HORIZONTAL))); + } + /** * 退出登录 注销 */ diff --git a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml index 047a15cd..a0d4d566 100644 --- a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml +++ b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml @@ -131,12 +131,20 @@ sa-token: # token 有效期（单位：秒） 默认30天，-1 代表永久有效 timeout: 2592000 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 - active-timeout: 28800 + active-timeout: -1 # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） is-concurrent: false # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）(jwt模式下恒false) is-share: false # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）(jwt模式下无用) token-style: simple-uuid + # 是否打开自动续签 （如果此值为true，框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作） + auto-renew: true # 是否输出操作日志 - is-log: true \ No newline at end of file + is-log: true + # 日志等级（trace、debug、info、warn、error、fatal） + log-level: debug + # 启动时的字符画打印 + is-print: false + # 是否从cookie读取token + is-read-cookie: false \ No newline at end of file From 7de2627feed35babd3016c664ac4b07b83b81fac Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Fri, 21 Jul 2023 08:32:56 +0800 Subject: [PATCH 06/11] sa-token update --- smart-admin-api/pom.xml | 7 -- .../sa/admin/config/SaTokenConfig.java | 17 ++-- .../admin/interceptor/AdminInterceptor.java | 53 +++++----- .../service/EmployeePermissionService.java | 87 ++++++++++++++--- .../login/controller/LoginController.java | 2 +- .../system/menu/constant/MenuTypeEnum.java | 24 ++--- .../system/menu/service/MenuCacheService.java | 52 ++++++++++ .../system/menu/service/MenuService.java | 16 +++- smart-admin-api/sa-common/pom.xml | 5 - .../common/common/constant/StringConst.java | 5 + .../sa/common/common/domain/RequestUser.java | 6 -- .../common/enumeration/SystemEnvEnum.java | 10 +- .../common/enumeration/UserTypeEnum.java | 26 ++--- .../interceptor/AbstractInterceptor.java | 96 +++++++++++++++---- .../common/common/util/SmartRequestUtil.java | 27 +++--- .../lab1024/sa/common/config/MvcConfig.java | 7 +- .../sa/common/config/SwaggerConfig.java | 2 +- .../lab1024/sa/common/config/UrlConfig.java | 4 - .../config/satoken/SaTokenCommonConfig.java | 29 ------ .../module/support/token/TokenService.java | 18 ++-- 20 files changed, 317 insertions(+), 176 deletions(-) create mode 100644 smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java delete mode 100644 smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java diff --git a/smart-admin-api/pom.xml b/smart-admin-api/pom.xml index 0faa59f4..37e2f4ae 100644 --- a/smart-admin-api/pom.xml +++ b/smart-admin-api/pom.xml @@ -125,13 +125,6 @@ ${sa-token-version} - - - cn.dev33 - sa-token-jwt - 1.35.0.RC - - diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java index 598a6530..0df62f98 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SaTokenConfig.java @@ -3,10 +3,13 @@ package net.lab1024.sa.admin.config; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; -import net.lab1024.sa.common.config.UrlConfig; +import net.lab1024.sa.admin.module.system.menu.service.MenuCacheService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.util.List; + /** * sa-token 配置 * @@ -16,6 +19,9 @@ import org.springframework.context.annotation.Configuration; @Configuration public class SaTokenConfig { + @Autowired + private MenuCacheService menuService; + /** * 定义 Sa-Token 拦截器，定义详细认证规则 */ @@ -23,12 +29,9 @@ public class SaTokenConfig { public SaInterceptor saInterceptor() { // 关闭注解鉴权 只做路由拦截校验 return new SaInterceptor(handler -> { - /** - * 每个路由 都做为一个权限点 - * TODO listen from定义的api - * from menu数据表已选择的api - */ - UrlConfig.AUTH_URL_LIST.forEach(url -> SaRouter.match(url, r -> StpUtil.checkPermission(url))); + // 查询数据表中 需要校验权限的url + List urlList = menuService.queryNeedCheckPermissionsUrl(); + urlList.forEach(url -> SaRouter.match(url, r -> StpUtil.checkPermission(url))); }).isAnnotation(false); } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java index 25a52cb4..6ea73889 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java @@ -1,13 +1,9 @@ package net.lab1024.sa.admin.interceptor; -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.convert.NumberWithFormat; import com.google.common.collect.Lists; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; -import net.lab1024.sa.common.common.util.SmartEnumUtil; -import net.lab1024.sa.common.module.support.token.TokenService; import org.springframework.context.annotation.Configuration; import javax.servlet.http.HttpServletRequest; @@ -23,6 +19,24 @@ import java.util.List; @Configuration public class AdminInterceptor extends AbstractInterceptor { + /** + * 此处可根据需要 + * 自行查询用户信息 + */ + @Override + public RequestUser getDevUser(Long userId) { + RequestUser requestUser = new RequestUser(); + requestUser.setUserId(userId); + requestUser.setUserName("dev"); + requestUser.setUserType(this.getUserType()); + return requestUser; + } + + @Override + public UserTypeEnum getUserType() { + return UserTypeEnum.ADMIN_EMPLOYEE; + } + /** * 配置拦截路径 * @@ -33,27 +47,16 @@ public class AdminInterceptor extends AbstractInterceptor { return Lists.newArrayList("/**"); } - @Override - public void checkSaToken() { - StpUtil.checkLogin(); - } - - @Override - public RequestUser getRequestUser() { - // 获取额外数据 - Integer userType = ((NumberWithFormat) StpUtil.getExtra(TokenService.EXTRA_KEY_USER_TYPE)).intValue(); - UserTypeEnum userTypeEnum = SmartEnumUtil.getEnumByValue(userType, UserTypeEnum.class); - String userName = (String) StpUtil.getExtra(TokenService.EXTRA_KEY_USER_NAME); - String loginId = (String) StpUtil.getLoginId(); - - // 当前请求对象 - RequestUser requestUser = new RequestUser(); - requestUser.setUserId(TokenService.getUserId(loginId)); - requestUser.setUserName(userName); - requestUser.setUserType(userTypeEnum); - return requestUser; - } - + /** + * 如果没有需要处理的业务 + * 那就没有必要重写了 可以删除这个方法 + * + * @param request + * @param response + * @param handler + * @return + * @throws Exception + */ @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { boolean isHandle = super.preHandle(request, response, handler); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java index d8ef44f3..94b00dba 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java @@ -1,17 +1,24 @@ package net.lab1024.sa.admin.module.system.employee.service; +import cn.dev33.satoken.session.SaSession; +import cn.dev33.satoken.session.SaSessionCustomUtil; import cn.dev33.satoken.stp.StpInterface; -import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao; -import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity; +import cn.dev33.satoken.stp.StpUtil; +import com.google.common.collect.Lists; import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum; +import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity; import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO; +import net.lab1024.sa.admin.module.system.role.dao.RoleMenuDao; import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService; import net.lab1024.sa.admin.module.system.role.service.RoleMenuService; +import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import net.lab1024.sa.common.module.support.token.TokenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -33,7 +40,22 @@ public class EmployeePermissionService implements StpInterface { private RoleMenuService roleMenuService; @Autowired - private EmployeeDao employeeDao; + private RoleMenuDao roleMenuDao; + + /** + * 员工关联权限 缓存key + */ + private static final String USER_ROLE_CACHE_KEY = "RoleList"; + + /** + * 角色关联功能点 缓存key + */ + private static final String ROLE_CACHE_KEY = "role:"; + + /** + * 角色关联功能点 缓存key + */ + private static final String ROLE_PERMISSION_CACHE_KEY = "PermissionList"; /** * 查询用户拥有的前端菜单项 用于登陆返回 前端动态路由配置 @@ -48,18 +70,61 @@ public class EmployeePermissionService implements StpInterface { @Override public List getPermissionList(Object loginId, String loginType) { - Long employeeId = TokenService.getUserId((String) loginId); + // 权限集合 + List permissionList = new ArrayList<>(); - // TODO listen 待做权限缓存 - EmployeeEntity employeeEntity = employeeDao.selectById(employeeId); - List menuList = this.getEmployeeMenuAndPointsList(employeeId, employeeEntity.getAdministratorFlag()); - return menuList.stream() - .filter(e -> MenuTypeEnum.POINTS.equalsValue(e.getMenuType())) - .map(MenuVO::getApiPerms).distinct().collect(Collectors.toList()); + // 遍历角色列表，查询拥有的权限 + List roleList = this.getRoleList(loginId, loginType); + for (String roleId : roleList) { + // 查询缓存 + SaSession roleSession = SaSessionCustomUtil.getSessionById(ROLE_CACHE_KEY + roleId); + List list = roleSession.get(ROLE_PERMISSION_CACHE_KEY, () -> { + // 从数据库查询这个角色所拥有的权限列表 + return roleMenuDao.selectMenuListByRoleIdList(Lists.newArrayList(Long.parseLong(roleId)), false) + .stream() + .filter(e -> MenuTypeEnum.POINTS.equalsValue(e.getMenuType())) + .map(MenuEntity::getApiPerms).filter(Objects::nonNull).distinct() + .collect(Collectors.toList()); + }); + permissionList.addAll(list); + } + // 返回权限集合 + return permissionList; } @Override public List getRoleList(Object loginId, String loginType) { - return null; + SaSession session = StpUtil.getSessionByLoginId(loginId); + // 查询员工关联角色缓存 + Long employeeId = TokenService.getUserId((String) loginId); + return session.get(USER_ROLE_CACHE_KEY, () -> { + // 数据库中查询员工角色 + return roleEmployeeService.getRoleIdList(employeeId).stream().map(String::valueOf).collect(Collectors.toList()); + }); + } + + /** + * 清理角色关联权限 缓存 + * TODO listen 待调用 + * + * @param roleId + */ + public static void clearRoleCache(Long roleId) { + SaSessionCustomUtil.deleteSessionById(ROLE_CACHE_KEY + roleId); + } + + /** + * 清理 员工关联角色 缓存 + * TODO listen 待调用 + * + * @param employeeId + */ + public static void clearUserRoleCache(Long employeeId) { + String loginId = TokenService.generateLoginId(employeeId, UserTypeEnum.ADMIN_EMPLOYEE); + SaSession session = StpUtil.getSessionByLoginId(loginId, false); + if (null == session) { + return; + } + session.delete(USER_ROLE_CACHE_KEY); } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java index 5a7fd6e1..60729bea 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java @@ -73,7 +73,7 @@ public class LoginController { return loginService.getCaptcha(); } - // TODO listen + // TODO listen 测试待删除 @NoNeedLogin @ApiOperation("测试权限 @listen") @GetMapping("/listen/test") diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java index 06c21540..a32d183f 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.sa.admin.module.system.menu.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.sa.common.common.enumeration.BaseEnum; /** @@ -12,6 +14,8 @@ import net.lab1024.sa.common.common.enumeration.BaseEnum; * @Email lab1024@163.com * @Copyright 1024创新实验室 （ https://1024lab.net ） */ +@Getter +@AllArgsConstructor public enum MenuTypeEnum implements BaseEnum { /** * 目录 @@ -26,23 +30,7 @@ public enum MenuTypeEnum implements BaseEnum { */ POINTS(3, "功能点"); - private Integer value; + private final Integer value; - private String desc; - - - MenuTypeEnum(Integer value, String desc) { - this.value = value; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - @Override - public String getDesc() { - return desc; - } + private final String desc; } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java new file mode 100644 index 00000000..97a5e56f --- /dev/null +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java @@ -0,0 +1,52 @@ +package net.lab1024.sa.admin.module.system.menu.service; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import lombok.SneakyThrows; +import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum; +import net.lab1024.sa.admin.module.system.menu.dao.MenuDao; +import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * 功能菜单业务 + * + * @author Turbolisten + * @date 2023/7/20 19:04 + */ +@Service +public class MenuCacheService { + + @Autowired + private MenuDao menuDao; + + private static final Cache> MENU_URL_CACHE = CacheBuilder.newBuilder().build(); + + /** + * 查询数据表中 需要校验权限的url + * + * @return + */ + @SneakyThrows + public List queryNeedCheckPermissionsUrl() { + return MENU_URL_CACHE.get("MENU_URL_CACHE", () -> { + // TODO listen 待确定哪个字段做为url + return menuDao.queryMenuByType(MenuTypeEnum.POINTS.getValue(), false, false) + .stream() + .map(MenuEntity::getApiPerms) + .filter(Objects::nonNull) + .distinct() + .collect(Collectors.toList()); + }); + } + + public static void clearCache() { + MENU_URL_CACHE.invalidateAll(); + } + +} diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java index 4b3fa693..0b8f1bd6 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java @@ -65,6 +65,12 @@ public class MenuService { menuEntity.setApiPerms(perms); } menuDao.insert(menuEntity); + + // 清除权限缓存 + if (MenuTypeEnum.POINTS.equalsValue(menuEntity.getMenuType())) { + MenuCacheService.clearCache(); + } + return ResponseDTO.ok(); } @@ -102,6 +108,11 @@ public class MenuService { menuEntity.setApiPerms(perms); } menuDao.updateById(menuEntity); + + // 清除权限缓存 + if (MenuTypeEnum.POINTS.equalsValue(menuEntity.getMenuType())) { + MenuCacheService.clearCache(); + } return ResponseDTO.ok(); } @@ -118,8 +129,11 @@ public class MenuService { return ResponseDTO.userErrorParam("所选菜单不能为空"); } menuDao.deleteByMenuIdList(menuIdList, employeeId, Boolean.TRUE); - //孩子节点也需要删除 + // 子节点也需要删除 this.recursiveDeleteChildren(menuIdList, employeeId); + + // 清除权限缓存 + MenuCacheService.clearCache(); return ResponseDTO.ok(); } diff --git a/smart-admin-api/sa-common/pom.xml b/smart-admin-api/sa-common/pom.xml index 57a6c9c9..84b1161e 100644 --- a/smart-admin-api/sa-common/pom.xml +++ b/smart-admin-api/sa-common/pom.xml @@ -60,11 +60,6 @@ sa-token-redis-jackson - - - cn.dev33 - sa-token-jwt - diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/constant/StringConst.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/constant/StringConst.java index 2a40152d..0dcaf849 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/constant/StringConst.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/constant/StringConst.java @@ -26,6 +26,11 @@ public class StringConst { */ public static final String HORIZONTAL = "-"; + /** + * 全局通用 冒号 + */ + public static final String COLON = ":"; + /** * 全局通用分隔符 */ diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java index e7ef34a9..3d295eca 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/domain/RequestUser.java @@ -31,13 +31,7 @@ public class RequestUser { */ private UserTypeEnum userType; - /** - * TODO listen 准备移除 - * 为了其他地方不报错 - */ - @Deprecated private String ip; - @Deprecated private String userAgent; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java index 577f9ed9..6889107d 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/SystemEnvEnum.java @@ -19,28 +19,28 @@ public enum SystemEnvEnum implements BaseEnum { /** * dev */ - DEV(SystemEnvironmentNameConst.DEV, "开发环境"), + DEV(EnvConst.DEV, "开发环境"), /** * test */ - TEST(SystemEnvironmentNameConst.TEST, "测试环境"), + TEST(EnvConst.TEST, "测试环境"), /** * pre */ - PRE(SystemEnvironmentNameConst.PRE, "预发布环境"), + PRE(EnvConst.PRE, "预发布环境"), /** * prod */ - PROD(SystemEnvironmentNameConst.PROD, "生产环境"); + PROD(EnvConst.PROD, "生产环境"); private final String value; private final String desc; - public static final class SystemEnvironmentNameConst { + public static final class EnvConst { public static final String DEV = "dev"; public static final String TEST = "test"; public static final String PRE = "pre"; diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/UserTypeEnum.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/UserTypeEnum.java index c34670b9..ff95a981 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/UserTypeEnum.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/UserTypeEnum.java @@ -1,5 +1,8 @@ package net.lab1024.sa.common.common.enumeration; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 用户类型 * @@ -9,29 +12,16 @@ package net.lab1024.sa.common.common.enumeration; * @Email lab1024@163.com * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022 */ +@Getter +@AllArgsConstructor public enum UserTypeEnum implements BaseEnum { /** * 管理端 员工用户 */ - ADMIN_EMPLOYEE(1, "员工"); + ADMIN_EMPLOYEE(1, "管理端-员工"); - private Integer type; + private final Integer value; - private String desc; - - UserTypeEnum(Integer type, String desc) { - this.type = type; - this.desc = desc; - } - - @Override - public Integer getValue() { - return type; - } - - @Override - public String getDesc() { - return desc; - } + private final String desc; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java index 3d0bb442..9abc3465 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/interceptor/AbstractInterceptor.java @@ -1,14 +1,24 @@ package net.lab1024.sa.common.common.interceptor; import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.session.SaSession; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.extra.servlet.ServletUtil; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import net.lab1024.sa.common.common.annoation.NoNeedLogin; import net.lab1024.sa.common.common.code.UserErrorCode; +import net.lab1024.sa.common.common.constant.RequestHeaderConst; import net.lab1024.sa.common.common.domain.RequestUser; import net.lab1024.sa.common.common.domain.ResponseDTO; +import net.lab1024.sa.common.common.domain.SystemEnv; +import net.lab1024.sa.common.common.enumeration.SystemEnvEnum; +import net.lab1024.sa.common.common.enumeration.UserTypeEnum; import net.lab1024.sa.common.common.util.SmartRequestUtil; +import net.lab1024.sa.common.module.support.token.TokenService; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -29,17 +39,21 @@ import java.util.List; * @date 2023-07-12 21:56:14 */ public abstract class AbstractInterceptor implements HandlerInterceptor { - /** - * 校验 token - */ - public abstract void checkSaToken(); + + @Autowired + private SystemEnv systemEnv; /** - * Token 获取当前请求用户信息 + * 校验 token * - * @return + * @param userId */ - public abstract RequestUser getRequestUser(); + public abstract RequestUser getDevUser(Long userId); + + /** + * 校验 当前服务用户类型 + */ + public abstract UserTypeEnum getUserType(); /** * 拦截路径 @@ -83,8 +97,8 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { if (!isHandler) { return true; } - // 校验 token 获取当前请求用户信息 - ResponseDTO res = this.checkTokenAndGetUser(); + // 校验 token + ResponseDTO res = this.checkTokenAndGetUser(request); if (res.getOk()) { SmartRequestUtil.setUser(res.getData()); return true; @@ -99,7 +113,6 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { } /** - * 校验 sa token * 判断 sa-token 未登录场景值 * 自己根据业务在下面 switch 添加分支判断 * NotLoginException.NOT_TOKEN 无token @@ -111,13 +124,28 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { *

* ps :之所以没有在全局异常里处理 是因为后续还有操作 */ - public ResponseDTO checkTokenAndGetUser() { + public ResponseDTO checkTokenAndGetUser(HttpServletRequest request) { + /** + * 处理【非生产环境】的测试 token ，便于开发调试 + * 如不需要 可以删除此段判断代码 + */ + if (SystemEnvEnum.PROD != systemEnv.getCurrentEnv()) { + String tokenValue = StpUtil.getTokenValue(); + if (NumberUtils.isDigits(tokenValue)) { + RequestUser user = this.getDevUser(NumberUtils.createLong(tokenValue)); + this.handleRequestIpAndAgent(user, request); + // sa token 登录身份临时切换 + StpUtil.switchTo(TokenService.generateLoginId(user.getUserId(), user.getUserType())); + return ResponseDTO.ok(user); + } + } + try { /** - * sa-token 会从当前请求header or body 中获取token + * sa-token 会从当前请求 header or body 中获取token * 检验当前会话是否已经登录, 如果未登录，则抛出异常：`NotLoginException` */ - this.checkSaToken(); + StpUtil.checkLogin(); } catch (NotLoginException e) { switch (e.getType()) { case NotLoginException.BE_REPLACED: @@ -129,8 +157,13 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); } } - RequestUser requestUser = this.getRequestUser(); - return ResponseDTO.ok(requestUser); + // 校验token的用户类型 + UserTypeEnum systemUserTypeEnum = this.getUserType(); + RequestUser user = this.buildCurrentUser(request); + if (null == user || systemUserTypeEnum != user.getUserType()) { + return ResponseDTO.error(UserErrorCode.LOGIN_STATE_INVALID); + } + return ResponseDTO.ok(user); } /** @@ -147,8 +180,35 @@ public abstract class AbstractInterceptor implements HandlerInterceptor { response.flushBuffer(); } - @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { - SmartRequestUtil.remove(); + /** + * build 当前请求用户 + * + * @param request + * @return + */ + public RequestUser buildCurrentUser(HttpServletRequest request) { + // 获取额外数据 + SaSession session = StpUtil.getSession(); + UserTypeEnum userTypeEnum = (UserTypeEnum) session.get(TokenService.EXTRA_KEY_USER_TYPE); + String userName = session.getString(TokenService.EXTRA_KEY_USER_NAME); + + // 当前请求对象 + RequestUser user = new RequestUser(); + user.setUserId(TokenService.getUserId((String) StpUtil.getLoginId())); + user.setUserName(userName); + user.setUserType(userTypeEnum); + this.handleRequestIpAndAgent(user, request); + return user; + } + + /** + * 设置 当前请求ip agent + * + * @param requestUser + * @param request + */ + private void handleRequestIpAndAgent(RequestUser requestUser, HttpServletRequest request) { + requestUser.setUserAgent(ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT)); + requestUser.setIp(ServletUtil.getClientIP(request)); } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java index 0e22b630..5e139e25 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/util/SmartRequestUtil.java @@ -1,6 +1,7 @@ package net.lab1024.sa.common.common.util; -import lombok.extern.slf4j.Slf4j; +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.context.model.SaStorage; import net.lab1024.sa.common.common.domain.RequestUser; /** @@ -12,26 +13,28 @@ import net.lab1024.sa.common.common.domain.RequestUser; * @Email lab1024@163.com * @Copyright 1024创新实验室 （ https://1024lab.net ） */ -@Slf4j public class SmartRequestUtil { - private static final ThreadLocal LOCAL = new ThreadLocal<>(); + private static final String STORAGE_KEY = "user"; - public static void setUser(RequestUser requestUser) { - LOCAL.set(requestUser); + public static void setUser(RequestUser user) { + SaStorage storage = SaHolder.getStorage(); + storage.set(STORAGE_KEY, user); } + /** + * 获取 当前 token 请求用户 + * + * @return + */ public static RequestUser getUser() { - return LOCAL.get(); + SaStorage storage = SaHolder.getStorage(); + return storage.getModel(STORAGE_KEY, RequestUser.class); } public static Long getUserId() { - RequestUser requestUser = getUser(); - return null == requestUser ? null : requestUser.getUserId(); - } - - public static void remove() { - LOCAL.remove(); + RequestUser user = getUser(); + return null != user ? user.getUserId() : null; } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java index c2bfb480..494e6f8d 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java @@ -1,6 +1,7 @@ package net.lab1024.sa.common.config; import cn.dev33.satoken.interceptor.SaInterceptor; +import com.google.common.collect.Sets; import net.lab1024.sa.common.common.interceptor.AbstractInterceptor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +11,9 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.util.ArrayList; import java.util.List; +import java.util.Set; /** * web相关配置 @@ -33,8 +36,10 @@ public class MvcConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 先注册 登录拦截器 + Set ignoreUrlSet = Sets.newHashSet(); if (CollectionUtils.isNotEmpty(interceptorList)) { interceptorList.forEach(e -> { + ignoreUrlSet.addAll(e.getIgnoreUrlList()); registry.addInterceptor(e).addPathPatterns(e.pathPatterns()).excludePathPatterns(e.getIgnoreUrlList()); }); } @@ -42,7 +47,7 @@ public class MvcConfig implements WebMvcConfigurer { // 后注册 sa-token 权限拦截器 不需要可以删除 if (CollectionUtils.isNotEmpty(saInterceptorList)) { saInterceptorList.forEach(i -> { - registry.addInterceptor(i).addPathPatterns("/**"); + registry.addInterceptor(i).addPathPatterns("/**").excludePathPatterns(new ArrayList<>(ignoreUrlSet)); }); } } diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java index bf0a0940..60cff6a0 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/SwaggerConfig.java @@ -198,7 +198,7 @@ public class SwaggerConfig implements EnvironmentAware, BeanDefinitionRegistryPo Parameter token = new ParameterBuilder().name(RequestHeaderConst.TOKEN) .description("token") .modelRef(new ModelRef("string")) - .parameterType("header").defaultValue("1") + .parameterType("header").defaultValue("0") .required(false) .build(); return Lists.newArrayList(token); diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java index 8de7ed91..deea8494 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/UrlConfig.java @@ -34,8 +34,6 @@ public class UrlConfig { @Autowired private RequestMappingHandlerMapping requestMappingHandlerMapping; - public static List AUTH_URL_LIST = Lists.newArrayList(); - /** * 获取每个方法的请求路径 * @@ -81,8 +79,6 @@ public class UrlConfig { Set urlSet = entry.getValue(); List requestUrlList = this.buildRequestUrl(method, urlSet); authUrlList.addAll(requestUrlList); - - AUTH_URL_LIST.addAll(urlSet); } log.info("需要权限校验的URL：{}", authUrlList.stream().map(RequestUrlVO::getUrl).collect(Collectors.toList())); return authUrlList; diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java deleted file mode 100644 index f229d8f0..00000000 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/satoken/SaTokenCommonConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.lab1024.sa.common.config.satoken; - -import cn.dev33.satoken.jwt.StpLogicJwtForSimple; -import cn.dev33.satoken.stp.StpLogic; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * sa token 配置 - * - * @author: listen - * @date: 2023/7/12 20:46 - */ -@Configuration -public class SaTokenCommonConfig { - - /** - * 整合 jwt - * - * @return - * @see https://sa-token.cc/doc.html#/plugin/jwt-extend - */ - @Bean - public StpLogic getStpLogicJwt() { - // Simple 简单模式 - return new StpLogicJwtForSimple(); - } - -} diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java index 4847e0de..07b3acea 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/token/TokenService.java @@ -1,5 +1,6 @@ package net.lab1024.sa.common.module.support.token; +import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import net.lab1024.sa.common.common.constant.StringConst; @@ -37,31 +38,34 @@ public class TokenService { /** * 设置登录模式参数 - * 具体参数 @see SaLoginModel 属性 + * 具体参数 {@link SaLoginModel } 属性 * 已经写的挺清楚的了 */ SaLoginModel loginModel = new SaLoginModel(); // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 loginModel.setDevice(String.valueOf(loginDeviceEnum.getDesc())); - // 扩展参数 只在 jwt 模式下 有效 - loginModel.setExtra(EXTRA_KEY_USER_NAME, userName); - loginModel.setExtra(EXTRA_KEY_USER_TYPE, userTypeEnum.getValue()); + // 登录 String loginId = generateLoginId(userId, userTypeEnum); StpUtil.login(loginId, loginModel); + + // 扩展参数 放入会话中 redis session + SaSession session = StpUtil.getSession(); + session.set(EXTRA_KEY_USER_NAME, userName); + session.set(EXTRA_KEY_USER_TYPE, userTypeEnum); return StpUtil.getTokenValue(); } public static String generateLoginId(Long userId, UserTypeEnum userType) { - return userType.getValue() + StringConst.HORIZONTAL + userId; + return userType.getValue() + StringConst.COLON + userId; } public static Long getUserId(String loginId) { - return Long.valueOf(loginId.substring(loginId.indexOf(StringConst.HORIZONTAL) + 1)); + return Long.valueOf(loginId.substring(loginId.indexOf(StringConst.COLON) + 1)); } public static Integer getUserType(String loginId) { - return Integer.valueOf(loginId.substring(0, loginId.indexOf(StringConst.HORIZONTAL))); + return Integer.valueOf(loginId.substring(0, loginId.indexOf(StringConst.COLON))); } /** From 8a113bb7f8731299c37cd08f62795e028d231142 Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Tue, 25 Jul 2023 19:36:42 +0800 Subject: [PATCH 07/11] sa-token update --- .../service/EmployeePermissionService.java | 2 -- .../login/controller/LoginController.java | 8 ------- .../system/login/service/LoginService.java | 4 +--- .../role/service/RoleEmployeeService.java | 24 +++++++++++++------ .../system/role/service/RoleMenuService.java | 6 ++++- .../system/role/service/RoleService.java | 4 ++++ 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java index 94b00dba..fdfb84de 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeePermissionService.java +++ b/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 */ diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java index 60729bea..92eda233 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java +++ b/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 getCaptcha() { return loginService.getCaptcha(); } - - // TODO listen 测试待删除 - @NoNeedLogin - @ApiOperation("测试权限 @listen") - @GetMapping("/listen/test") - public ResponseDTO test() { - return ResponseDTO.ok(); - } } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index 4460d349..96489fe0 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/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 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 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); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java index 51bf64d4..e5eb1ce1 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java +++ b/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 */ public ResponseDTO batchRemoveRoleEmployee(RoleEmployeeUpdateForm roleEmployeeUpdateForm) { - roleEmployeeDao.batchDeleteEmployeeRole(roleEmployeeUpdateForm.getRoleId(), roleEmployeeUpdateForm.getEmployeeIdList()); + List 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(); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java index a63858d2..952e3a64 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java +++ b/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(); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java index 031d75e0..4c1d9317 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java +++ b/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(); } From 0733919efc5b7f3cece60d8e906fcb3599e385dc Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Tue, 25 Jul 2023 19:42:47 +0800 Subject: [PATCH 08/11] sa-token update --- .../system/menu/service/MenuCacheService.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java index 97a5e56f..13670559 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java @@ -1,8 +1,5 @@ package net.lab1024.sa.admin.module.system.menu.service; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import lombok.SneakyThrows; import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum; import net.lab1024.sa.admin.module.system.menu.dao.MenuDao; import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity; @@ -25,28 +22,34 @@ public class MenuCacheService { @Autowired private MenuDao menuDao; - private static final Cache> MENU_URL_CACHE = CacheBuilder.newBuilder().build(); + private static List MENU_URL_CACHE = null; /** - * 查询数据表中 需要校验权限的url + * 查询 需要校验权限的url * * @return */ - @SneakyThrows public List queryNeedCheckPermissionsUrl() { - return MENU_URL_CACHE.get("MENU_URL_CACHE", () -> { - // TODO listen 待确定哪个字段做为url - return menuDao.queryMenuByType(MenuTypeEnum.POINTS.getValue(), false, false) + if (null != MENU_URL_CACHE) { + return MENU_URL_CACHE; + } + synchronized (MenuCacheService.class) { + if (null != MENU_URL_CACHE) { + return MENU_URL_CACHE; + } + // TODO listen 待确定哪个字段做为url + MENU_URL_CACHE = menuDao.queryMenuByType(MenuTypeEnum.POINTS.getValue(), false, false) .stream() .map(MenuEntity::getApiPerms) .filter(Objects::nonNull) .distinct() .collect(Collectors.toList()); - }); + return MENU_URL_CACHE; + } } public static void clearCache() { - MENU_URL_CACHE.invalidateAll(); + MENU_URL_CACHE = null; } } From de3269b233c189f995e98d292f711dc928f3b493 Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Tue, 25 Jul 2023 19:54:52 +0800 Subject: [PATCH 09/11] sa-token update --- .../sa/admin/module/system/menu/service/MenuCacheService.java | 2 +- smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java index 13670559..d8d5fbc2 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuCacheService.java @@ -22,7 +22,7 @@ public class MenuCacheService { @Autowired private MenuDao menuDao; - private static List MENU_URL_CACHE = null; + private static volatile List MENU_URL_CACHE = null; /** * 查询 需要校验权限的url diff --git a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml index a0d4d566..14fc43ad 100644 --- a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml +++ b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml @@ -129,7 +129,7 @@ sa-token: # jwt秘钥 jwt-secret-key: smart-admin # token 有效期（单位：秒） 默认30天，-1 代表永久有效 - timeout: 2592000 + timeout: 432000 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 active-timeout: -1 # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） From c9d4f12c64971d91a086ae717acf32b87ac34fe0 Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Tue, 25 Jul 2023 19:55:55 +0800 Subject: [PATCH 10/11] sa-token update --- smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml index 14fc43ad..62e609ef 100644 --- a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml +++ b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml @@ -127,7 +127,7 @@ sa-token: # token 前缀 例如：Bear token-prefix: # jwt秘钥 - jwt-secret-key: smart-admin + # jwt-secret-key: smart-admin # token 有效期（单位：秒） 默认30天，-1 代表永久有效 timeout: 432000 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 From 1b6d8ac270cb8f6692fe8c0ecfe86549437785a0 Mon Sep 17 00:00:00 2001 From: lixiaodong <188029906@qq.com> Date: Tue, 25 Jul 2023 20:07:55 +0800 Subject: [PATCH 11/11] remove SaCheckPermission --- .../module/business/goods/controller/GoodsController.java | 6 ------ .../system/department/controller/DepartmentController.java | 4 ---- .../system/employee/controller/EmployeeController.java | 7 ------- .../module/system/menu/controller/MenuController.java | 4 ---- .../module/system/role/controller/RoleController.java | 4 ---- .../system/role/controller/RoleDataScopeController.java | 2 -- .../system/role/controller/RoleEmployeeController.java | 4 ---- .../module/system/role/controller/RoleMenuController.java | 2 -- .../admin/module/system/support/AdminCacheController.java | 3 --- .../module/system/support/AdminChangeLogController.java | 5 ----- .../admin/module/system/support/AdminConfigController.java | 4 ---- .../admin/module/system/support/AdminFileController.java | 2 -- .../module/system/support/AdminHelpDocController.java | 7 ------- .../module/system/support/AdminLoginLogController.java | 2 -- .../module/system/support/AdminOperateLogController.java | 3 --- .../admin/module/system/support/AdminReloadController.java | 3 --- .../module/system/support/AdminSerialNumberController.java | 3 --- 17 files changed, 65 deletions(-) diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java index 9652c258..7d6ba5f8 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.business.goods.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -38,35 +37,30 @@ public class GoodsController extends AdminBaseController { @ApiOperation("分页查询 @author 胡克") @PostMapping("/goods/query") - @SaCheckPermission("@saAuth.checkPermission('goods:query')") public ResponseDTO> query(@RequestBody @Valid GoodsQueryForm queryForm) { return goodsService.query(queryForm); } @ApiOperation("添加商品 @author 胡克") @PostMapping("/goods/add") - @SaCheckPermission("@saAuth.checkPermission('goods:add')") public ResponseDTO add(@RequestBody @Valid GoodsAddForm addForm) { return goodsService.add(addForm); } @ApiOperation("更新商品 @author 胡克") @PostMapping("/goods/update") - @SaCheckPermission("@saAuth.checkPermission('goods:update')") public ResponseDTO update(@RequestBody @Valid GoodsUpdateForm updateForm) { return goodsService.update(updateForm); } @ApiOperation("删除 @author 卓大") @GetMapping("/goods/delete/{goodsId}") - @SaCheckPermission("@saAuth.checkPermission('goods:delete')") public ResponseDTO delete(@PathVariable Long goodsId) { return goodsService.delete(goodsId); } @ApiOperation("批量 @author 卓大") @PostMapping("/goods/batchDelete") - @SaCheckPermission("@saAuth.checkPermission('goods:batchDelete')") public ResponseDTO batchDelete(@RequestBody @Valid ValidateList idList) { return goodsService.batchDelete(idList); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java index fba5bcfa..79ee73dd 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.department.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -43,21 +42,18 @@ public class DepartmentController extends AdminBaseController { @ApiOperation(value = "添加部门 @author 卓大") @PostMapping("/department/add") - @SaCheckPermission("@saAuth.checkPermission('system:department:add')") public ResponseDTO addDepartment(@Valid @RequestBody DepartmentAddForm createDTO) { return departmentService.addDepartment(createDTO); } @ApiOperation(value = "更新部门 @author 卓大") @PostMapping("/department/update") - @SaCheckPermission("@saAuth.checkPermission('system:department:update')") public ResponseDTO updateDepartment(@Valid @RequestBody DepartmentUpdateForm updateDTO) { return departmentService.updateDepartment(updateDTO); } @ApiOperation(value = "删除部门 @author 卓大") @GetMapping("/department/delete/{departmentId}") - @SaCheckPermission("@saAuth.checkPermission('system:department:delete')") public ResponseDTO deleteDepartment(@PathVariable Long departmentId) { return departmentService.deleteDepartment(departmentId); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java index d5455bef..c8cacfb9 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.employee.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -43,35 +42,30 @@ public class EmployeeController extends AdminBaseController { @ApiOperation(value = "添加员工(返回添加员工的密码) @author 卓大") @PostMapping("/employee/add") - @SaCheckPermission("@saAuth.checkPermission('system:employee:add')") public ResponseDTO addEmployee(@Valid @RequestBody EmployeeAddForm employeeAddForm) { return employeeService.addEmployee(employeeAddForm); } @ApiOperation(value = "更新员工 @author 卓大") @PostMapping("/employee/update") - @SaCheckPermission("@saAuth.checkPermission('system:employee:update')") public ResponseDTO updateEmployee(@Valid @RequestBody EmployeeUpdateForm employeeUpdateForm) { return employeeService.updateEmployee(employeeUpdateForm); } @ApiOperation(value = "更新员工禁用/启用状态 @author 卓大") @GetMapping("/employee/update/disabled/{employeeId}") - @SaCheckPermission("@saAuth.checkPermission('system:employee:disabled')") public ResponseDTO updateDisableFlag(@PathVariable Long employeeId) { return employeeService.updateDisableFlag(employeeId); } @ApiOperation(value = "批量删除员工 @author 卓大") @PostMapping("/employee/update/batch/delete") - @SaCheckPermission("@saAuth.checkPermission('system:employee:delete')") public ResponseDTO batchUpdateDeleteFlag(@RequestBody List employeeIdList) { return employeeService.batchUpdateDeleteFlag(employeeIdList); } @ApiOperation(value = "批量调整员工部门 @author 卓大") @PostMapping("/employee/update/batch/department") - @SaCheckPermission("@saAuth.checkPermission('system:employee:department:update')") public ResponseDTO batchUpdateDepartment(@Valid @RequestBody EmployeeBatchUpdateDepartmentForm batchUpdateDepartmentForm) { return employeeService.batchUpdateDepartment(batchUpdateDepartmentForm); } @@ -85,7 +79,6 @@ public class EmployeeController extends AdminBaseController { @ApiOperation(value = "重置员工密码 @author 卓大") @GetMapping("/employee/update/password/reset/{employeeId}") - @SaCheckPermission("@saAuth.checkPermission('system:employee:password:reset')") public ResponseDTO resetPassword(@PathVariable Integer employeeId) { return employeeService.resetPassword(employeeId); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java index ab39a213..ff7a73ac 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.menu.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -39,7 +38,6 @@ public class MenuController extends AdminBaseController { @ApiOperation(value = "添加菜单 @author 卓大") @PostMapping("/menu/add") - @SaCheckPermission("@saAuth.checkPermission('system:menu:add')") public ResponseDTO addMenu(@RequestBody @Valid MenuAddForm menuAddForm) { menuAddForm.setCreateUserId(SmartRequestUtil.getUserId()); return menuService.addMenu(menuAddForm); @@ -47,7 +45,6 @@ public class MenuController extends AdminBaseController { @ApiOperation(value = "更新菜单 @author 卓大") @PostMapping("/menu/update") - @SaCheckPermission("@saAuth.checkPermission('system:menu:update')") public ResponseDTO updateMenu(@RequestBody @Valid MenuUpdateForm menuUpdateForm) { menuUpdateForm.setUpdateUserId(SmartRequestUtil.getUserId()); return menuService.updateMenu(menuUpdateForm); @@ -55,7 +52,6 @@ public class MenuController extends AdminBaseController { @ApiOperation(value = "批量删除菜单 @author 卓大") @GetMapping("/menu/batchDelete") - @SaCheckPermission("@saAuth.checkPermission('system:menu:delete,system:menu:batch:delete')") public ResponseDTO batchDeleteMenu(@RequestParam("menuIdList") List menuIdList) { return menuService.batchDeleteMenu(menuIdList, SmartRequestUtil.getUserId()); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java index 690bb17d..c68f820a 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.role.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -36,21 +35,18 @@ public class RoleController extends AdminBaseController { @ApiOperation("添加角色 @author 卓大") @PostMapping("/role/add") - @SaCheckPermission("@saAuth.checkPermission('system:role:add')") public ResponseDTO addRole(@Valid @RequestBody RoleAddForm roleAddForm) { return roleService.addRole(roleAddForm); } @ApiOperation("删除角色 @author 卓大") @GetMapping("/role/delete/{roleId}") - @SaCheckPermission("@saAuth.checkPermission('system:role:delete')") public ResponseDTO deleteRole(@PathVariable Long roleId) { return roleService.deleteRole(roleId); } @ApiOperation("更新角色 @author 卓大") @PostMapping("/role/update") - @SaCheckPermission("@saAuth.checkPermission('system:role:update')") public ResponseDTO updateRole(@Valid @RequestBody RoleUpdateForm roleUpdateDTO) { return roleService.updateRole(roleUpdateDTO); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java index 945294e4..6f3f503f 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.role.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -41,7 +40,6 @@ public class RoleDataScopeController extends AdminBaseController { @ApiOperation(value = "批量设置某角色数据范围 @author 卓大") @PostMapping("/role/dataScope/updateRoleDataScopeList") - @SaCheckPermission("@saAuth.checkPermission('system:role:dataScope:update')") public ResponseDTO updateRoleDataScopeList(@RequestBody @Valid RoleDataScopeUpdateForm roleDataScopeUpdateForm) { return roleDataScopeService.updateRoleDataScopeList(roleDataScopeUpdateForm); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java index ca9f9f1c..d7f5dcea 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.role.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -50,21 +49,18 @@ public class RoleEmployeeController extends AdminBaseController { @ApiOperation(value = "从角色成员列表中移除员工 @author 卓大") @GetMapping("/role/employee/removeEmployee") - @SaCheckPermission("@saAuth.checkPermission('system:role:employee:delete')") public ResponseDTO removeEmployee(Long employeeId, Long roleId) { return roleEmployeeService.removeRoleEmployee(employeeId, roleId); } @ApiOperation(value = "从角色成员列表中批量移除员工 @author 卓大") @PostMapping("/role/employee/batchRemoveRoleEmployee") - @SaCheckPermission("@saAuth.checkPermission('system:role:employee:batch:delete')") public ResponseDTO batchRemoveEmployee(@Valid @RequestBody RoleEmployeeUpdateForm updateForm) { return roleEmployeeService.batchRemoveRoleEmployee(updateForm); } @ApiOperation(value = "角色成员列表中批量添加员工 @author 卓大") @PostMapping("/role/employee/batchAddRoleEmployee") - @SaCheckPermission("@saAuth.checkPermission('system:role:employee:add')") public ResponseDTO addEmployeeList(@Valid @RequestBody RoleEmployeeUpdateForm addForm) { return roleEmployeeService.batchAddRoleEmployee(addForm); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java index 7c519f3c..b3afd048 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.role.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.common.AdminBaseController; @@ -34,7 +33,6 @@ public class RoleMenuController extends AdminBaseController { @ApiOperation("更新角色权限 @author 卓大") @PostMapping("/role/menu/updateRoleMenu") - @SaCheckPermission("@saAuth.checkPermission('system:role:menu:update')") public ResponseDTO updateRoleMenu(@Valid @RequestBody RoleMenuUpdateForm updateDTO) { return roleMenuService.updateRoleMenu(updateDTO); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java index 103ab12d..e3522075 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -38,7 +37,6 @@ public class AdminCacheController extends SupportBaseController { @ApiOperation(value = "移除某个缓存 @author 罗伊") - @SaCheckPermission("@saAuth.checkPermission('support:cache:delete')") @GetMapping("/cache/remove/{cacheName}") public ResponseDTO removeCache(@PathVariable String cacheName) { cacheService.removeCache(cacheName); @@ -47,7 +45,6 @@ public class AdminCacheController extends SupportBaseController { @ApiOperation(value = "获取某个缓存的所有key @author 罗伊") - @SaCheckPermission("@saAuth.checkPermission('support:cache:keys')") @GetMapping("/cache/keys/{cacheName}") public ResponseDTO> cacheKeys(@PathVariable String cacheName) { return ResponseDTO.ok(cacheService.cacheKey(cacheName)); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java index 49079729..ea7229e9 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.domain.ResponseDTO; @@ -31,27 +30,23 @@ public class AdminChangeLogController { @ApiOperation("添加 @author 卓大") @PostMapping("/changeLog/add") - @SaCheckPermission("@saAuth.checkPermission('changeLog:add')") public ResponseDTO add(@RequestBody @Valid ChangeLogAddForm addForm) { return changeLogService.add(addForm); } @ApiOperation("更新 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('changeLog:update')") @PostMapping("/changeLog/update") public ResponseDTO update(@RequestBody @Valid ChangeLogUpdateForm updateForm) { return changeLogService.update(updateForm); } @ApiOperation("批量删除 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('changeLog:batchDelete')") @PostMapping("/changeLog/batchDelete") public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return changeLogService.batchDelete(idList); } @ApiOperation("单个删除 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('changeLog:delete')") @GetMapping("/changeLog/delete/{changeLogId}") public ResponseDTO batchDelete(@PathVariable Long changeLogId) { return changeLogService.delete(changeLogId); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java index d776b079..c16ac0bc 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -36,21 +35,18 @@ public class AdminConfigController extends SupportBaseController { private ConfigService configService; @ApiOperation("分页查询系统配置 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('support:config:query')") @PostMapping("/config/query") public ResponseDTO> querySystemConfigPage(@RequestBody @Valid ConfigQueryForm queryForm) { return configService.queryConfigPage(queryForm); } @ApiOperation("添加配置参数 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('support:config:add')") @PostMapping("/config/add") public ResponseDTO addSystemConfig(@RequestBody @Valid ConfigAddForm configAddForm) { return configService.add(configAddForm); } @ApiOperation("修改配置参数 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('support:config:update')") @PostMapping("/config/update") public ResponseDTO updateSystemConfig(@RequestBody @Valid ConfigUpdateForm updateForm) { return configService.updateSystemConfig(updateForm); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java index 674571d4..0eea2e12 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -34,7 +33,6 @@ public class AdminFileController extends SupportBaseController { private FileService fileService; @ApiOperation("分页查询 @author 1024创新实验室-主任-卓大") - @SaCheckPermission("@saAuth.checkPermission('support:file:query')") @PostMapping("/file/queryPage") public ResponseDTO> queryPage(@RequestBody @Valid FileQueryForm queryForm) { return ResponseDTO.ok(fileService.queryPage(queryForm)); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java index ae08aa6c..68ee6557 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -42,14 +41,12 @@ public class AdminHelpDocController extends SupportBaseController { @ApiOperation("帮助文档目录-添加 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('helpDocCatalog:addCategory')") @PostMapping("/helpDoc/helpDocCatalog/add") public ResponseDTO addHelpDocCatalog(@RequestBody @Valid HelpDocCatalogAddForm helpDocCatalogAddForm) { return helpDocCatalogService.add(helpDocCatalogAddForm); } @ApiOperation("帮助文档目录-更新 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('helpDocCatalog:edit')") @PostMapping("/helpDoc/helpDocCatalog/update") public ResponseDTO updateHelpDocCatalog(@RequestBody @Valid HelpDocCatalogUpdateForm helpDocCatalogUpdateForm) { return helpDocCatalogService.update(helpDocCatalogUpdateForm); @@ -64,7 +61,6 @@ public class AdminHelpDocController extends SupportBaseController { // --------------------- 帮助文档 【管理:增、删、查、改】------------------------- @ApiOperation("【管理】帮助文档-分页查询 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('helpDoc:query')") @PostMapping("/helpDoc/query") public ResponseDTO> query(@RequestBody @Valid HelpDocQueryForm queryForm) { return ResponseDTO.ok(helpDocService.query(queryForm)); @@ -77,7 +73,6 @@ public class AdminHelpDocController extends SupportBaseController { } @ApiOperation("【管理】帮助文档-添加 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('helpDoc:add')") @PostMapping("/helpDoc/add") @RepeatSubmit public ResponseDTO add(@RequestBody @Valid HelpDocAddForm addForm) { @@ -85,7 +80,6 @@ public class AdminHelpDocController extends SupportBaseController { } @ApiOperation("【管理】帮助文档-更新 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('helpDoc:update')") @PostMapping("/helpDoc/update") @RepeatSubmit public ResponseDTO update(@RequestBody @Valid HelpDocUpdateForm updateForm) { @@ -93,7 +87,6 @@ public class AdminHelpDocController extends SupportBaseController { } @ApiOperation("【管理】帮助文档-删除 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('helpDoc:delete')") @GetMapping("/helpDoc/delete/{helpDocId}") public ResponseDTO delete(@PathVariable Long helpDocId) { return helpDocService.delete(helpDocId); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java index 33ec9f90..ca2a52c1 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -32,7 +31,6 @@ public class AdminLoginLogController extends SupportBaseController { private LoginLogService loginLogService; @ApiOperation(value = "分页查询 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('loginLog:query')") @PostMapping("/loginLog/page/query") public ResponseDTO> queryByPage(@RequestBody LoginLogQueryForm queryForm) { return loginLogService.queryByPage(queryForm); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java index 3594eaf3..c4c2b313 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -30,14 +29,12 @@ public class AdminOperateLogController extends SupportBaseController { private OperateLogService operateLogService; @ApiOperation(value = "分页查询 @author 罗伊") - @SaCheckPermission("@saAuth.checkPermission('operateLog:query')") @PostMapping("/operateLog/page/query") public ResponseDTO> queryByPage(@RequestBody OperateLogQueryForm queryForm) { return operateLogService.queryByPage(queryForm); } @ApiOperation(value = "详情 @author 罗伊") - @SaCheckPermission("@saAuth.checkPermission('operateLog:detail')") @GetMapping("/operateLog/detail/{operateLogId}") public ResponseDTO detail(@PathVariable Long operateLogId) { return operateLogService.detail(operateLogId); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java index 56cadbe7..c0eb99ac 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -39,14 +38,12 @@ public class AdminReloadController extends SupportBaseController { } @ApiOperation(value = "获取reload result @author 开云") - @SaCheckPermission("@saAuth.checkPermission('support:reload:result')") @GetMapping("/reload/result/{tag}") public ResponseDTO> queryReloadResult(@PathVariable("tag") String tag) { return reloadService.queryReloadItemResult(tag); } @ApiOperation(value = "通过tag更新标识 @author 开云") - @SaCheckPermission("@saAuth.checkPermission('support:reload:execute')") @PostMapping("/reload/update") public ResponseDTO updateByTag(@RequestBody @Valid ReloadForm reloadForm) { return reloadService.updateByTag(reloadForm); diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java index 670b3985..d6e39c2a 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java @@ -1,6 +1,5 @@ package net.lab1024.sa.admin.module.system.support; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.common.common.controller.SupportBaseController; @@ -48,7 +47,6 @@ public class AdminSerialNumberController extends SupportBaseController { private SerialNumberRecordService serialNumberRecordService; @ApiOperation("生成单号 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('support:serial:number:generate')") @PostMapping("/serialNumber/generate") public ResponseDTO> generate(@RequestBody @Valid SerialNumberGenerateForm generateForm) { SerialNumberIdEnum serialNumberIdEnum = SmartEnumUtil.getEnumByValue(generateForm.getSerialNumberId(), SerialNumberIdEnum.class); @@ -65,7 +63,6 @@ public class AdminSerialNumberController extends SupportBaseController { } @ApiOperation("获取生成记录 @author 卓大") - @SaCheckPermission("@saAuth.checkPermission('support:serial:number:record')") @PostMapping("/serialNumber/queryRecord") public ResponseDTO> queryRecord(@RequestBody @Valid SerialNumberRecordQueryForm queryForm) { return ResponseDTO.ok(serialNumberRecordService.query(queryForm));