From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java | 13
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java | 30 +
ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/MySaTokenListener.java | 106 +++++
ruoyi-common/src/main/java/com/ruoyi/common/core/service/IUserService.java | 28 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 6
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 14
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 34 -
pom.xml | 22
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 16
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 16
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 65 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 83 +--
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 12
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java | 37 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 30
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java | 36 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java | 20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 14
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 18
ruoyi-admin/src/main/resources/application.yml | 26
ruoyi-common/pom.xml | 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 14
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java | 8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java | 62 +++
/dev/null | 60 ---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 51 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 16
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 15
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 54 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 38 -
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 28
42 files changed, 653 insertions(+), 489 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73d680a..52ebaad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<poi.version>4.1.2</poi.version>
<easyexcel.version>2.2.11</easyexcel.version>
<velocity.version>1.7</velocity.version>
- <jwt.version>0.9.1</jwt.version>
+ <satoken.version>1.26.0</satoken.version>
<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.13</hutool.version>
@@ -121,11 +121,23 @@
<version>${velocity.version}</version>
</dependency>
- <!-- Token鐢熸垚涓庤В鏋�-->
+ <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jwt.version}</version>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot-starter</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+ <!-- Sa-Token 鏁村悎 Redis 锛堜娇鐢╦ackson搴忓垪鍖栨柟寮忥級 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-dao-redis-jackson</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+ <!-- Sa-Token鏁村悎SpringAOP瀹炵幇娉ㄨВ閴存潈 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-aop</artifactId>
+ <version>${satoken.version}</version>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
index 66749ef..081dade 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -1,11 +1,11 @@
package com.ruoyi.web.controller.monitor;
-import com.ruoyi.common.utils.StringUtils;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +24,7 @@
@Autowired
private RedisTemplate<String, String> redisTemplate;
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @SaCheckPermission("monitor:cache:list")
@GetMapping()
public AjaxResult getInfo() throws Exception
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index fb0b002..db9773f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.monitor;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,7 +10,6 @@
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -27,7 +27,7 @@
@Autowired
private ISysLogininforService logininforService;
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+ @SaCheckPermission("monitor:logininfor:list")
@GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor)
{
@@ -35,7 +35,7 @@
}
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+ @SaCheckPermission("monitor:logininfor:export")
@GetMapping("/export")
public void export(SysLogininfor logininfor, HttpServletResponse response)
{
@@ -43,7 +43,7 @@
ExcelUtil.exportExcel(list, "鐧诲綍鏃ュ織", SysLogininfor.class, response);
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
@@ -51,7 +51,7 @@
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
index 02a926d..950a607 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.monitor;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,7 +10,6 @@
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -27,7 +27,7 @@
@Autowired
private ISysOperLogService operLogService;
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+ @SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
{
@@ -35,7 +35,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+ @SaCheckPermission("monitor:operlog:export")
@GetMapping("/export")
public void export(SysOperLog operLog, HttpServletResponse response)
{
@@ -44,7 +44,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds)
{
@@ -52,7 +52,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean")
public AjaxResult clean()
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index 9c83609..fadb9aa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -1,25 +1,27 @@
package com.ruoyi.web.controller.monitor;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
@@ -28,60 +30,47 @@
*/
@RestController
@RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
-{
- @Autowired
- private ISysUserOnlineService userOnlineService;
+public class SysUserOnlineController extends BaseController {
- @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+ @SaCheckPermission("monitor:online:list")
@GetMapping("/list")
- public TableDataInfo list(String ipaddr, String userName)
- {
- Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
- List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
- for (String key : keys)
- {
- LoginUser user = RedisUtils.getCacheObject(key);
- if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
- {
- if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
- }
- }
- else if (StringUtils.isNotEmpty(ipaddr))
- {
- if (StringUtils.equals(ipaddr, user.getIpaddr()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
- }
- }
- else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
- {
- if (StringUtils.equals(userName, user.getUsername()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
- }
- }
- else
- {
- userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
- }
+ public TableDataInfo list(String ipaddr, String userName) {
+ Collection<String> keys = RedisUtils.keys(Constants.ONLINE_TOKEN_KEY + "*");
+ List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
+ for (String key : keys) {
+ userOnlineDTOList.add(RedisUtils.getCacheObject(key));
}
- Collections.reverse(userOnlineList);
- userOnlineList.removeAll(Collections.singleton(null));
+ if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+ userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+ StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+ StringUtils.equals(userName, userOnline.getUserName())
+ ).collect(Collectors.toList());
+ } else if (StringUtils.isNotEmpty(ipaddr)) {
+ userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+ StringUtils.equals(ipaddr, userOnline.getIpaddr()))
+ .collect(Collectors.toList());
+ } else if (StringUtils.isNotEmpty(userName)) {
+ userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+ StringUtils.equals(userName, userOnline.getUserName())
+ ).collect(Collectors.toList());
+ }
+ Collections.reverse(userOnlineDTOList);
+ userOnlineDTOList.removeAll(Collections.singleton(null));
+ List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
return PageUtils.buildDataInfo(userOnlineList);
}
/**
* 寮洪��鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+ @SaCheckPermission("monitor:online:forceLogout")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
- public AjaxResult forceLogout(@PathVariable String tokenId)
- {
- RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+ public AjaxResult forceLogout(@PathVariable String tokenId) {
+ try {
+ StpUtil.logoutByTokenValue(tokenId);
+ } catch (NotLoginException e) {
+ }
return AjaxResult.success();
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 13fdc67..f0b2e6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.UserConstants;
@@ -11,7 +12,6 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -33,7 +33,7 @@
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @SaCheckPermission("system:config:list")
@GetMapping("/list")
public TableDataInfo list(SysConfig config)
{
@@ -41,7 +41,7 @@
}
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
+ @SaCheckPermission("system:config:export")
@GetMapping("/export")
public void export(SysConfig config, HttpServletResponse response)
{
@@ -52,7 +52,7 @@
/**
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:config:query')")
+ @SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long configId)
{
@@ -71,7 +71,7 @@
/**
* 鏂板鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:add')")
+ @SaCheckPermission("system:config:add")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
@@ -81,14 +81,13 @@
{
return AjaxResult.error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
- config.setCreateBy(getUsername());
return toAjax(configService.insertConfig(config));
}
/**
* 淇敼鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ @SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysConfig config)
@@ -97,14 +96,13 @@
{
return AjaxResult.error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
- config.setUpdateBy(getUsername());
return toAjax(configService.updateConfig(config));
}
/**
* 鍒犻櫎鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
public AjaxResult remove(@PathVariable Long[] configIds)
@@ -116,7 +114,7 @@
/**
* 鍒锋柊鍙傛暟缂撳瓨
*/
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
public AjaxResult refreshCache()
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index fc26e97..de5bb73 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
@@ -10,7 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -34,7 +34,7 @@
/**
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @SaCheckPermission("system:dept:list")
@GetMapping("/list")
public AjaxResult list(SysDept dept)
{
@@ -45,7 +45,7 @@
/**
* 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
*/
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @SaCheckPermission("system:dept:list")
@GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
@@ -66,7 +66,7 @@
/**
* 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:dept:query')")
+ @SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId)
{
@@ -100,7 +100,7 @@
/**
* 鏂板閮ㄩ棬
*/
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
+ @SaCheckPermission("system:dept:add")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -109,14 +109,13 @@
{
return AjaxResult.error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
- dept.setCreateBy(getUsername());
return toAjax(deptService.insertDept(dept));
}
/**
* 淇敼閮ㄩ棬
*/
- @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+ @SaCheckPermission("system:dept:edit")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -134,14 +133,13 @@
{
return AjaxResult.error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
}
- dept.setUpdateBy(getUsername());
return toAjax(deptService.updateDept(dept));
}
/**
* 鍒犻櫎閮ㄩ棬
*/
- @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+ @SaCheckPermission("system:dept:remove")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 6462a0c..9108360 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -11,7 +12,6 @@
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -34,7 +34,7 @@
@Autowired
private ISysDictTypeService dictTypeService;
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
{
@@ -42,7 +42,7 @@
}
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ @SaCheckPermission("system:dict:export")
@GetMapping("/export")
public void export(SysDictData dictData, HttpServletResponse response)
{
@@ -53,7 +53,7 @@
/**
* 鏌ヨ瀛楀吀鏁版嵁璇︾粏
*/
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable Long dictCode)
{
@@ -77,31 +77,29 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
- dict.setCreateBy(getUsername());
return toAjax(dictDataService.insertDictData(dict));
}
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
- dict.setUpdateBy(getUsername());
return toAjax(dictDataService.updateDictData(dict));
}
/**
* 鍒犻櫎瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index eb5c0b5..a5b6806 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -10,7 +11,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +29,7 @@
@Autowired
private ISysDictTypeService dictTypeService;
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
@@ -37,7 +37,7 @@
}
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ @SaCheckPermission("system:dict:export")
@GetMapping("/export")
public void export(SysDictType dictType, HttpServletResponse response)
{
@@ -48,7 +48,7 @@
/**
* 鏌ヨ瀛楀吀绫诲瀷璇︾粏
*/
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId)
{
@@ -58,7 +58,7 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictType dict)
@@ -67,14 +67,13 @@
{
return AjaxResult.error("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
}
- dict.setCreateBy(getUsername());
return toAjax(dictTypeService.insertDictType(dict));
}
/**
* 淇敼瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
@@ -83,14 +82,13 @@
{
return AjaxResult.error("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
}
- dict.setUpdateBy(getUsername());
return toAjax(dictTypeService.updateDictType(dict));
}
/**
* 鍒犻櫎瀛楀吀绫诲瀷
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds)
@@ -102,7 +100,7 @@
/**
* 鍒锋柊瀛楀吀缂撳瓨
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
public AjaxResult refreshCache()
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 287d4c5..ccfae25 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,14 +1,17 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +40,9 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private ISysUserService iSysUserService;
+
/**
* 鐧诲綍鏂规硶
*
@@ -54,6 +60,15 @@
return AjaxResult.success(ajax);
}
+ @PostMapping("/logout")
+ public AjaxResult logout(){
+ try {
+ StpUtil.logout();
+ } catch (NotLoginException e) {
+ }
+ return AjaxResult.success("閫�鍑烘垚鍔�");
+ }
+
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
*
@@ -62,7 +77,7 @@
@GetMapping("getInfo")
public AjaxResult getInfo()
{
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser user = SecurityUtils.getUser();
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -82,8 +97,7 @@
@GetMapping("getRouters")
public AjaxResult getRouters()
{
- Long userId = SecurityUtils.getUserId();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(SecurityUtils.getUserId());
return AjaxResult.success(menuService.buildMenus(menus));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index d679bfb..9ab5796 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -9,7 +10,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@
/**
* 鑾峰彇鑿滃崟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:menu:list')")
+ @SaCheckPermission("system:menu:list")
@GetMapping("/list")
public AjaxResult list(SysMenu menu)
{
@@ -43,7 +43,7 @@
/**
* 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
+ @SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId)
{
@@ -76,7 +76,7 @@
/**
* 鏂板鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:add')")
+ @SaCheckPermission("system:menu:add")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu)
@@ -89,14 +89,13 @@
{
return AjaxResult.error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
- menu.setCreateBy(getUsername());
return toAjax(menuService.insertMenu(menu));
}
/**
* 淇敼鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+ @SaCheckPermission("system:menu:edit")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
@@ -113,14 +112,13 @@
{
return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
- menu.setUpdateBy(getUsername());
return toAjax(menuService.updateMenu(menu));
}
/**
* 鍒犻櫎鑿滃崟
*/
- @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+ @SaCheckPermission("system:menu:remove")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index 55375a9..58fa908 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -1,17 +1,6 @@
package com.ruoyi.web.controller.system;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,6 +8,9 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
/**
* 鍏憡 淇℃伅鎿嶄綔澶勭悊
@@ -35,7 +27,7 @@
/**
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
+ @SaCheckPermission("system:notice:list")
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{
@@ -45,7 +37,7 @@
/**
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
+ @SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId)
{
@@ -55,31 +47,29 @@
/**
* 鏂板閫氱煡鍏憡
*/
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
+ @SaCheckPermission("system:notice:add")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysNotice notice)
{
- notice.setCreateBy(getUsername());
return toAjax(noticeService.insertNotice(notice));
}
/**
* 淇敼閫氱煡鍏憡
*/
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+ @SaCheckPermission("system:notice:edit")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysNotice notice)
{
- notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
}
/**
* 鍒犻櫎閫氱煡鍏憡
*/
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+ @SaCheckPermission("system:notice:remove")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
index e72bd1f..22c0531 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -16,7 +17,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -44,7 +44,7 @@
* 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
*/
@ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:oss:list')")
+ @SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
return iSysOssConfigService.queryPageList(bo);
@@ -54,7 +54,7 @@
* 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:oss:query')")
+ @SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}")
public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("ossConfigId") Integer ossConfigId) {
@@ -65,7 +65,7 @@
* 鏂板瀵硅薄瀛樺偍閰嶇疆
*/
@ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:add')")
+ @SaCheckPermission("system:oss:add")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -77,7 +77,7 @@
* 淇敼瀵硅薄瀛樺偍閰嶇疆
*/
@ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -89,7 +89,7 @@
* 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
*/
@ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+ @SaCheckPermission("system:oss:remove")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@@ -100,7 +100,7 @@
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index 5778b2a..4acc311 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpException;
@@ -30,7 +31,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -63,7 +63,7 @@
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
@ApiOperation("鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:oss:list')")
+ @SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) {
return iSysOssService.queryPageList(bo);
@@ -76,7 +76,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "鏂囦欢", dataType = "java.io.File", required = true),
})
- @PreAuthorize("@ss.hasPermi('system:oss:upload')")
+ @SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping("/upload")
@@ -92,7 +92,7 @@
}
@ApiOperation("涓嬭浇OSS瀵硅薄瀛樺偍")
- @PreAuthorize("@ss.hasPermi('system:oss:download')")
+ @SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
SysOss sysOss = iSysOssService.getById(ossId);
@@ -121,7 +121,7 @@
* 鍒犻櫎OSS瀵硅薄瀛樺偍
*/
@ApiOperation("鍒犻櫎OSS瀵硅薄瀛樺偍")
- @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+ @SaCheckPermission("system:oss:remove")
@Log(title = "OSS瀵硅薄瀛樺偍" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ossIds}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@@ -133,7 +133,7 @@
* 鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��
*/
@ApiOperation("鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "OSS瀵硅薄瀛樺偍" , businessType = BusinessType.UPDATE)
@PutMapping("/changePreviewListResource")
public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index 93d4d46..4f4eb4f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -10,7 +11,6 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@
/**
* 鑾峰彇宀椾綅鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:post:list')")
+ @SaCheckPermission("system:post:list")
@GetMapping("/list")
public TableDataInfo list(SysPost post)
{
@@ -40,7 +40,7 @@
}
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:post:export')")
+ @SaCheckPermission("system:post:export")
@GetMapping("/export")
public void export(SysPost post, HttpServletResponse response)
{
@@ -51,7 +51,7 @@
/**
* 鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:post:query')")
+ @SaCheckPermission("system:post:query")
@GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId)
{
@@ -61,7 +61,7 @@
/**
* 鏂板宀椾綅
*/
- @PreAuthorize("@ss.hasPermi('system:post:add')")
+ @SaCheckPermission("system:post:add")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysPost post)
@@ -74,14 +74,13 @@
{
return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
- post.setCreateBy(getUsername());
return toAjax(postService.insertPost(post));
}
/**
* 淇敼宀椾綅
*/
- @PreAuthorize("@ss.hasPermi('system:post:edit')")
+ @SaCheckPermission("system:post:edit")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysPost post)
@@ -94,14 +93,13 @@
{
return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
- post.setUpdateBy(getUsername());
return toAjax(postService.updatePost(post));
}
/**
* 鍒犻櫎宀椾綅
*/
- @PreAuthorize("@ss.hasPermi('system:post:remove')")
+ @SaCheckPermission("system:post:remove")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 66dfd07..cf63ea6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -5,9 +5,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.core.service.TokenService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysOss;
@@ -34,9 +32,6 @@
private ISysUserService userService;
@Autowired
- private TokenService tokenService;
-
- @Autowired
private ISysOssService iSysOssService;
/**
@@ -45,12 +40,11 @@
@GetMapping
public AjaxResult profile()
{
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
+ SysUser user = userService.getById(getUserId());
Map<String,Object> ajax = new HashMap<>();
ajax.put("user", user);
- ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
- ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+ ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
+ ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
return AjaxResult.success(ajax);
}
@@ -71,18 +65,10 @@
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- LoginUser loginUser = getLoginUser();
- SysUser sysUser = loginUser.getUser();
- user.setUserId(sysUser.getUserId());
+ user.setUserId(getUserId());
user.setPassword(null);
if (userService.updateUserProfile(user) > 0)
{
- // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
- sysUser.setNickName(user.getNickName());
- sysUser.setPhonenumber(user.getPhonenumber());
- sysUser.setEmail(user.getEmail());
- sysUser.setSex(user.getSex());
- tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -95,9 +81,9 @@
@PutMapping("/updatePwd")
public AjaxResult updatePwd(String oldPassword, String newPassword)
{
- LoginUser loginUser = getLoginUser();
- String userName = loginUser.getUsername();
- String password = loginUser.getPassword();
+ SysUser user = SecurityUtils.getUser();
+ String userName = user.getUserName();
+ String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
{
return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
@@ -108,9 +94,6 @@
}
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
{
- // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
- loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
- tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -125,16 +108,13 @@
{
if (!file.isEmpty())
{
- LoginUser loginUser = getLoginUser();
+ SysUser user = SecurityUtils.getUser();
SysOss oss = iSysOssService.upload(file);
String avatar = oss.getUrl();
- if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+ if (userService.updateUserAvatar(user.getUserName(), avatar))
{
Map<String,Object> ajax = new HashMap<>();
ajax.put("imgUrl", avatar);
- // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
- loginUser.getUser().setAvatar(avatar);
- tokenService.setLoginUser(loginUser);
return AjaxResult.success(ajax);
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index e5f4032..80a4621 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -1,23 +1,19 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.core.service.TokenService;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.SysPermissionService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -37,15 +33,9 @@
private ISysRoleService roleService;
@Autowired
- private TokenService tokenService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Autowired
private ISysUserService userService;
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @SaCheckPermission("system:role:list")
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
@@ -53,7 +43,7 @@
}
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:role:export')")
+ @SaCheckPermission("system:role:export")
@GetMapping("/export")
public void export(SysRole role, HttpServletResponse response)
{
@@ -64,7 +54,7 @@
/**
* 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId)
{
@@ -75,7 +65,7 @@
/**
* 鏂板瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:role:add')")
+ @SaCheckPermission("system:role:add")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysRole role)
@@ -88,7 +78,6 @@
{
return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
- role.setCreateBy(getUsername());
return toAjax(roleService.insertRole(role));
}
@@ -96,7 +85,7 @@
/**
* 淇敼淇濆瓨瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysRole role)
@@ -110,18 +99,9 @@
{
return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
- role.setUpdateBy(getUsername());
if (roleService.updateRole(role) > 0)
{
- // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
- LoginUser loginUser = getLoginUser();
- if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
- {
- loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
- loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
- tokenService.setLoginUser(loginUser);
- }
return AjaxResult.success();
}
return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -130,7 +110,7 @@
/**
* 淇敼淇濆瓨鏁版嵁鏉冮檺
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role)
@@ -142,20 +122,19 @@
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
- role.setUpdateBy(getUsername());
return toAjax(roleService.updateRoleStatus(role));
}
/**
* 鍒犻櫎瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:role:remove')")
+ @SaCheckPermission("system:role:remove")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds)
@@ -166,7 +145,7 @@
/**
* 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @SaCheckPermission("system:role:query")
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
@@ -176,7 +155,7 @@
/**
* 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @SaCheckPermission("system:role:list")
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
@@ -186,7 +165,7 @@
/**
* 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @SaCheckPermission("system:role:list")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
@@ -196,7 +175,7 @@
/**
* 鍙栨秷鎺堟潈鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
@@ -207,7 +186,7 @@
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -218,7 +197,7 @@
/**
* 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
*/
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 28c9f15..f080bbb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -21,7 +22,6 @@
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -54,7 +54,7 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @SaCheckPermission("system:user:list")
@GetMapping("/list")
public TableDataInfo list(SysUser user)
{
@@ -62,7 +62,7 @@
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:user:export')")
+ @SaCheckPermission("system:user:export")
@GetMapping("/export")
public void export(SysUser user, HttpServletResponse response)
{
@@ -80,13 +80,13 @@
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
- @PreAuthorize("@ss.hasPermi('system:user:import')")
+ @SaCheckPermission("system:user:import")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
- String operName = getUsername();
+ String operName = userService.getById(getUserId()).getUserName();
String message = userService.importUser(userList, updateSupport, operName);
return AjaxResult.success(message);
}
@@ -100,7 +100,7 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:user:query')")
+ @SaCheckPermission("system:user:query")
@GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
{
@@ -121,7 +121,7 @@
/**
* 鏂板鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:user:add')")
+ @SaCheckPermission("system:user:add")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
@@ -140,7 +140,6 @@
{
return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
}
@@ -148,7 +147,7 @@
/**
* 淇敼鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysUser user)
@@ -164,14 +163,13 @@
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- user.setUpdateBy(getUsername());
return toAjax(userService.updateUser(user));
}
/**
* 鍒犻櫎鐢ㄦ埛
*/
- @PreAuthorize("@ss.hasPermi('system:user:remove')")
+ @SaCheckPermission("system:user:remove")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds)
@@ -186,34 +184,32 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+ @SaCheckPermission("system:user:resetPwd")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
}
/**
* 鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
- user.setUpdateBy(getUsername());
return toAjax(userService.updateUserStatus(user));
}
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:user:query')")
+ @SaCheckPermission("system:user:query")
@GetMapping("/authRole/{userId}")
public AjaxResult authRole(@PathVariable("userId") Long userId)
{
@@ -228,7 +224,7 @@
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
*/
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index fa95235..f519c3b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -97,14 +97,24 @@
# 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
fail_on_unknown_properties: false
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+# Sa-Token閰嶇疆
+sa-token:
+ # token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
+ token-name: Authorization
+ # token鏈夋晥鏈燂紝鍗曚綅s 榛樿30澶�, -1浠ｈ〃姘镐笉杩囨湡
+ timeout: 2592000
+ # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鍐呮棤鎿嶄綔灏辫涓簍oken杩囨湡) 鍗曚綅: 绉�
+ activity-timeout: 1800
+ # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
+ is-concurrent: true
+ # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
+ is-share: false
+ # token鍓嶇紑
+ token-prefix: "Bearer"
+ # token椋庢牸
+ token-style: random-128
+ # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
+ is-log: true
# 閲嶅鎻愪氦
repeat-submit:
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 5ed9c92..310e0ed 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -29,10 +29,20 @@
<artifactId>spring-web</artifactId>
</dependency>
- <!-- spring security 瀹夊叏璁よ瘉 -->
+ <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot-starter</artifactId>
+ </dependency>
+ <!-- Sa-Token 鏁村悎 Redis 锛堜娇鐢╦ackson搴忓垪鍖栨柟寮忥級 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-dao-redis-jackson</artifactId>
+ </dependency>
+ <!-- Sa-Token鏁村悎SpringAOP瀹炵幇娉ㄨВ閴存潈 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-aop</artifactId>
</dependency>
<!-- 鑷畾涔夐獙璇佹敞瑙� -->
@@ -70,11 +80,11 @@
<artifactId>snakeyaml</artifactId>
</dependency>
- <!--Token鐢熸垚涓庤В鏋�-->
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- </dependency>
+<!-- <!–Token鐢熸垚涓庤В鏋�–>-->
+<!-- <dependency>-->
+<!-- <groupId>io.jsonwebtoken</groupId>-->
+<!-- <artifactId>jjwt</artifactId>-->
+<!-- </dependency>-->
<!-- redis 缂撳瓨鎿嶄綔 -->
<dependency>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index c2cb29d..9243a4e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -1,7 +1,5 @@
package com.ruoyi.common.constant;
-import io.jsonwebtoken.Claims;
-
/**
* 閫氱敤甯搁噺淇℃伅
*
@@ -70,6 +68,11 @@
public static final String LOGIN_TOKEN_KEY = "login_tokens:";
/**
+ * 鍦ㄧ嚎鐢ㄦ埛 redis key
+ */
+ public static final String ONLINE_TOKEN_KEY = "online_tokens:";
+
+ /**
* 闃查噸鎻愪氦 redis key
*/
public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
@@ -92,37 +95,7 @@
/**
* 浠ょ墝鍓嶇紑
*/
- public static final String TOKEN_PREFIX = "Bearer ";
-
- /**
- * 浠ょ墝鍓嶇紑
- */
public static final String LOGIN_USER_KEY = "login_user_key";
-
- /**
- * 鐢ㄦ埛ID
- */
- public static final String JWT_USERID = "userid";
-
- /**
- * 鐢ㄦ埛鍚嶇О
- */
- public static final String JWT_USERNAME = Claims.SUBJECT;
-
- /**
- * 鐢ㄦ埛澶村儚
- */
- public static final String JWT_AVATAR = "avatar";
-
- /**
- * 鍒涘缓鏃堕棿
- */
- public static final String JWT_CREATED = "created";
-
- /**
- * 鐢ㄦ埛鏉冮檺
- */
- public static final String JWT_AUTHORITIES = "authorities";
/**
* 鍙傛暟绠＄悊 cache key
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 04a21a7..a457538 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -1,7 +1,7 @@
package com.ruoyi.common.core.controller;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.slf4j.Logger;
@@ -81,17 +81,16 @@
/**
* 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅
*/
- public LoginUser getLoginUser()
+ public SysUser getUser()
{
- return SecurityUtils.getLoginUser();
+ return SecurityUtils.getUser();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛id
*/
- public Long getUserId()
- {
- return getLoginUser().getUserId();
+ public Long getUserId() {
+ return SecurityUtils.getUserId();
}
/**
@@ -99,7 +98,7 @@
*/
public Long getDeptId()
{
- return getLoginUser().getDeptId();
+ return SecurityUtils.getDeptId();
}
/**
@@ -107,6 +106,6 @@
*/
public String getUsername()
{
- return getLoginUser().getUsername();
+ return SecurityUtils.getUsername();
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
new file mode 100644
index 0000000..5eb5280
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
@@ -0,0 +1,62 @@
+package com.ruoyi.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 褰撳墠鍦ㄧ嚎浼氳瘽
+ *
+ * @author ruoyi
+ */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class UserOnlineDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浼氳瘽缂栧彿
+ */
+ private String tokenId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
+
+ /**
+ * 鐢ㄦ埛鍚嶇О
+ */
+ private String userName;
+
+ /**
+ * 鐧诲綍IP鍦板潃
+ */
+ private String ipaddr;
+
+ /**
+ * 鐧诲綍鍦板潃
+ */
+ private String loginLocation;
+
+ /**
+ * 娴忚鍣ㄧ被鍨�
+ */
+ private String browser;
+
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ private String os;
+
+ /**
+ * 鐧诲綍鏃堕棿
+ */
+ private Long loginTime;
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
deleted file mode 100644
index 7bc072a..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.ruoyi.common.core.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
- *
- * @author ruoyi
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class LoginUser implements UserDetails
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐢ㄦ埛ID
- */
- private Long userId;
-
- /**
- * 閮ㄩ棬ID
- */
- private Long deptId;
-
- /**
- * 鐢ㄦ埛鍞竴鏍囪瘑
- */
- private String token;
-
- /**
- * 鐧诲綍鏃堕棿
- */
- private Long loginTime;
-
- /**
- * 杩囨湡鏃堕棿
- */
- private Long expireTime;
-
- /**
- * 鐧诲綍IP鍦板潃
- */
- private String ipaddr;
-
- /**
- * 鐧诲綍鍦扮偣
- */
- private String loginLocation;
-
- /**
- * 娴忚鍣ㄧ被鍨�
- */
- private String browser;
-
- /**
- * 鎿嶄綔绯荤粺
- */
- private String os;
-
- /**
- * 鏉冮檺鍒楄〃
- */
- private Set<String> permissions;
-
- /**
- * 鐢ㄦ埛淇℃伅
- */
- private SysUser user;
-
- public LoginUser(SysUser user, Set<String> permissions)
- {
- this.user = user;
- this.permissions = permissions;
- }
-
- public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
- {
- this.userId = userId;
- this.deptId = deptId;
- this.user = user;
- this.permissions = permissions;
- }
-
- @JsonIgnore
- @Override
- public String getPassword()
- {
- return user.getPassword();
- }
-
- @Override
- public String getUsername()
- {
- return user.getUserName();
- }
-
- /**
- * 璐︽埛鏄惁鏈繃鏈�,杩囨湡鏃犳硶楠岃瘉
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonExpired()
- {
- return true;
- }
-
- /**
- * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonLocked()
- {
- return true;
- }
-
- /**
- * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isCredentialsNonExpired()
- {
- return true;
- }
-
- /**
- * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isEnabled()
- {
- return true;
- }
-
- @Override
- public Collection<? extends GrantedAuthority> getAuthorities()
- {
- return null;
- }
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/IUserService.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/IUserService.java
new file mode 100644
index 0000000..e474892
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/IUserService.java
@@ -0,0 +1,28 @@
+package com.ruoyi.common.core.service;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+
+/**
+ * 鐢ㄦ埛 涓氬姟灞�
+ *
+ * @author ruoyi
+ */
+public interface IUserService {
+
+ /**
+ * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
+ *
+ * @param userName 鐢ㄦ埛鍚�
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ public SysUser selectUserByUserName(String userName);
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ public SysUser selectUserById(Long userId);
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java
deleted file mode 100644
index d9a9f0a..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.common.core.service;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * token楠岃瘉澶勭悊
- *
- * @author Lion Li
- */
-public interface TokenService {
-
- /**
- * 鑾峰彇鐢ㄦ埛韬唤淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- LoginUser getLoginUser(HttpServletRequest request);
-
- /**
- * 璁剧疆鐢ㄦ埛韬唤淇℃伅
- */
- void setLoginUser(LoginUser loginUser);
-
- /**
- * 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
- */
- void delLoginUser(String token);
-
- /**
- * 鍒涘缓浠ょ墝
- *
- * @param loginUser 鐢ㄦ埛淇℃伅
- * @return 浠ょ墝
- */
- String createToken(LoginUser loginUser);
-
- /**
- * 楠岃瘉浠ょ墝鏈夋晥鏈燂紝鐩稿樊涓嶈冻20鍒嗛挓锛岃嚜鍔ㄥ埛鏂扮紦瀛�
- *
- * @param loginUser
- * @return 浠ょ墝
- */
- void verifyToken(LoginUser loginUser);
-
- /**
- * 鍒锋柊浠ょ墝鏈夋晥鏈�
- *
- * @param loginUser 鐧诲綍淇℃伅
- */
- void refreshToken(LoginUser loginUser);
-
- /**
- * 璁剧疆鐢ㄦ埛浠ｇ悊淇℃伅
- *
- * @param loginUser 鐧诲綍淇℃伅
- */
- void setUserAgent(LoginUser loginUser);
-
- /**
- * 浠庝护鐗屼腑鑾峰彇鐢ㄦ埛鍚�
- *
- * @param token 浠ょ墝
- * @return 鐢ㄦ埛鍚�
- */
- String getUsernameFromToken(String token);
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java
deleted file mode 100644
index 927a941..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.common.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * token 閰嶇疆灞炴��
- *
- * @author Lion Li
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "token")
-public class TokenProperties {
-
- /**
- * 浠ょ墝鑷畾涔夋爣璇�
- */
- private String header;
-
- /**
- * 浠ょ墝绉橀挜
- */
- private String secret;
-
- /**
- * 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- */
- private int expireTime;
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index 969eaf5..1500975 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -1,11 +1,12 @@
package com.ruoyi.common.utils;
+import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.HttpStatus;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.service.IUserService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* 瀹夊叏鏈嶅姟宸ュ叿绫�
@@ -19,14 +20,7 @@
**/
public static Long getUserId()
{
- try
- {
- return getLoginUser().getUserId();
- }
- catch (Exception e)
- {
- throw new ServiceException("鑾峰彇鐢ㄦ埛ID寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
- }
+ return StpUtil.getLoginIdAsLong();
}
/**
@@ -36,7 +30,7 @@
{
try
{
- return getLoginUser().getDeptId();
+ return getUser().getDeptId();
}
catch (Exception e)
{
@@ -51,7 +45,7 @@
{
try
{
- return getLoginUser().getUsername();
+ return getUser().getUserName();
}
catch (Exception e)
{
@@ -62,24 +56,16 @@
/**
* 鑾峰彇鐢ㄦ埛
**/
- public static LoginUser getLoginUser()
+ public static SysUser getUser()
{
try
{
- return (LoginUser) getAuthentication().getPrincipal();
+ return SpringUtils.getBean(IUserService.class).selectUserById(getUserId());
}
catch (Exception e)
{
throw new ServiceException("鑾峰彇鐢ㄦ埛淇℃伅寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
}
- }
-
- /**
- * 鑾峰彇Authentication
- */
- public static Authentication getAuthentication()
- {
- return SecurityContextHolder.getContext().getAuthentication();
}
/**
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
index a3a9d22..660e32e 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
@@ -1,5 +1,6 @@
package com.ruoyi.demo.controller;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -17,7 +18,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,7 +47,7 @@
* 鏌ヨ娴嬭瘯鍗曡〃鍒楄〃
*/
@ApiOperation("鏌ヨ娴嬭瘯鍗曡〃鍒楄〃")
- @PreAuthorize("@ss.hasPermi('demo:demo:list')")
+ @SaCheckPermission("demo:demo:list")
@GetMapping("/list")
public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo) {
return iTestDemoService.queryPageList(bo);
@@ -57,7 +57,7 @@
* 鑷畾涔夊垎椤垫煡璇�
*/
@ApiOperation("鑷畾涔夊垎椤垫煡璇�")
- @PreAuthorize("@ss.hasPermi('demo:demo:list')")
+ @SaCheckPermission("demo:demo:list")
@GetMapping("/page")
public TableDataInfo<TestDemoVo> page(@Validated TestDemoBo bo) {
return iTestDemoService.customPageList(bo);
@@ -67,7 +67,7 @@
* 瀵煎嚭娴嬭瘯鍗曡〃鍒楄〃
*/
@ApiOperation("瀵煎嚭娴嬭瘯鍗曡〃鍒楄〃")
- @PreAuthorize("@ss.hasPermi('demo:demo:export')")
+ @SaCheckPermission("demo:demo:export")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public void export(@Validated TestDemoBo bo, HttpServletResponse response) {
@@ -83,7 +83,7 @@
* 鑾峰彇娴嬭瘯鍗曡〃璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇娴嬭瘯鍗曡〃璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('demo:demo:query')")
+ @SaCheckPermission("demo:demo:query")
@GetMapping("/{id}")
public AjaxResult<TestDemoVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("id") Long id) {
@@ -94,7 +94,7 @@
* 鏂板娴嬭瘯鍗曡〃
*/
@ApiOperation("鏂板娴嬭瘯鍗曡〃")
- @PreAuthorize("@ss.hasPermi('demo:demo:add')")
+ @SaCheckPermission("demo:demo:add")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.INSERT)
@RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "涓嶅厑璁搁噸澶嶆彁浜�")
@PostMapping()
@@ -106,7 +106,7 @@
* 淇敼娴嬭瘯鍗曡〃
*/
@ApiOperation("淇敼娴嬭瘯鍗曡〃")
- @PreAuthorize("@ss.hasPermi('demo:demo:edit')")
+ @SaCheckPermission("demo:demo:edit")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
@@ -118,7 +118,7 @@
* 鍒犻櫎娴嬭瘯鍗曡〃
*/
@ApiOperation("鍒犻櫎娴嬭瘯鍗曡〃")
- @PreAuthorize("@ss.hasPermi('demo:demo:remove')")
+ @SaCheckPermission("demo:demo:remove")
@Log(title = "娴嬭瘯鍗曡〃" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
index c34c77c..f1d3b3c 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
@@ -1,5 +1,6 @@
package com.ruoyi.demo.controller;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -16,7 +17,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -45,7 +45,7 @@
* 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃
*/
@ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
- @PreAuthorize("@ss.hasPermi('demo:tree:list')")
+ @SaCheckPermission("demo:tree:list")
@GetMapping("/list")
public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
List<TestTreeVo> list = iTestTreeService.queryList(bo);
@@ -56,7 +56,7 @@
* 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃
*/
@ApiOperation("瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃")
- @PreAuthorize("@ss.hasPermi('demo:tree:export')")
+ @SaCheckPermission("demo:tree:export")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public void export(@Validated TestTreeBo bo, HttpServletResponse response) {
@@ -68,7 +68,7 @@
* 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('demo:tree:query')")
+ @SaCheckPermission("demo:tree:query")
@GetMapping("/{id}")
public AjaxResult<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("id") Long id) {
@@ -79,7 +79,7 @@
* 鏂板娴嬭瘯鏍戣〃
*/
@ApiOperation("鏂板娴嬭瘯鏍戣〃")
- @PreAuthorize("@ss.hasPermi('demo:tree:add')")
+ @SaCheckPermission("demo:tree:add")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
@@ -91,7 +91,7 @@
* 淇敼娴嬭瘯鏍戣〃
*/
@ApiOperation("淇敼娴嬭瘯鏍戣〃")
- @PreAuthorize("@ss.hasPermi('demo:tree:edit')")
+ @SaCheckPermission("demo:tree:edit")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
@@ -103,7 +103,7 @@
* 鍒犻櫎娴嬭瘯鏍戣〃
*/
@ApiOperation("鍒犻櫎娴嬭瘯鏍戣〃")
- @PreAuthorize("@ss.hasPermi('demo:tree:remove')")
+ @SaCheckPermission("demo:tree:remove")
@Log(title = "娴嬭瘯鏍戣〃" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index e4a6cdc..393b2e6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -4,7 +4,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
@@ -62,14 +61,11 @@
protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
// 鑾峰彇褰撳墠鐨勭敤鎴�
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNotNull(loginUser)) {
- SysUser currentUser = loginUser.getUser();
- // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
- if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
- dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
- controllerDataScope.userAlias(), controllerDataScope.isUser());
- }
+ SysUser currentUser = SecurityUtils.getUser();
+ // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
+ if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
+ dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
+ controllerDataScope.userAlias(), controllerDataScope.isUser());
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 642076d..78a4b62 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -2,7 +2,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.dto.OperLogDTO;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.OperLogService;
import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.enums.HttpMethod;
@@ -61,7 +61,7 @@
try {
// 鑾峰彇褰撳墠鐨勭敤鎴�
- LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser sysUser = SecurityUtils.getUser();
// *========鏁版嵁搴撴棩蹇�=========*//
OperLogDTO operLog = new OperLogDTO();
@@ -70,8 +70,8 @@
String ip = ServletUtils.getClientIP();
operLog.setOperIp(ip);
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
- if (loginUser != null) {
- operLog.setOperName(loginUser.getUsername());
+ if (sysUser != null) {
+ operLog.setOperName(sysUser.getUserName());
}
if (e != null) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
index 41116d8..bb8b0f1 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
@@ -1,5 +1,6 @@
package com.ruoyi.framework.aspectj;
+import cn.dev33.satoken.SaManager;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.lock.LockInfo;
@@ -7,7 +8,6 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.properties.TokenProperties;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.properties.RepeatSubmitProperties;
@@ -32,7 +32,6 @@
@Component
public class RepeatSubmitAspect {
- private final TokenProperties tokenProperties;
private final RepeatSubmitProperties repeatSubmitProperties;
private final LockTemplate lockTemplate;
@@ -53,7 +52,7 @@
String url = request.getRequestURI();
// 鍞竴鍊硷紙娌℃湁娑堟伅澶村垯浣跨敤璇锋眰鍦板潃锛�
- String submitKey = request.getHeader(tokenProperties.getHeader());
+ String submitKey = request.getHeader(SaManager.getConfig().getTokenName());
if (StringUtils.isEmpty(submitKey)) {
submitKey = url;
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
deleted file mode 100644
index e30f83c..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.framework.config;
-
-import com.ruoyi.common.exception.ServiceException;
-import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.security.concurrent.DelegatingSecurityContextExecutorService;
-
-import java.util.Arrays;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * 寮傛閰嶇疆
- *
- * @author Lion Li
- */
-@EnableAsync
-@Configuration
-public class AsyncConfig extends AsyncConfigurerSupport {
-
- @Autowired
- @Qualifier("scheduledExecutorService")
- private ScheduledExecutorService scheduledExecutorService;
-
- /**
- * 寮傛鎵ц闇�瑕佷娇鐢ㄦ潈闄愭鏋惰嚜甯︾殑鍖呰绾跨▼姹� 淇濊瘉鏉冮檺淇℃伅鐨勪紶閫�
- */
- @Override
- public Executor getAsyncExecutor() {
- return new DelegatingSecurityContextExecutorService(scheduledExecutorService);
- }
-
- /**
- * 寮傛鎵ц寮傚父澶勭悊
- */
- @Override
- public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
- return (throwable, method, objects) -> {
- throwable.printStackTrace();
- throw new ServiceException(
- "Exception message - " + throwable.getMessage()
- + ", Method name - " + method.getName()
- + ", Parameter value - " + Arrays.toString(objects));
- };
- }
-
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index ddf4c70..3b19e57 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -1,12 +1,23 @@
package com.ruoyi.framework.config;
+import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+import cn.dev33.satoken.router.SaRouter;
+import cn.dev33.satoken.stp.StpUtil;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
/**
* 閫氱敤閰嶇疆
@@ -16,6 +27,49 @@
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {
+ // 娉ㄥ唽sa-token鐨勬嫤鎴櫒
+ @Override
+ public void addInterceptors(InterceptorRegistry registry) {
+ List<String> urlPath = Arrays.asList(
+ "/login",
+ "/logout",
+ "/captchaImage",
+ "/*.html",
+ "/**/*.html",
+ "/**/*.css",
+ "/**/*.js",
+ "/profile/**",
+ "/common/download**",
+ "/common/download/resource**",
+ "/swagger-ui.html",
+ "/swagger-resources/**",
+ "/webjars/**",
+ "/*/api-docs",
+ "/druid/**",
+ "/actuator",
+ "/actuator/**"
+ );
+ // 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
+ registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
+ // 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
+ SaRouter.match(
+ //鑾峰彇鎵�鏈夌殑
+ Collections.singletonList("/**"),
+ //鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
+ urlPath,
+ () -> {
+ Long userId = SecurityUtils.getUserId();
+ if(StringUtils.isNotNull(userId) ) {
+ long tokenTimeout = StpUtil.getTokenTimeout();
+ long tokenActivityTimeout = StpUtil.getTokenActivityTimeout();
+ System.out.println("鍓╀綑鏈夋晥鏃堕棿: " + tokenTimeout);
+ System.out.println("涓存椂鏈夋晥鏃堕棿: " + tokenActivityTimeout);
+ }
+ });
+ })).addPathPatterns("/**");
+ registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+ }
+
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
deleted file mode 100644
index bd6ee8f..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.ruoyi.framework.config;
-
-import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-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.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.logout.LogoutFilter;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * spring security閰嶇疆
- *
- * @author ruoyi
- */
-@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter
-{
- /**
- * 鑷畾涔夌敤鎴疯璇侀�昏緫
- */
- @Autowired
- private UserDetailsService userDetailsService;
-
- /**
- * 璁よ瘉澶辫触澶勭悊绫�
- */
- @Autowired
- private AuthenticationEntryPointImpl unauthorizedHandler;
-
- /**
- * 閫�鍑哄鐞嗙被
- */
- @Autowired
- private LogoutSuccessHandlerImpl logoutSuccessHandler;
-
- /**
- * token璁よ瘉杩囨护鍣�
- */
- @Autowired
- private JwtAuthenticationTokenFilter authenticationTokenFilter;
-
- /**
- * 璺ㄥ煙杩囨护鍣�
- */
- @Autowired
- private CorsFilter corsFilter;
-
- /**
- * 瑙ｅ喅 鏃犳硶鐩存帴娉ㄥ叆 AuthenticationManager
- *
- * @return
- * @throws Exception
- */
- @Bean
- @Override
- public AuthenticationManager authenticationManagerBean() throws Exception
- {
- return super.authenticationManagerBean();
- }
-
- /**
- * anyRequest | 鍖归厤鎵�鏈夎姹傝矾寰�
- * access | SpringEl琛ㄨ揪寮忕粨鏋滀负true鏃跺彲浠ヨ闂�
- * anonymous | 鍖垮悕鍙互璁块棶
- * denyAll | 鐢ㄦ埛涓嶈兘璁块棶
- * fullyAuthenticated | 鐢ㄦ埛瀹屽叏璁よ瘉鍙互璁块棶锛堥潪remember-me涓嬭嚜鍔ㄧ櫥褰曪級
- * hasAnyAuthority | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず鏉冮檺锛屽垯鍏朵腑浠讳綍涓�涓潈闄愬彲浠ヨ闂�
- * hasAnyRole | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず瑙掕壊锛屽垯鍏朵腑浠讳綍涓�涓鑹插彲浠ヨ闂�
- * hasAuthority | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず鏉冮檺锛屽垯鍏舵潈闄愬彲浠ヨ闂�
- * hasIpAddress | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧずIP鍦板潃锛屽鏋滅敤鎴稩P鍜屽弬鏁板尮閰嶏紝鍒欏彲浠ヨ闂�
- * hasRole | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず瑙掕壊锛屽垯鍏惰鑹插彲浠ヨ闂�
- * permitAll | 鐢ㄦ埛鍙互浠绘剰璁块棶
- * rememberMe | 鍏佽閫氳繃remember-me鐧诲綍鐨勭敤鎴疯闂�
- * authenticated | 鐢ㄦ埛鐧诲綍鍚庡彲璁块棶
- */
- @Override
- protected void configure(HttpSecurity httpSecurity) throws Exception
- {
- httpSecurity
- // CSRF绂佺敤锛屽洜涓轰笉浣跨敤session
- .csrf().disable()
- // 璁よ瘉澶辫触澶勭悊绫�
- .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
- // 鍩轰簬token锛屾墍浠ヤ笉闇�瑕乻ession
- .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
- // 杩囨护璇锋眰
- .authorizeRequests()
- // 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/register", "/captchaImage").anonymous()
- .antMatchers(
- HttpMethod.GET,
- "/",
- "/*.html",
- "/**/*.html",
- "/**/*.css",
- "/**/*.js"
- ).permitAll()
- .antMatchers("/doc.html").anonymous()
- .antMatchers("/swagger-resources/**").anonymous()
- .antMatchers("/webjars/**").anonymous()
- .antMatchers("/*/api-docs").anonymous()
- .antMatchers("/druid/**").anonymous()
- // Spring Boot Actuator 鐨勫畨鍏ㄩ厤缃�
- .antMatchers("/actuator").anonymous()
- .antMatchers("/actuator/**").anonymous()
- // 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
- .anyRequest().authenticated()
- .and()
- .headers().frameOptions().disable();
- httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
- // 娣诲姞JWT filter
- httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
- // 娣诲姞CORS filter
- httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
- httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
- }
-
- /**
- * 寮烘暎鍒楀搱甯屽姞瀵嗗疄鐜�
- */
- @Bean
- public BCryptPasswordEncoder bCryptPasswordEncoder()
- {
- return new BCryptPasswordEncoder();
- }
-
- /**
- * 韬唤璁よ瘉鎺ュ彛
- */
- @Override
- protected void configure(AuthenticationManagerBuilder auth) throws Exception
- {
- auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
index feb73a4..6d9d56a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -2,7 +2,7 @@
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j;
@@ -53,14 +53,14 @@
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
private String getLoginUsername() {
- LoginUser loginUser;
+ SysUser loginUser;
try {
- loginUser = SecurityUtils.getLoginUser();
+ loginUser = SecurityUtils.getUser();
} catch (Exception e) {
log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
return null;
}
- return loginUser.getUsername();
+ return loginUser.getUserName();
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/MySaTokenListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/MySaTokenListener.java
new file mode 100644
index 0000000..b8bb76f
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/MySaTokenListener.java
@@ -0,0 +1,106 @@
+package com.ruoyi.framework.satoken;
+
+import cn.dev33.satoken.listener.SaTokenListener;
+import cn.dev33.satoken.stp.SaLoginModel;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.RedisUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.AddressUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鑷畾涔変睛鍚櫒鐨勫疄鐜�
+ */
+@Component
+@Slf4j
+public class MySaTokenListener implements SaTokenListener {
+
+ /**
+ * 姣忔鐧诲綍鏃惰Е鍙�
+ */
+ @Override
+ public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) {
+ UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+ String ip = ServletUtils.getClientIP();
+ SysUser user = SecurityUtils.getUser();
+ String tokenValue = StpUtil.getTokenValue();
+ UserOnlineDTO userOnlineDTO = new UserOnlineDTO()
+ .setIpaddr(ip)
+ .setLoginLocation(AddressUtils.getRealAddressByIP(ip))
+ .setBrowser(userAgent.getBrowser().getName())
+ .setOs(userAgent.getOs().getName())
+ .setLoginTime(System.currentTimeMillis())
+ .setTokenId(tokenValue)
+ .setUserName(user.getUserName());
+ if (StringUtils.isNotNull(user.getDept())) {
+ userOnlineDTO.setDeptName(user.getDept().getDeptName());
+ }
+ RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO);
+ log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
+ }
+
+ /**
+ * 姣忔娉ㄩ攢鏃惰Е鍙�
+ */
+ @Override
+ public void doLogout(String loginType, Object loginId, String tokenValue) {
+ RedisUtils.deleteObject(Constants.ONLINE_TOKEN_KEY + tokenValue);
+ log.info("user doLogout, useId:{}, token:{}", loginId, tokenValue);
+ }
+
+ /**
+ * 姣忔琚涪涓嬬嚎鏃惰Е鍙�
+ */
+ @Override
+ public void doLogoutByLoginId(String loginType, Object loginId, String tokenValue, String device) {
+ RedisUtils.deleteObject(Constants.ONLINE_TOKEN_KEY + tokenValue);
+ log.info("user doLogoutByLoginId, useId:{}, token:{}", loginId, tokenValue);
+ }
+
+ /**
+ * 姣忔琚《涓嬬嚎鏃惰Е鍙�
+ */
+ @Override
+ public void doReplaced(String loginType, Object loginId, String tokenValue, String device) {
+ RedisUtils.deleteObject(Constants.ONLINE_TOKEN_KEY + tokenValue);
+ log.info("user doReplaced, useId:{}, token:{}", loginId, tokenValue);
+ }
+
+ /**
+ * 姣忔琚皝绂佹椂瑙﹀彂
+ */
+ @Override
+ public void doDisable(String loginType, Object loginId, long disableTime) {
+ }
+
+ /**
+ * 姣忔琚В灏佹椂瑙﹀彂
+ */
+ @Override
+ public void doUntieDisable(String loginType, Object loginId) {
+ }
+
+ /**
+ * 姣忔鍒涘缓Session鏃惰Е鍙�
+ */
+ @Override
+ public void doCreateSession(String id) {
+ }
+
+ /**
+ * 姣忔娉ㄩ攢Session鏃惰Е鍙�
+ */
+ @Override
+ public void doLogoutSession(String id) {
+ }
+
+
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
deleted file mode 100644
index 5439a97..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.ruoyi.framework.security.filter;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.TokenService;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.stereotype.Component;
-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;
-
-/**
- * token杩囨护鍣� 楠岃瘉token鏈夋晥鎬�
- *
- * @author ruoyi
- */
-@Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
-{
- @Autowired
- private TokenService tokenService;
-
- @Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
- throws ServletException, IOException
- {
- LoginUser loginUser = tokenService.getLoginUser(request);
- if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
- {
- tokenService.verifyToken(loginUser);
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
- authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
- SecurityContextHolder.getContext().setAuthentication(authenticationToken);
- }
- chain.doFilter(request, response);
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
deleted file mode 100644
index 5757081..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.ruoyi.framework.security.handle;
-
-import com.ruoyi.common.utils.StringUtils;
-import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * 璁よ瘉澶辫触澶勭悊绫� 杩斿洖鏈巿鏉�
- *
- * @author ruoyi
- */
-@Component
-public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable
-{
- private static final long serialVersionUID = -8970718410437077606L;
-
- @Override
- public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
- throws IOException
- {
- int code = HttpStatus.HTTP_UNAUTHORIZED;
- String msg = StringUtils.format("璇锋眰璁块棶锛歿}锛岃璇佸け璐ワ紝鏃犳硶璁块棶绯荤粺璧勬簮", request.getRequestURI());
- ServletUtils.renderString(response, JsonUtils.toJsonString(AjaxResult.error(code, msg)));
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
deleted file mode 100644
index 857cbe3..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.ruoyi.framework.security.handle;
-
-import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.LogininforService;
-import com.ruoyi.common.core.service.TokenService;
-import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 鑷畾涔夐��鍑哄鐞嗙被 杩斿洖鎴愬姛
- *
- * @author ruoyi
- */
-@Configuration
-public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
-
- @Autowired
- private TokenService tokenService;
-
- @Autowired
- private LogininforService asyncService;
-
- /**
- * 閫�鍑哄鐞�
- */
- @Override
- public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
- throws IOException, ServletException {
- LoginUser loginUser = tokenService.getLoginUser(request);
- if (StringUtils.isNotNull(loginUser)) {
- String userName = loginUser.getUsername();
- // 鍒犻櫎鐢ㄦ埛缂撳瓨璁板綍
- tokenService.delLoginUser(loginUser.getToken());
- // 璁板綍鐢ㄦ埛閫�鍑烘棩蹇�
- asyncService.recordLogininfor(userName, Constants.LOGOUT, "閫�鍑烘垚鍔�", request);
- }
- ServletUtils.renderString(response, JsonUtils.toJsonString(AjaxResult.error(HttpStatus.HTTP_OK, "閫�鍑烘垚鍔�")));
- }
-
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index 9cf69ff..a96450c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -1,5 +1,8 @@
package com.ruoyi.framework.web.exception;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.exception.NotPermissionException;
+import cn.dev33.satoken.exception.NotRoleException;
import cn.hutool.http.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.DemoModeException;
@@ -7,7 +10,6 @@
import com.ruoyi.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.security.access.AccessDeniedException;
import org.springframework.validation.BindException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -30,8 +32,8 @@
/**
* 鏉冮檺鏍￠獙寮傚父
*/
- @ExceptionHandler(AccessDeniedException.class)
- public AjaxResult handleAccessDeniedException(AccessDeniedException e, HttpServletRequest request)
+ @ExceptionHandler(NotPermissionException.class)
+ public AjaxResult handleAccessDeniedException(NotPermissionException e, HttpServletRequest request)
{
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鏉冮檺鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
@@ -39,6 +41,28 @@
}
/**
+ * 瑙掕壊鏍￠獙寮傚父
+ */
+ @ExceptionHandler(NotRoleException.class)
+ public AjaxResult handleAccessDeniedException(NotRoleException e, HttpServletRequest request)
+ {
+ String requestURI = request.getRequestURI();
+ log.error("璇锋眰鍦板潃'{}',瑙掕壊鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
+ return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "娌℃湁瑙掕壊锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
+ }
+
+ /**
+ * 璁よ瘉澶辫触
+ */
+ @ExceptionHandler(NotLoginException.class)
+ public AjaxResult handleAccessDeniedException(NotLoginException e, HttpServletRequest request)
+ {
+ String requestURI = request.getRequestURI();
+ log.error("璇锋眰璁块棶锛歿}锛岃璇佸け璐ワ紝鏃犳硶璁块棶绯荤粺璧勬簮", requestURI, e.getMessage());
+ return AjaxResult.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("璇锋眰璁块棶锛歿}锛岃璇佸け璐ワ紝鏃犳硶璁块棶绯荤粺璧勬簮", requestURI));
+ }
+
+ /**
* 璇锋眰鏂瑰紡涓嶆敮鎸�
*/
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 5343834..8d0a640 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -1,5 +1,6 @@
package com.ruoyi.generator.controller;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -12,7 +13,6 @@
import com.ruoyi.generator.service.IGenTableService;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -40,7 +40,7 @@
/**
* 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @SaCheckPermission("tool:gen:list")
@GetMapping("/list")
public TableDataInfo genList(GenTable genTable)
{
@@ -50,7 +50,7 @@
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+ @SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{talbleId}")
public AjaxResult getInfo(@PathVariable Long talbleId)
{
@@ -67,7 +67,7 @@
/**
* 鏌ヨ鏁版嵁搴撳垪琛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @SaCheckPermission("tool:gen:list")
@GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable)
{
@@ -77,7 +77,7 @@
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @SaCheckPermission("tool:gen:list")
@GetMapping(value = "/column/{talbleId}")
public TableDataInfo columnList(Long tableId)
{
@@ -91,7 +91,7 @@
/**
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:import')")
+ @SaCheckPermission("tool:gen:import")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
public AjaxResult importTableSave(String tables)
@@ -106,7 +106,7 @@
/**
* 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
@@ -119,7 +119,7 @@
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+ @SaCheckPermission("tool:gen:remove")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
public AjaxResult remove(@PathVariable Long[] tableIds)
@@ -131,7 +131,7 @@
/**
* 棰勮浠ｇ爜
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+ @SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{
@@ -142,7 +142,7 @@
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
@@ -154,7 +154,7 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
public AjaxResult genCode(@PathVariable("tableName") String tableName)
@@ -166,7 +166,7 @@
/**
* 鍚屾鏁版嵁搴�
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
public AjaxResult synchDb(@PathVariable("tableName") String tableName)
@@ -178,7 +178,7 @@
/**
* 鎵归噺鐢熸垚浠ｇ爜
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
public void batchGenCode(HttpServletResponse response, String tables) throws IOException
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 2c8caa4..0bbb677 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -49,7 +49,7 @@
* 鏌ヨ${functionName}鍒楄〃
*/
@ApiOperation("鏌ヨ${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+ @SaCheckPermission("${permissionPrefix}:list")
@GetMapping("/list")
#if($table.crud || $table.sub)
public TableDataInfo<${ClassName}Vo> list(@Validated(QueryGroup.class) ${ClassName}Bo bo) {
@@ -66,7 +66,7 @@
* 瀵煎嚭${functionName}鍒楄〃
*/
@ApiOperation("瀵煎嚭${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+ @SaCheckPermission("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public void export(@Validated ${ClassName}Bo bo, HttpServletResponse response) {
@@ -78,7 +78,7 @@
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+ @SaCheckPermission("${permissionPrefix}:query")
@GetMapping("/{${pkColumn.javaField}}")
public AjaxResult<${ClassName}Vo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
@@ -89,7 +89,7 @@
* 鏂板${functionName}
*/
@ApiOperation("鏂板${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+ @SaCheckPermission("${permissionPrefix}:add")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -101,7 +101,7 @@
* 淇敼${functionName}
*/
@ApiOperation("淇敼${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+ @SaCheckPermission("${permissionPrefix}:edit")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -113,7 +113,7 @@
* 鍒犻櫎${functionName}
*/
@ApiOperation("鍒犻櫎${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
+ @SaCheckPermission("${permissionPrefix}:remove")
@Log(title = "${functionName}" , businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}")
public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
index 3a11170..e2a8949 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -1,5 +1,6 @@
package com.ruoyi.quartz.controller;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
@@ -14,7 +15,6 @@
import com.ruoyi.quartz.util.CronUtils;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +35,7 @@
/**
* 鏌ヨ瀹氭椂浠诲姟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+ @SaCheckPermission("monitor:job:list")
@GetMapping("/list")
public TableDataInfo list(SysJob sysJob)
{
@@ -45,7 +45,7 @@
/**
* 瀵煎嚭瀹氭椂浠诲姟鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+ @SaCheckPermission("monitor:job:export")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public void export(SysJob sysJob, HttpServletResponse response)
@@ -57,7 +57,7 @@
/**
* 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+ @SaCheckPermission("monitor:job:query")
@GetMapping(value = "/{jobId}")
public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
{
@@ -67,7 +67,7 @@
/**
* 鏂板瀹氭椂浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:add')")
+ @SaCheckPermission("monitor:job:add")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
@@ -88,14 +88,13 @@
{
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)//'璋冪敤");
}
- job.setCreateBy(getUsername());
return toAjax(jobService.insertJob(job));
}
/**
* 淇敼瀹氭椂浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
+ @SaCheckPermission("monitor:job:edit")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
@@ -116,14 +115,13 @@
{
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)//'璋冪敤");
}
- job.setUpdateBy(getUsername());
return toAjax(jobService.updateJob(job));
}
/**
* 瀹氭椂浠诲姟鐘舵�佷慨鏀�
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+ @SaCheckPermission("monitor:job:changeStatus")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
@@ -136,7 +134,7 @@
/**
* 瀹氭椂浠诲姟绔嬪嵆鎵ц涓�娆�
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+ @SaCheckPermission("monitor:job:changeStatus")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/run")
public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
@@ -148,7 +146,7 @@
/**
* 鍒犻櫎瀹氭椂浠诲姟
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ @SaCheckPermission("monitor:job:remove")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}")
public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
index 6fcba39..b282164 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -1,5 +1,6 @@
package com.ruoyi.quartz.controller;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,7 +10,6 @@
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -30,7 +30,8 @@
/**
* 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+
+ @SaCheckPermission("monitor:job:list")
@GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog)
{
@@ -40,7 +41,7 @@
/**
* 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+ @SaCheckPermission("monitor:job:export")
@Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public void export(SysJobLog sysJobLog, HttpServletResponse response)
@@ -52,7 +53,7 @@
/**
* 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+ @SaCheckPermission("monitor:job:query")
@GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long jobLogId)
{
@@ -63,7 +64,7 @@
/**
* 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ @SaCheckPermission("monitor:job:remove")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
public AjaxResult remove(@PathVariable Long[] jobLogIds)
@@ -74,7 +75,7 @@
/**
* 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織
*/
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ @SaCheckPermission("monitor:job:remove")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
deleted file mode 100644
index 4e00649..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.system.domain.SysUserOnline;
-
-/**
- * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞�
- *
- * @author ruoyi
- */
-public interface ISysUserOnlineService {
- /**
- * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
- *
- * @param ipaddr 鐧诲綍鍦板潃
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
-
- /**
- * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
- *
- * @param userName 鐢ㄦ埛鍚嶇О
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
-
- /**
- * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
- *
- * @param ipaddr 鐧诲綍鍦板潃
- * @param userName 鐢ㄦ埛鍚嶇О
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
-
- /**
- * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛
- */
- public SysUserOnline loginUserToUserOnline(LoginUser user);
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 24096c3..3557bc3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.service.IUserService;
import java.util.List;
@@ -11,7 +12,7 @@
*
* @author ruoyi
*/
-public interface ISysUserService extends IService<SysUser> {
+public interface ISysUserService extends IService<SysUser>, IUserService {
TableDataInfo<SysUser> selectPageUserList(SysUser user);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
deleted file mode 100644
index fe735b0..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Set;
-
-/**
- * RuoYi棣栧垱 鑷畾涔夋潈闄愬疄鐜帮紝ss鍙栬嚜SpringSecurity棣栧瓧姣�
- *
- * @author ruoyi
- */
-@Service("ss")
-public class PermissionService
-{
- /** 鎵�鏈夋潈闄愭爣璇� */
- private static final String ALL_PERMISSION = "*:*:*";
-
- /** 绠＄悊鍛樿鑹叉潈闄愭爣璇� */
- private static final String SUPER_ADMIN = "admin";
-
- private static final String ROLE_DELIMETER = ",";
-
- private static final String PERMISSION_DELIMETER = ",";
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
- *
- * @param permission 鏉冮檺瀛楃涓�
- * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
- */
- public boolean hasPermi(String permission)
- {
- if (StringUtils.isEmpty(permission))
- {
- return false;
- }
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
- {
- return false;
- }
- return hasPermissions(loginUser.getPermissions(), permission);
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁涓嶅叿澶囨煇鏉冮檺锛屼笌 hasPermi閫昏緫鐩稿弽
- *
- * @param permission 鏉冮檺瀛楃涓�
- * @return 鐢ㄦ埛鏄惁涓嶅叿澶囨煇鏉冮檺
- */
- public boolean lacksPermi(String permission)
- {
- return hasPermi(permission) != true;
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓�涓潈闄�
- *
- * @param permissions 浠� PERMISSION_NAMES_DELIMETER 涓哄垎闅旂鐨勬潈闄愬垪琛�
- * @return 鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓�涓潈闄�
- */
- public boolean hasAnyPermi(String permissions)
- {
- if (StringUtils.isEmpty(permissions))
- {
- return false;
- }
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
- {
- return false;
- }
- Set<String> authorities = loginUser.getPermissions();
- for (String permission : permissions.split(PERMISSION_DELIMETER))
- {
- if (permission != null && hasPermissions(authorities, permission))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊
- *
- * @param role 瑙掕壊瀛楃涓�
- * @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹�
- */
- public boolean hasRole(String role)
- {
- if (StringUtils.isEmpty(role))
- {
- return false;
- }
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
- {
- return false;
- }
- for (SysRole sysRole : loginUser.getUser().getRoles())
- {
- String roleKey = sysRole.getRoleKey();
- if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role)))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁涓嶅叿澶囨煇瑙掕壊锛屼笌 isRole閫昏緫鐩稿弽銆�
- *
- * @param role 瑙掕壊鍚嶇О
- * @return 鐢ㄦ埛鏄惁涓嶅叿澶囨煇瑙掕壊
- */
- public boolean lacksRole(String role)
- {
- return hasRole(role) != true;
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓�涓鑹�
- *
- * @param roles 浠� ROLE_NAMES_DELIMETER 涓哄垎闅旂鐨勮鑹插垪琛�
- * @return 鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓�涓鑹�
- */
- public boolean hasAnyRoles(String roles)
- {
- if (StringUtils.isEmpty(roles))
- {
- return false;
- }
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
- {
- return false;
- }
- for (String role : roles.split(ROLE_DELIMETER))
- {
- if (hasRole(role))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 鍒ゆ柇鏄惁鍖呭惈鏉冮檺
- *
- * @param permissions 鏉冮檺鍒楄〃
- * @param permission 鏉冮檺瀛楃涓�
- * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
- */
- private boolean hasPermissions(Set<String> permissions, String permission)
- {
- return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
- }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index 886537f..6bee29f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -1,26 +1,20 @@
package com.ruoyi.system.service;
+import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.LogininforService;
-import com.ruoyi.common.core.service.TokenService;
+import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.RedisUtils;
-import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.*;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
@@ -28,14 +22,10 @@
*
* @author ruoyi
*/
+@Slf4j
@Component
public class SysLoginService
{
- @Autowired
- private TokenService tokenService;
-
- @Resource
- private AuthenticationManager authenticationManager;
@Autowired
private ISysUserService userService;
@@ -64,32 +54,35 @@
{
validateCaptcha(username, code, uuid, request);
}
- // 鐢ㄦ埛楠岃瘉
- Authentication authentication = null;
- try
+ SysUser user = userService.selectUserByUserName(username);
+ if (StringUtils.isNull(user))
{
- // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
- authentication = authenticationManager
- .authenticate(new UsernamePasswordAuthenticationToken(username, password));
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
+ throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + username + " 涓嶅瓨鍦�");
}
- catch (Exception e)
+ else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
- if (e instanceof BadCredentialsException)
- {
- asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
- throw new UserPasswordNotMatchException();
- }
- else
- {
- asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage(), request);
- throw new ServiceException(e.getMessage());
- }
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍒犻櫎.", username);
+ throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸茶鍒犻櫎");
}
+ else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+ {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
+ throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸插仠鐢�");
+ }
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+ String encodePassword = passwordEncoder.encode(password);
+ if (SecurityUtils.matchesPassword(user.getPassword(), encodePassword))
+ {
+ asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
+ throw new UserPasswordNotMatchException();
+ }
+
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
- LoginUser loginUser = (LoginUser) authentication.getPrincipal();
- recordLoginInfo(loginUser.getUser());
+ recordLoginInfo(user);
// 鐢熸垚token
- return tokenService.createToken(loginUser);
+ StpUtil.login(user.getUserId(), "PC");
+ return StpUtil.getTokenValue();
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java
new file mode 100644
index 0000000..ccbd3b3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.service.impl;
+
+import cn.dev33.satoken.stp.StpInterface;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.SysPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+@Component
+public class SaInterfaceImpl implements StpInterface {
+
+ @Autowired
+ private SysPermissionService sysPermissionService;
+ @Autowired
+ private ISysUserService iSysUserService;
+
+ @Override
+ public List<String> getPermissionList(Object loginId, String loginType) {
+ SysUser user = iSysUserService.getById(loginId.toString());
+ Set<String> menuPermission = sysPermissionService.getMenuPermission(user);
+ //閲囩敤鐨勬槸鐢ㄦ埛閲岃嚜甯︾殑鏉冮檺锛屽疄鐜颁竴娆℃�ц闂畆eids,杩涜鍒ゆ柇鏄惁鍙互璁块棶
+ return new ArrayList<>(menuPermission);
+ }
+
+ @Override
+ public List<String> getRoleList(Object loginId, String loginType) {
+ SysUser user = iSysUserService.getById(loginId.toString());
+ Set<String> rolePermission = sysPermissionService.getRolePermission(user);
+ return new ArrayList<>(rolePermission);
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
deleted file mode 100644
index 6a41cb6..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
-import org.springframework.stereotype.Service;
-
-/**
- * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞�
- *
- * @author ruoyi
- */
-@Service
-public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
- /**
- * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
- *
- * @param ipaddr 鐧诲綍鍦板潃
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- @Override
- public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) {
- if (StringUtils.equals(ipaddr, user.getIpaddr())) {
- return loginUserToUserOnline(user);
- }
- return null;
- }
-
- /**
- * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
- *
- * @param userName 鐢ㄦ埛鍚嶇О
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- @Override
- public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) {
- if (StringUtils.equals(userName, user.getUsername())) {
- return loginUserToUserOnline(user);
- }
- return null;
- }
-
- /**
- * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
- *
- * @param ipaddr 鐧诲綍鍦板潃
- * @param userName 鐢ㄦ埛鍚嶇О
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- @Override
- public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) {
- if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
- return loginUserToUserOnline(user);
- }
- return null;
- }
-
- /**
- * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛
- */
- @Override
- public SysUserOnline loginUserToUserOnline(LoginUser user) {
- if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser())) {
- return null;
- }
- SysUserOnline sysUserOnline = new SysUserOnline();
- sysUserOnline.setTokenId(user.getToken());
- sysUserOnline.setUserName(user.getUsername());
- sysUserOnline.setIpaddr(user.getIpaddr());
- sysUserOnline.setLoginLocation(user.getLoginLocation());
- sysUserOnline.setBrowser(user.getBrowser());
- sysUserOnline.setOs(user.getOs());
- sysUserOnline.setLoginTime(user.getLoginTime());
- if (StringUtils.isNotNull(user.getUser().getDept())) {
- sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
- }
- return sysUserOnline;
- }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
deleted file mode 100644
index 9803a60..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.TokenService;
-import com.ruoyi.common.properties.TokenProperties;
-import com.ruoyi.common.utils.RedisUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.AddressUtils;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * token楠岃瘉澶勭悊
- *
- * @author Lion Li
- */
-@Component
-public class TokenServiceImpl implements TokenService {
-
- protected static final long MILLIS_SECOND = 1000;
-
- protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
-
- private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
-
- @Autowired
- private TokenProperties tokenProperties;
-
- /**
- * 鑾峰彇鐢ㄦ埛韬唤淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- @Override
- public LoginUser getLoginUser(HttpServletRequest request) {
- // 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗�
- String token = getToken(request);
- if (StringUtils.isNotEmpty(token)) {
- try {
- Claims claims = parseToken(token);
- // 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
- String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
- String userKey = getTokenKey(uuid);
- LoginUser user = RedisUtils.getCacheObject(userKey);
- return user;
- } catch (Exception e) {
-
- }
- }
- return null;
- }
-
- /**
- * 璁剧疆鐢ㄦ埛韬唤淇℃伅
- */
- @Override
- public void setLoginUser(LoginUser loginUser) {
- if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
- refreshToken(loginUser);
- }
- }
-
- /**
- * 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
- */
- @Override
- public void delLoginUser(String token) {
- if (StringUtils.isNotEmpty(token)) {
- String userKey = getTokenKey(token);
- RedisUtils.deleteObject(userKey);
- }
- }
-
- /**
- * 鍒涘缓浠ょ墝
- *
- * @param loginUser 鐢ㄦ埛淇℃伅
- * @return 浠ょ墝
- */
- @Override
- public String createToken(LoginUser loginUser) {
- String token = IdUtil.fastUUID();
- loginUser.setToken(token);
- setUserAgent(loginUser);
- refreshToken(loginUser);
-
- Map<String, Object> claims = new HashMap<>();
- claims.put(Constants.LOGIN_USER_KEY, token);
- return createToken(claims);
- }
-
- /**
- * 楠岃瘉浠ょ墝鏈夋晥鏈燂紝鐩稿樊涓嶈冻20鍒嗛挓锛岃嚜鍔ㄥ埛鏂扮紦瀛�
- *
- * @param loginUser
- * @return 浠ょ墝
- */
- @Override
- public void verifyToken(LoginUser loginUser) {
- long expireTime = loginUser.getExpireTime();
- long currentTime = System.currentTimeMillis();
- if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
- refreshToken(loginUser);
- }
- }
-
- /**
- * 鍒锋柊浠ょ墝鏈夋晥鏈�
- *
- * @param loginUser 鐧诲綍淇℃伅
- */
- @Override
- public void refreshToken(LoginUser loginUser) {
- loginUser.setLoginTime(System.currentTimeMillis());
- loginUser.setExpireTime(loginUser.getLoginTime() + tokenProperties.getExpireTime() * MILLIS_MINUTE);
- // 鏍规嵁uuid灏唋oginUser缂撳瓨
- String userKey = getTokenKey(loginUser.getToken());
- RedisUtils.setCacheObject(userKey, loginUser, tokenProperties.getExpireTime(), TimeUnit.MINUTES);
- }
-
- /**
- * 璁剧疆鐢ㄦ埛浠ｇ悊淇℃伅
- *
- * @param loginUser 鐧诲綍淇℃伅
- */
- @Override
- public void setUserAgent(LoginUser loginUser) {
- UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
- String ip = ServletUtils.getClientIP();
- loginUser.setIpaddr(ip);
- loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
- loginUser.setBrowser(userAgent.getBrowser().getName());
- loginUser.setOs(userAgent.getOs().getName());
- }
-
- /**
- * 浠庢暟鎹０鏄庣敓鎴愪护鐗�
- *
- * @param claims 鏁版嵁澹版槑
- * @return 浠ょ墝
- */
- private String createToken(Map<String, Object> claims) {
- String token = Jwts.builder()
- .setClaims(claims)
- .signWith(SignatureAlgorithm.HS512, tokenProperties.getSecret()).compact();
- return token;
- }
-
- /**
- * 浠庝护鐗屼腑鑾峰彇鏁版嵁澹版槑
- *
- * @param token 浠ょ墝
- * @return 鏁版嵁澹版槑
- */
- private Claims parseToken(String token) {
- return Jwts.parser()
- .setSigningKey(tokenProperties.getSecret())
- .parseClaimsJws(token)
- .getBody();
- }
-
- /**
- * 浠庝护鐗屼腑鑾峰彇鐢ㄦ埛鍚�
- *
- * @param token 浠ょ墝
- * @return 鐢ㄦ埛鍚�
- */
- @Override
- public String getUsernameFromToken(String token) {
- Claims claims = parseToken(token);
- return claims.getSubject();
- }
-
- /**
- * 鑾峰彇璇锋眰token
- *
- * @param request
- * @return token
- */
- private String getToken(HttpServletRequest request) {
- String token = request.getHeader(tokenProperties.getHeader());
- if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
- token = token.replace(Constants.TOKEN_PREFIX, "");
- }
- return token;
- }
-
- private String getTokenKey(String uuid) {
- return Constants.LOGIN_TOKEN_KEY + uuid;
- }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
deleted file mode 100644
index 5d104f6..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.SysPermissionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-/**
- * 鐢ㄦ埛楠岃瘉澶勭悊
- *
- * @author ruoyi
- */
-@Slf4j
-@Service
-public class UserDetailsServiceImpl implements UserDetailsService
-{
-
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Override
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
- {
- SysUser user = userService.selectUserByUserName(username);
- if (StringUtils.isNull(user))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
- throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + username + " 涓嶅瓨鍦�");
- }
- else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍒犻櫎.", username);
- throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸茶鍒犻櫎");
- }
- else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
- throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸插仠鐢�");
- }
-
- return createLoginUser(user);
- }
-
- public UserDetails createLoginUser(SysUser user)
- {
- return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
- }
-}
--
Gitblit v1.9.3