!6 同步develop分支

* sync -- 同步develop分支

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html

pom.xml

@@ -9,7 +9,7 @@
     <version>3.5.0</version>
 
     <name>RuoYi-Flowable-Plus</name>
-    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
+    <url>https://gitee.com/KonBAI-Q/ruoyi-flowable-plus</url>
     <description>RuoYi-Flowable-Plus后台管理系统</description>
 
     <properties>
@@ -26,11 +26,12 @@
         <easyexcel.version>2.2.11</easyexcel.version>
         <cglib.version>3.3.0</cglib.version>
         <velocity.version>2.3</velocity.version>
-        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+        <satoken.version>1.28.0</satoken.version>
+        <mybatis-plus.version>3.5.0</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.7.18</hutool.version>
         <okhttp.version>4.9.2</okhttp.version>
-        <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
+        <spring-boot-admin.version>2.6.0</spring-boot-admin.version>
         <redisson.version>3.16.7</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <dynamic-ds.version>3.5.0</dynamic-ds.version>
@@ -68,6 +69,15 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- hutool 的依赖配置-->
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-bom</artifactId>
+                <version>${hutool.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- 阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -129,6 +139,19 @@
                 <version>${velocity.version}</version>
             </dependency>
 
+            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot-starter</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+            <!-- Sa-Token 整合 jwt -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+
             <!-- jdk11 缺失依赖 jaxb-->
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
@@ -160,36 +183,6 @@
                 <version>${p6spy.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-core</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-http</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-captcha</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-extra</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-jwt</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp</artifactId>
@@ -319,15 +312,15 @@
 
     <modules>
         <module>ruoyi-admin</module>
-        <module>ruoyi-framework</module>
-        <module>ruoyi-system</module>
-        <module>ruoyi-job</module>
-        <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
         <module>ruoyi-demo</module>
         <module>ruoyi-extend</module>
-        <module>ruoyi-oss</module>
         <module>ruoyi-flowable</module>
+        <module>ruoyi-framework</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-job</module>
+        <module>ruoyi-oss</module>
+        <module>ruoyi-system</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -346,8 +339,17 @@
         </plugins>
         <resources>
             <resource>
-                <!--打包该目录下的 application.yml -->
                 <directory>src/main/resources</directory>
+                <!-- 关闭过滤 -->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!-- 引入所有 匹配文件进行过滤 -->
+                <includes>
+                    <include>application*</include>
+                    <include>bootstrap*</include>
+                </includes>
                 <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
                 <filtering>true</filtering>
             </resource>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -7,7 +7,7 @@ import cn.hutool.core.util.IdUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.CaptchaType;
-import com.ruoyi.common.utils.RedisUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.monitor;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
@@ -9,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisServerCommands;
 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;
@@ -30,7 +30,7 @@ public class CacheController {
     private final RedisTemplate<String, String> redisTemplate;
 
     @ApiOperation("获取缓存监控详细信息")
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @SaCheckPermission("monitor:cache:list")
     @GetMapping()
     public R<Map<String, Object>> getInfo() throws Exception {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);

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.R;
@@ -13,7 +14,6 @@ import io.swagger.annotations.Api;
 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.*;
 
@@ -35,7 +35,7 @@ public class SysLogininforController extends BaseController {
     private final ISysLogininforService logininforService;
 
     @ApiOperation("查询系统访问记录列表")
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @SaCheckPermission("monitor:logininfor:list")
     @GetMapping("/list")
     public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
         return logininforService.selectPageLogininforList(logininfor, pageQuery);
@@ -43,7 +43,7 @@ public class SysLogininforController extends BaseController {
 
     @ApiOperation("导出系统访问记录列表")
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @SaCheckPermission("monitor:logininfor:export")
     @PostMapping("/export")
     public void export(SysLogininfor logininfor, HttpServletResponse response) {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
@@ -51,7 +51,7 @@ public class SysLogininforController extends BaseController {
     }
 
     @ApiOperation("删除系统访问记录")
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
     public R<Void> remove(@PathVariable Long[] infoIds) {
@@ -59,7 +59,7 @@ public class SysLogininforController extends BaseController {
     }
 
     @ApiOperation("清空系统访问记录")
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public R<Void> clean() {

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.R;
@@ -13,7 +14,6 @@ import io.swagger.annotations.Api;
 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.*;
 
@@ -35,7 +35,7 @@ public class SysOperlogController extends BaseController {
     private final ISysOperLogService operLogService;
 
     @ApiOperation("查询操作日志记录列表")
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
     public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
         return operLogService.selectPageOperLogList(operLog, pageQuery);
@@ -43,7 +43,7 @@ public class SysOperlogController extends BaseController {
 
     @ApiOperation("导出操作日志记录列表")
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @SaCheckPermission("monitor:operlog:export")
     @PostMapping("/export")
     public void export(SysOperLog operLog, HttpServletResponse response) {
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
@@ -52,7 +52,7 @@ public class SysOperlogController extends BaseController {
 
     @ApiOperation("删除操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/{operIds}")
     public R<Void> remove(@PathVariable Long[] operIds) {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
@@ -60,7 +60,7 @@ public class SysOperlogController extends BaseController {
 
     @ApiOperation("清空操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/clean")
     public R<Void> clean() {
         operLogService.cleanOperLog();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -1,27 +1,29 @@
 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.R;
-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.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
 import io.swagger.annotations.Api;
 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.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 在线用户监控
@@ -34,34 +36,38 @@ import java.util.List;
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {
 
-    private final ISysUserOnlineService userOnlineService;
-
     @ApiOperation("在线用户列表")
-    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @SaCheckPermission("monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
-        Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        // 获取所有未过期的 token
+        List<String> keys = StpUtil.searchTokenValue("", -1, 0);
+        List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
         for (String key : keys) {
-            LoginUser user = RedisUtils.getCacheObject(key);
+            String token = key.replace(Constants.LOGIN_TOKEN_KEY, "");
+            // 如果已经过期则踢下线
+            if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < 0) {
+                continue;
+            }
+            userOnlineDTOList.add(RedisUtils.getCacheObject(Constants.ONLINE_TOKEN_KEY + token));
+        }
         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));
-                }
+            userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+                StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+                    StringUtils.equals(userName, userOnline.getUserName())
+            ).collect(Collectors.toList());
         } else if (StringUtils.isNotEmpty(ipaddr)) {
-                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
+            userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+                StringUtils.equals(ipaddr, userOnline.getIpaddr()))
+                .collect(Collectors.toList());
         } else if (StringUtils.isNotEmpty(userName)) {
-                if (StringUtils.equals(userName, user.getUsername())) {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+            userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+                StringUtils.equals(userName, userOnline.getUserName())
+            ).collect(Collectors.toList());
         }
-            } else {
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
-            }
-        }
-        Collections.reverse(userOnlineList);
-        userOnlineList.removeAll(Collections.singleton(null));
+        Collections.reverse(userOnlineDTOList);
+        userOnlineDTOList.removeAll(Collections.singleton(null));
+        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
         return TableDataInfo.build(userOnlineList);
     }
 
@@ -69,11 +75,14 @@ public class SysUserOnlineController extends BaseController {
      * 强退用户
      */
     @ApiOperation("强退用户")
-    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @SaCheckPermission("monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
     public R<Void> forceLogout(@PathVariable String tokenId) {
-        RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+        try {
+            StpUtil.kickoutByTokenValue(tokenId);
+        } catch (NotLoginException e) {
+        }
         return R.success();
     }
 }

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.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -15,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -40,7 +40,7 @@ public class SysConfigController extends BaseController {
      * 获取参数配置列表
      */
     @ApiOperation("获取参数配置列表")
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @SaCheckPermission("system:config:list")
     @GetMapping("/list")
     public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
         return configService.selectPageConfigList(config, pageQuery);
@@ -48,7 +48,7 @@ public class SysConfigController extends BaseController {
 
     @ApiOperation("导出参数配置列表")
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @SaCheckPermission("system:config:export")
     @PostMapping("/export")
     public void export(SysConfig config, HttpServletResponse response) {
         List<SysConfig> list = configService.selectConfigList(config);
@@ -59,7 +59,7 @@ public class SysConfigController extends BaseController {
      * 根据参数编号获取详细信息
      */
     @ApiOperation("根据参数编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @SaCheckPermission("system:config:query")
     @GetMapping(value = "/{configId}")
     public R<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
         return R.success(configService.selectConfigById(configId));
@@ -78,7 +78,7 @@ public class SysConfigController extends BaseController {
      * 新增参数配置
      */
     @ApiOperation("新增参数配置")
-    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysConfig config) {
@@ -92,7 +92,7 @@ public class SysConfigController extends BaseController {
      * 修改参数配置
      */
     @ApiOperation("修改参数配置")
-    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysConfig config) {
@@ -106,7 +106,7 @@ public class SysConfigController extends BaseController {
      * 删除参数配置
      */
     @ApiOperation("删除参数配置")
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
     public R<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
@@ -118,7 +118,7 @@ public class SysConfigController extends BaseController {
      * 刷新参数缓存
      */
     @ApiOperation("刷新参数缓存")
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public R<Void> refreshCache() {

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.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import com.ruoyi.common.annotation.Log;
@@ -15,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -41,7 +41,7 @@ public class SysDeptController extends BaseController {
      * 获取部门列表
      */
     @ApiOperation("获取部门列表")
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @SaCheckPermission("system:dept:list")
     @GetMapping("/list")
     public R<List<SysDept>> list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
@@ -52,7 +52,7 @@ public class SysDeptController extends BaseController {
      * 查询部门列表（排除节点）
      */
     @ApiOperation("查询部门列表（排除节点）")
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
     public R<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
@@ -65,7 +65,7 @@ public class SysDeptController extends BaseController {
      * 根据部门编号获取详细信息
      */
     @ApiOperation("根据部门编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
     public R<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
@@ -99,7 +99,7 @@ public class SysDeptController extends BaseController {
      * 新增部门
      */
     @ApiOperation("新增部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysDept dept) {
@@ -113,7 +113,7 @@ public class SysDeptController extends BaseController {
      * 修改部门
      */
     @ApiOperation("修改部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysDept dept) {
@@ -132,7 +132,7 @@ public class SysDeptController extends BaseController {
      * 删除部门
      */
     @ApiOperation("删除部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @SaCheckPermission("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public R<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {

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.R;
@@ -16,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -40,7 +40,7 @@ public class SysDictDataController extends BaseController {
     private final ISysDictTypeService dictTypeService;
 
     @ApiOperation("查询字典数据列表")
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
         return dictDataService.selectPageDictDataList(dictData, pageQuery);
@@ -48,7 +48,7 @@ public class SysDictDataController extends BaseController {
 
     @ApiOperation("导出字典数据列表")
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
     public void export(SysDictData dictData, HttpServletResponse response) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
@@ -59,7 +59,7 @@ public class SysDictDataController extends BaseController {
      * 查询字典数据详细
      */
     @ApiOperation("查询字典数据详细")
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
     public R<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
         return R.success(dictDataService.selectDictDataById(dictCode));
@@ -82,7 +82,7 @@ public class SysDictDataController extends BaseController {
      * 新增字典类型
      */
     @ApiOperation("新增字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysDictData dict) {
@@ -93,7 +93,7 @@ public class SysDictDataController extends BaseController {
      * 修改保存字典类型
      */
     @ApiOperation("修改保存字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysDictData dict) {
@@ -104,7 +104,7 @@ public class SysDictDataController extends BaseController {
      * 删除字典类型
      */
     @ApiOperation("删除字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
     public R<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {

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;
@@ -15,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -37,7 +37,7 @@ public class SysDictTypeController extends BaseController {
     private final ISysDictTypeService dictTypeService;
 
     @ApiOperation("查询字典类型列表")
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
         return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
@@ -45,7 +45,7 @@ public class SysDictTypeController extends BaseController {
 
     @ApiOperation("导出字典类型列表")
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
     public void export(SysDictType dictType, HttpServletResponse response) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
@@ -56,7 +56,7 @@ public class SysDictTypeController extends BaseController {
      * 查询字典类型详细
      */
     @ApiOperation("查询字典类型详细")
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
     public R<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
         return R.success(dictTypeService.selectDictTypeById(dictId));
@@ -66,7 +66,7 @@ public class SysDictTypeController extends BaseController {
      * 新增字典类型
      */
     @ApiOperation("新增字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysDictType dict) {
@@ -80,7 +80,7 @@ public class SysDictTypeController extends BaseController {
      * 修改字典类型
      */
     @ApiOperation("修改字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysDictType dict) {
@@ -94,7 +94,7 @@ public class SysDictTypeController extends BaseController {
      * 删除字典类型
      */
     @ApiOperation("删除字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
     public R<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
@@ -106,7 +106,7 @@ public class SysDictTypeController extends BaseController {
      * 刷新字典缓存
      */
     @ApiOperation("刷新字典缓存")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public R<Void> refreshCache() {

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.R;
 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.common.core.service.UserService;
+import com.ruoyi.common.utils.LoginUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.vo.RouterVo;
 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 io.swagger.annotations.Api;
@@ -39,7 +42,6 @@ public class SysLoginController {
 
     private final SysLoginService loginService;
     private final ISysMenuService menuService;
-    private final ISysUserService userService;
     private final SysPermissionService permissionService;
 
     /**
@@ -59,6 +61,16 @@ public class SysLoginController {
         return R.success(ajax);
     }
 
+    @ApiOperation("登出方法")
+    @PostMapping("/logout")
+    public R<Void> logout(){
+        try {
+            StpUtil.logout();
+        } catch (NotLoginException e) {
+        }
+        return R.success("退出成功");
+    }
+
     /**
      * 获取用户信息
      *
@@ -67,7 +79,7 @@ public class SysLoginController {
     @ApiOperation("获取用户信息")
     @GetMapping("getInfo")
     public R<Map<String, Object>> getInfo() {
-        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
+        SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
@@ -87,7 +99,7 @@ public class SysLoginController {
     @ApiOperation("获取路由信息")
     @GetMapping("getRouters")
     public R<List<RouterVo>> getRouters() {
-        Long userId = SecurityUtils.getUserId();
+        Long userId = LoginUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return R.success(menuService.buildMenus(menus));
     }

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 cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
@@ -14,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -40,7 +40,7 @@ public class SysMenuController extends BaseController {
      * 获取菜单列表
      */
     @ApiOperation("获取菜单列表")
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
     public R<List<SysMenu>> list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -51,7 +51,7 @@ public class SysMenuController extends BaseController {
      * 根据菜单编号获取详细信息
      */
     @ApiOperation("根据菜单编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/{menuId}")
     public R<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
         return R.success(menuService.selectMenuById(menuId));
@@ -84,7 +84,7 @@ public class SysMenuController extends BaseController {
      * 新增菜单
      */
     @ApiOperation("新增菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @SaCheckPermission("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysMenu menu) {
@@ -100,7 +100,7 @@ public class SysMenuController extends BaseController {
      * 修改菜单
      */
     @ApiOperation("修改菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @SaCheckPermission("system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysMenu menu) {
@@ -118,7 +118,7 @@ public class SysMenuController extends BaseController {
      * 删除菜单
      */
     @ApiOperation("删除菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @SaCheckPermission("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public R<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.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.R;
@@ -8,14 +9,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 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.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
 /**
  * 公告 信息操作处理
@@ -35,7 +35,7 @@ public class SysNoticeController extends BaseController {
      * 获取通知公告列表
      */
     @ApiOperation("获取通知公告列表")
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
     public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
         return noticeService.selectPageNoticeList(notice, pageQuery);
@@ -45,7 +45,7 @@ public class SysNoticeController extends BaseController {
      * 根据通知公告编号获取详细信息
      */
     @ApiOperation("根据通知公告编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
     public R<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
         return R.success(noticeService.selectNoticeById(noticeId));
@@ -55,7 +55,7 @@ public class SysNoticeController extends BaseController {
      * 新增通知公告
      */
     @ApiOperation("新增通知公告")
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysNotice notice) {
@@ -66,7 +66,7 @@ public class SysNoticeController extends BaseController {
      * 修改通知公告
      */
     @ApiOperation("修改通知公告")
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysNotice notice) {
@@ -77,7 +77,7 @@ public class SysNoticeController extends BaseController {
      * 删除通知公告
      */
     @ApiOperation("删除通知公告")
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @SaCheckPermission("system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
     public R<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {

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;
@@ -18,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -46,7 +46,7 @@ public class SysOssConfigController extends BaseController {
      * 查询对象存储配置列表
      */
     @ApiOperation("查询对象存储配置列表")
-    @PreAuthorize("@ss.hasPermi('system:oss:list')")
+    @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
         return iSysOssConfigService.queryPageList(bo, pageQuery);
@@ -56,7 +56,7 @@ public class SysOssConfigController extends BaseController {
      * 获取对象存储配置详细信息
      */
     @ApiOperation("获取对象存储配置详细信息")
-    @PreAuthorize("@ss.hasPermi('system:oss:query')")
+    @SaCheckPermission("system:oss:query")
     @GetMapping("/{ossConfigId}")
     public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
                                               @NotNull(message = "主键不能为空")
@@ -68,7 +68,7 @@ public class SysOssConfigController extends BaseController {
      * 新增对象存储配置
      */
     @ApiOperation("新增对象存储配置")
-    @PreAuthorize("@ss.hasPermi('system:oss:add')")
+    @SaCheckPermission("system:oss:add")
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -80,7 +80,7 @@ public class SysOssConfigController extends BaseController {
      * 修改对象存储配置
      */
     @ApiOperation("修改对象存储配置")
-    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -92,7 +92,7 @@ public class SysOssConfigController extends BaseController {
      * 删除对象存储配置
      */
     @ApiOperation("删除对象存储配置")
-    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+    @SaCheckPermission("system:oss:remove")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossConfigIds}")
     public R<Void> remove(@ApiParam("OSS配置ID串")
@@ -105,7 +105,7 @@ public class SysOssConfigController extends BaseController {
      * 状态修改
      */
     @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -1,11 +1,11 @@
 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;
 import cn.hutool.http.HttpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -28,7 +28,6 @@ import io.swagger.annotations.*;
 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;
@@ -60,7 +59,7 @@ public class SysOssController extends BaseController {
      * 查询OSS对象存储列表
      */
     @ApiOperation("查询OSS对象存储列表")
-    @PreAuthorize("@ss.hasPermi('system:oss:list')")
+    @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
         return iSysOssService.queryPageList(bo, pageQuery);
@@ -73,7 +72,7 @@ public class SysOssController extends BaseController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "file", value = "文件", dataTypeClass = File.class, required = true),
     })
-    @PreAuthorize("@ss.hasPermi('system:oss:upload')")
+    @SaCheckPermission("system:oss:upload")
     @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
     @RepeatSubmit
     @PostMapping("/upload")
@@ -89,7 +88,7 @@ public class SysOssController extends BaseController {
     }
 
     @ApiOperation("下载OSS对象存储")
-    @PreAuthorize("@ss.hasPermi('system:oss:download')")
+    @SaCheckPermission("system:oss:download")
     @GetMapping("/download/{ossId}")
     public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
         SysOss sysOss = iSysOssService.getById(ossId);
@@ -116,7 +115,7 @@ public class SysOssController extends BaseController {
      * 删除OSS对象存储
      */
     @ApiOperation("删除OSS对象存储")
-    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+    @SaCheckPermission("system:oss:remove")
     @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
     public R<Void> remove(@ApiParam("OSS对象ID串")
@@ -129,13 +128,12 @@ public class SysOssController extends BaseController {
      * 变更图片列表预览状态
      */
     @ApiOperation("变更图片列表预览状态")
-    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @SaCheckPermission("system:oss:edit")
     @Log(title = "OSS对象存储", businessType = BusinessType.UPDATE)
     @PutMapping("/changePreviewListResource")
     public R<Void> changePreviewListResource(@RequestBody String body) {
         Map<String, Boolean> map = JsonUtils.parseMap(body);
-        SysConfig config = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
-            .eq(SysConfig::getConfigKey, OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
+        SysConfig config = iSysConfigService.getOne(new SysConfig().setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
         config.setConfigValue(map.get("previewListResource").toString());
         return toAjax(iSysConfigService.updateConfig(config));
     }

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;
@@ -15,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -40,7 +40,7 @@ public class SysPostController extends BaseController {
      * 获取岗位列表
      */
     @ApiOperation("获取岗位列表")
-    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @SaCheckPermission("system:post:list")
     @GetMapping("/list")
     public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
         return postService.selectPagePostList(post, pageQuery);
@@ -48,7 +48,7 @@ public class SysPostController extends BaseController {
 
     @ApiOperation("导出岗位列表")
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @SaCheckPermission("system:post:export")
     @PostMapping("/export")
     public void export(SysPost post, HttpServletResponse response) {
         List<SysPost> list = postService.selectPostList(post);
@@ -59,7 +59,7 @@ public class SysPostController extends BaseController {
      * 根据岗位编号获取详细信息
      */
     @ApiOperation("根据岗位编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
     public R<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
         return R.success(postService.selectPostById(postId));
@@ -69,7 +69,7 @@ public class SysPostController extends BaseController {
      * 新增岗位
      */
     @ApiOperation("新增岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysPost post) {
@@ -85,7 +85,7 @@ public class SysPostController extends BaseController {
      * 修改岗位
      */
     @ApiOperation("修改岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysPost post) {
@@ -101,7 +101,7 @@ public class SysPostController extends BaseController {
      * 删除岗位
      */
     @ApiOperation("删除岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @SaCheckPermission("system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
     public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {

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

@@ -5,11 +5,12 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.TokenService;
+import com.ruoyi.common.core.service.UserService;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.LoginUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.system.service.ISysUserService;
@@ -40,7 +41,6 @@ import java.util.Map;
 public class SysProfileController extends BaseController {
 
     private final ISysUserService userService;
-    private final TokenService tokenService;
     private final ISysOssService iSysOssService;
 
     /**
@@ -49,12 +49,11 @@ public class SysProfileController extends BaseController {
     @ApiOperation("个人信息")
     @GetMapping
     public R<Map<String, Object>> profile() {
-        LoginUser loginUser = getLoginUser();
-        SysUser user = userService.selectUserById(loginUser.getUserId());
+        SysUser user = userService.selectUserById(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 R.success(ajax);
     }
 
@@ -73,9 +72,7 @@ public class SysProfileController extends BaseController {
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return R.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        LoginUser loginUser = getLoginUser();
-        SysUser sysUser = userService.selectUserById(loginUser.getUserId());
-        user.setUserId(sysUser.getUserId());
+        user.setUserId(getUserId());
         user.setUserName(null);
         user.setPassword(null);
         if (userService.updateUserProfile(user) > 0) {
@@ -95,7 +92,7 @@ public class SysProfileController extends BaseController {
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public R<Void> updatePwd(String oldPassword, String newPassword) {
-        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
+        SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
         String userName = user.getUserName();
         String password = user.getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password)) {
@@ -120,12 +117,11 @@ public class SysProfileController extends BaseController {
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
     public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
-        Map<String, Object> ajax = new HashMap<>();
+        Map<String,Object> ajax = new HashMap<>();
         if (!file.isEmpty()) {
-            LoginUser loginUser = getLoginUser();
             SysOss oss = iSysOssService.upload(file);
             String avatar = oss.getUrl();
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
+            if (userService.updateUserAvatar(getUsername(), avatar)) {
                 ajax.put("imgUrl", avatar);
                 return R.success(ajax);
             }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.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,8 +10,8 @@ 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.core.service.TokenService;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.LoginUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysUserRole;
@@ -20,7 +21,6 @@ import com.ruoyi.system.service.SysPermissionService;
 import io.swagger.annotations.*;
 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.*;
 
@@ -40,12 +40,11 @@ import java.util.List;
 public class SysRoleController extends BaseController {
 
     private final ISysRoleService roleService;
-    private final TokenService tokenService;
     private final ISysUserService userService;
     private final SysPermissionService permissionService;
 
     @ApiOperation("查询角色信息列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @SaCheckPermission("system:role:list")
     @GetMapping("/list")
     public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
         return roleService.selectPageRoleList(role, pageQuery);
@@ -53,7 +52,7 @@ public class SysRoleController extends BaseController {
 
     @ApiOperation("导出角色信息列表")
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @SaCheckPermission("system:role:export")
     @PostMapping("/export")
     public void export(SysRole role, HttpServletResponse response) {
         List<SysRole> list = roleService.selectRoleList(role);
@@ -64,7 +63,7 @@ public class SysRoleController extends BaseController {
      * 根据角色编号获取详细信息
      */
     @ApiOperation("根据角色编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
     public R<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
@@ -75,7 +74,7 @@ public class SysRoleController extends BaseController {
      * 新增角色
      */
     @ApiOperation("新增角色")
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysRole role) {
@@ -92,7 +91,7 @@ public class SysRoleController extends BaseController {
      * 修改保存角色
      */
     @ApiOperation("修改保存角色")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysRole role) {
@@ -108,8 +107,8 @@ public class SysRoleController extends BaseController {
             LoginUser loginUser = getLoginUser();
             SysUser sysUser = userService.selectUserById(loginUser.getUserId());
             if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
-                loginUser.setMenuPermissions(permissionService.getMenuPermission(sysUser));
-                tokenService.setLoginUser(loginUser);
+                loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
+                LoginUtils.setLoginUser(loginUser);
             }
             return R.success();
         }
@@ -120,7 +119,7 @@ public class SysRoleController extends BaseController {
      * 修改保存数据权限
      */
     @ApiOperation("修改保存数据权限")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     public R<Void> dataScope(@RequestBody SysRole role) {
@@ -132,7 +131,7 @@ public class SysRoleController extends BaseController {
      * 状态修改
      */
     @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@RequestBody SysRole role) {
@@ -144,7 +143,7 @@ public class SysRoleController extends BaseController {
      * 删除角色
      */
     @ApiOperation("删除角色")
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @SaCheckPermission("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
     public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
@@ -155,7 +154,7 @@ public class SysRoleController extends BaseController {
      * 获取角色选择框列表
      */
     @ApiOperation("获取角色选择框列表")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @SaCheckPermission("system:role:query")
     @GetMapping("/optionselect")
     public R<List<SysRole>> optionselect() {
         return R.success(roleService.selectRoleAll());
@@ -165,7 +164,7 @@ public class SysRoleController extends BaseController {
      * 查询已分配用户角色列表
      */
     @ApiOperation("查询已分配用户角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
         return userService.selectAllocatedList(user, pageQuery);
@@ -175,7 +174,7 @@ public class SysRoleController extends BaseController {
      * 查询未分配用户角色列表
      */
     @ApiOperation("查询未分配用户角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
         return userService.selectUnallocatedList(user, pageQuery);
@@ -185,7 +184,7 @@ public class SysRoleController extends BaseController {
      * 取消授权用户
      */
     @ApiOperation("取消授权用户")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
     public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
@@ -200,7 +199,7 @@ public class SysRoleController extends BaseController {
         @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
     })
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
     public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
@@ -215,7 +214,7 @@ public class SysRoleController extends BaseController {
         @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
     })
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
     public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {

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;
@@ -26,7 +27,6 @@ import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.*;
 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.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -58,7 +58,7 @@ public class SysUserController extends BaseController {
      * 获取用户列表
      */
     @ApiOperation("获取用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @SaCheckPermission("system:user:list")
     @GetMapping("/list")
     public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
@@ -66,7 +66,7 @@ public class SysUserController extends BaseController {
 
     @ApiOperation("导出用户列表")
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @SaCheckPermission("system:user:export")
     @PostMapping("/export")
     public void export(SysUser user, HttpServletResponse response) {
         List<SysUser> list = userService.selectUserList(user);
@@ -87,7 +87,7 @@ public class SysUserController extends BaseController {
             @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
     })
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @SaCheckPermission("system:user:import")
     @PostMapping("/importData")
     public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
@@ -104,8 +104,8 @@ public class SysUserController extends BaseController {
      * 根据用户编号获取详细信息
      */
     @ApiOperation("根据用户编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = {"/", "/{userId}"})
+    @SaCheckPermission("system:user:query")
+    @GetMapping(value = {"/", "/{userId}" })
     public R<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
@@ -113,9 +113,10 @@ public class SysUserController extends BaseController {
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
         if (StringUtils.isNotNull(userId)) {
-            ajax.put("user", userService.selectUserById(userId));
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put("user", sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
         return R.success(ajax);
     }
@@ -124,7 +125,7 @@ public class SysUserController extends BaseController {
      * 新增用户
      */
     @ApiOperation("新增用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysUser user) {
@@ -145,7 +146,7 @@ public class SysUserController extends BaseController {
      * 修改用户
      */
     @ApiOperation("修改用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysUser user) {
@@ -164,7 +165,7 @@ public class SysUserController extends BaseController {
      * 删除用户
      */
     @ApiOperation("删除用户")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @SaCheckPermission("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
@@ -178,7 +179,7 @@ public class SysUserController extends BaseController {
      * 重置密码
      */
     @ApiOperation("重置密码")
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public R<Void> resetPwd(@RequestBody SysUser user) {
@@ -191,7 +192,7 @@ public class SysUserController extends BaseController {
      * 状态修改
      */
     @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@RequestBody SysUser user) {
@@ -203,7 +204,7 @@ public class SysUserController extends BaseController {
      * 根据用户编号获取授权角色
      */
     @ApiOperation("根据用户编号获取授权角色")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @SaCheckPermission("system:user:query")
     @GetMapping("/authRole/{userId}")
     public R<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
         SysUser user = userService.selectUserById(userId);
@@ -222,7 +223,7 @@ public class SysUserController extends BaseController {
         @ApiImplicitParam(name = "userId", value = "用户Id", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "roleIds", value = "角色ID串", paramType = "query", dataTypeClass = String.class)
     })
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public R<Void> insertAuthRole(Long userId, Long[] roleIds) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java

@@ -0,0 +1,117 @@
+package com.ruoyi.web.controller.workflow;
+
+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;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.workflow.domain.bo.FlowCategoryBo;
+import com.ruoyi.workflow.domain.vo.FlowCategoryVo;
+import com.ruoyi.workflow.service.IFlowCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 流程分类Controller
+ *
+ * @author ruoyi
+ * @date 2022-01-15
+ */
+@Validated
+@Api(value = "流程分类控制器", tags = {"流程分类管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/workflow/category")
+public class FlowCategoryController extends BaseController {
+
+    private final IFlowCategoryService iFlowCategoryService;
+
+    /**
+     * 查询流程分类列表
+     */
+    @ApiOperation("查询流程分类列表")
+    @SaCheckPermission("workflow:category:list")
+    @GetMapping("/list")
+    public TableDataInfo<FlowCategoryVo> list(@Validated(QueryGroup.class) FlowCategoryBo bo, PageQuery pageQuery) {
+        return iFlowCategoryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出流程分类列表
+     */
+    @ApiOperation("导出流程分类列表")
+    @SaCheckPermission("workflow:category:export")
+    @Log(title = "流程分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Validated FlowCategoryBo bo, HttpServletResponse response) {
+        List<FlowCategoryVo> list = iFlowCategoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "流程分类", FlowCategoryVo.class, response);
+    }
+
+    /**
+     * 获取流程分类详细信息
+     */
+    @ApiOperation("获取流程分类详细信息")
+    @SaCheckPermission("workflow:category:query")
+    @GetMapping("/{categoryId}")
+    public R<FlowCategoryVo> getInfo(@ApiParam("主键")
+                                                  @NotNull(message = "主键不能为空")
+                                                  @PathVariable("categoryId") Long categoryId) {
+        return R.success(iFlowCategoryService.queryById(categoryId));
+    }
+
+    /**
+     * 新增流程分类
+     */
+    @ApiOperation("新增流程分类")
+    @SaCheckPermission("workflow:category:add")
+    @Log(title = "流程分类", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo bo) {
+        return toAjax(iFlowCategoryService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改流程分类
+     */
+    @ApiOperation("修改流程分类")
+    @SaCheckPermission("workflow:category:edit")
+    @Log(title = "流程分类", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo bo) {
+        return toAjax(iFlowCategoryService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除流程分类
+     */
+    @ApiOperation("删除流程分类")
+    @SaCheckPermission("workflow:category:remove")
+    @Log(title = "流程分类" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{categoryIds}")
+    public R<Void> remove(@ApiParam("主键串")
+                                       @NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] categoryIds) {
+        return toAjax(iFlowCategoryService.deleteWithValidByIds(Arrays.asList(categoryIds), true) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java

@@ -1,11 +1,11 @@
-package com.ruoyi.flowable.controller;
+package com.ruoyi.web.controller.workflow;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.flowable.domain.dto.FlowProcDefDto;
-import com.ruoyi.flowable.domain.dto.FlowSaveXmlVo;
-import com.ruoyi.flowable.service.IFlowDefinitionService;
+import com.ruoyi.workflow.domain.dto.FlowProcDefDto;
+import com.ruoyi.workflow.domain.dto.FlowSaveXmlVo;
+import com.ruoyi.workflow.service.IFlowDefinitionService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
@@ -38,7 +38,7 @@ import java.util.Map;
 @Slf4j
 @Api(tags = "流程定义")
 @RestController
-@RequestMapping("/flowable/definition")
+@RequestMapping("/workflow/definition")
 public class FlowDefinitionController {
 
     @Autowired

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java

@@ -1,9 +1,9 @@
-package com.ruoyi.flowable.controller;
+package com.ruoyi.web.controller.workflow;
 
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.flowable.domain.vo.FlowTaskVo;
-import com.ruoyi.flowable.service.IFlowInstanceService;
+import com.ruoyi.workflow.domain.vo.FlowTaskVo;
+import com.ruoyi.workflow.service.IFlowInstanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -22,7 +22,7 @@ import java.util.Map;
 @Slf4j
 @Api(tags = "工作流流程实例管理")
 @RestController
-@RequestMapping("/flowable/instance")
+@RequestMapping("/workflow/instance")
 public class FlowInstanceController {
 
     @Autowired

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java

@@ -1,9 +1,9 @@
-package com.ruoyi.flowable.controller;
+package com.ruoyi.web.controller.workflow;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.flowable.domain.dto.FlowTaskDto;
-import com.ruoyi.flowable.domain.vo.FlowTaskVo;
-import com.ruoyi.flowable.service.IFlowTaskService;
+import com.ruoyi.workflow.domain.dto.FlowTaskDto;
+import com.ruoyi.workflow.domain.vo.FlowTaskVo;
+import com.ruoyi.workflow.service.IFlowTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,7 +27,7 @@ import java.io.OutputStream;
 @Slf4j
 @Api(tags = "工作流流程任务管理")
 @RestController
-@RequestMapping("/flowable/task")
+@RequestMapping("/workflow/task")
 public class FlowTaskController {
 
     @Autowired

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java

@@ -1,17 +1,18 @@
-package com.ruoyi.flowable.controller;
+package com.ruoyi.web.controller.workflow;
 
+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.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.flowable.service.ISysDeployFormService;
-import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.workflow.service.ISysDeployFormService;
+import com.ruoyi.workflow.service.ISysFormService;
 import com.ruoyi.system.domain.SysDeployForm;
 import com.ruoyi.system.domain.SysForm;
 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;
@@ -24,7 +25,7 @@ import java.util.List;
  * @date 2021-04-03
  */
 @RestController
-@RequestMapping("/flowable/form")
+@RequestMapping("/workflow/form")
 public class SysFormController extends BaseController {
     @Autowired
     private ISysFormService SysFormService;
@@ -35,16 +36,16 @@ public class SysFormController extends BaseController {
     /**
      * 查询流程表单列表
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:list')")
+    @SaCheckPermission("flowable:form:list")
     @GetMapping("/list")
-    public TableDataInfo list(SysForm sysForm) {
-        return SysFormService.selectSysFormPage(sysForm);
+    public TableDataInfo list(SysForm sysForm, PageQuery pageQuery) {
+        return SysFormService.selectSysFormPage(sysForm, pageQuery);
     }
 
     /**
      * 导出流程表单列表
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:export')")
+    @SaCheckPermission("flowable:form:export")
     @Log(title = "流程表单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public void export(SysForm sysForm, HttpServletResponse response) {
@@ -55,7 +56,7 @@ public class SysFormController extends BaseController {
     /**
      * 获取流程表单详细信息
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:query')")
+    @SaCheckPermission("flowable:form:query")
     @GetMapping(value = "/{formId}")
     public R getInfo(@PathVariable("formId") Long formId) {
         return R.success(SysFormService.selectSysFormById(formId));
@@ -64,7 +65,7 @@ public class SysFormController extends BaseController {
     /**
      * 新增流程表单
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:add')")
+    @SaCheckPermission("flowable:form:add")
     @Log(title = "流程表单", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody SysForm sysForm) {
@@ -74,7 +75,7 @@ public class SysFormController extends BaseController {
     /**
      * 修改流程表单
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:edit')")
+    @SaCheckPermission("flowable:form:edit")
     @Log(title = "流程表单", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody SysForm sysForm) {
@@ -84,7 +85,7 @@ public class SysFormController extends BaseController {
     /**
      * 删除流程表单
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:remove')")
+    @SaCheckPermission("flowable:form:remove")
     @Log(title = "流程表单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{formIds}")
     public R remove(@PathVariable Long[] formIds) {

ruoyi-admin/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ spring:
 xxl:
   job:
     # 执行器开关
-    enabled: true
+    enabled: false
     # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
     admin-addresses: http://localhost:9100/xxl-job-admin
     # 执行器通讯TOKEN：非空时启用
@@ -121,7 +121,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: konbai123..
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -129,9 +129,9 @@ spring:
 
 redisson:
   # 线程池数量
-  threads: 16
+  threads: 4
   # Netty线程池数量
-  nettyThreads: 32
+  nettyThreads: 8
   # 传输模式
   transportMode: "NIO"
   # 单节点配置
@@ -139,9 +139,9 @@ redisson:
     # 客户端名称
     clientName: ${ruoyi.name}
     # 最小空闲连接数
-    connectionMinimumIdleSize: 32
+    connectionMinimumIdleSize: 8
     # 连接池大小
-    connectionPoolSize: 64
+    connectionPoolSize: 32
     # 连接空闲超时，单位：毫秒
     idleConnectionTimeout: 10000
     # 命令等待超时，单位：毫秒

ruoyi-admin/src/main/resources/application.yml

@@ -83,6 +83,10 @@ spring:
   thymeleaf:
     # 将系统模板放置到最前面 否则会与 springboot-admin 页面冲突
     template-resolver-order: 1
+  mvc:
+    pathmatch:
+      # 适配 boot 2.6 路由与 springfox 兼容
+      matching-strategy: ANT_PATH_MATCHER
   jackson:
     # 日期格式化
     date-format: yyyy-MM-dd HH:mm:ss
@@ -95,24 +99,46 @@ spring:
       # 允许对象忽略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有效期 设为一天 (必定过期) 单位: 秒
+  timeout: 86400
+  # token临时有效期 (指定时间无操作就过期) 单位: 秒
+  activity-timeout: 1800
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: false
+  # 是否尝试从请求体里读取token
+  is-read-body: false
+  # 是否尝试从header里读取token
+  is-read-head: true
+  # 是否尝试从cookie里读取token
+  is-read-cookie: false
+  # token前缀
+  token-prefix: "Bearer"
+  # token风格
+  token-style: uuid
+  # jwt秘钥
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # 是否输出操作日志
+  is-log: true
 
 # security配置
 security:
-  # 登出路径
-  logout-url: /logout
-  # 匿名路径
-  anonymous:
+  # 排除路径
+  excludes:
     - /login
+    - /logout
     - /register
     - /captchaImage
+    # 静态资源
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
     # swagger 文档配置
     - /doc.html
     - /swagger-resources/**
@@ -221,6 +247,10 @@ knife4j:
   enable: true
   # 是否开启生产环境保护策略
   production: @knife4j.production@
+  basic:
+    enable: true
+    username: ruoyi
+    password: 123456
   # 前端Ui的个性化配置属性
   setting:
     # 默认语言

ruoyi-common/pom.xml

@@ -29,10 +29,20 @@
             <artifactId>spring-web</artifactId>
         </dependency>
 
-        <!-- spring security 安全认证 -->
+        <!-- Sa-Token 权限认证, 在线文档：http://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 整合 jwt -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
         </dependency>
 
         <!-- 自定义验证注解 -->

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java

@@ -1,32 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 数据权限过滤注解
- *
- * @author ruoyi
- * @deprecated 3.6.0 移除 {@link com.ruoyi.common.annotation.DataPermission}
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Deprecated
-public @interface DataScope {
-
-    /**
-     * 部门表的别名
-     */
-    String deptAlias() default "";
-
-    /**
-     * 用户表的别名
-     */
-    String userAlias() default "";
-
-    /**
-     * 是否过滤用户权限
-     */
-    boolean isUser() default false;
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java

@@ -1,25 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import com.ruoyi.common.enums.DataSourceType;
-
-import java.lang.annotation.*;
-
-/**
- * 自定义多数据源切换注解
- * <p>
- * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
- *
- * @author ruoyi
- * @deprecated 3.6.0 移除 使用原生注解处理 方法更全 {@link com.baomidou.dynamic.datasource.annotation.DS}
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Deprecated
-public @interface DataSource {
-    /**
-     * 切换数据源名称
-     */
-    DataSourceType value() default DataSourceType.MASTER;
-}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java

@@ -0,0 +1,23 @@
+package com.ruoyi.common.annotation;
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ruoyi.common.enums.SensitiveStrategy;
+import com.ruoyi.common.jackson.SensitiveJsonSerializer;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据脱敏注解
+ * @author zhujie
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@JacksonAnnotationsInside
+@JsonSerialize(using = SensitiveJsonSerializer.class)
+public @interface Sensitive {
+    SensitiveStrategy strategy();
+}

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.constant;
 
-
 /**
  * 通用常量信息
  *
@@ -66,7 +65,12 @@ public interface Constants {
     /**
      * 登录用户 redis key
      */
-    String LOGIN_TOKEN_KEY = "login_tokens:";
+    public static final String LOGIN_TOKEN_KEY = "Authorization:login:token:";
+
+    /**
+     * 在线用户 redis key
+     */
+    public static final String ONLINE_TOKEN_KEY = "online_tokens:";
 
     /**
      * 防重提交 redis key
@@ -103,41 +107,11 @@ public interface Constants {
      */
     String TOKEN = "token";
 
-    /**
-     * 令牌前缀
-     */
-    String TOKEN_PREFIX = "Bearer ";
-
     /**
      * 令牌前缀
      */
     String LOGIN_USER_KEY = "login_user_key";
 
-    /**
-     * 用户ID
-     */
-    String JWT_USERID = "userid";
-
-    /**
-     * 用户名称
-     */
-    String JWT_USERNAME = "sub";
-
-    /**
-     * 用户头像
-     */
-    String JWT_AVATAR = "avatar";
-
-    /**
-     * 创建时间
-     */
-    String JWT_CREATED = "created";
-
-    /**
-     * 用户权限
-     */
-    String JWT_AUTHORITIES = "authorities";
-
     /**
      * 参数管理 cache key
      */
@@ -149,3 +123,4 @@ public interface Constants {
     String SYS_DICT_KEY = "sys_dict:";
 
 }
+

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -2,7 +2,7 @@ package com.ruoyi.common.core.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.LoginUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -71,27 +71,27 @@ public class BaseController {
      * 获取用户缓存信息
      */
     public LoginUser getLoginUser() {
-        return SecurityUtils.getLoginUser();
+        return LoginUtils.getLoginUser();
     }
 
     /**
      * 获取登录用户id
      */
     public Long getUserId() {
-        return getLoginUser().getUserId();
+        return LoginUtils.getUserId();
     }
 
     /**
      * 获取登录部门id
      */
     public Long getDeptId() {
-        return getLoginUser().getDeptId();
+        return LoginUtils.getDeptId();
     }
 
     /**
      * 获取登录用户名
      */
     public String getUsername() {
-        return getLoginUser().getUsername();
+        return LoginUtils.getUsername();
     }
 }

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;
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -3,7 +3,9 @@ package com.ruoyi.common.core.domain.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.annotation.Sensitive;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.enums.SensitiveStrategy;
 import com.ruoyi.common.xss.Xss;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -65,6 +67,7 @@ public class SysUser extends BaseEntity {
     /**
      * 用户邮箱
      */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
     @ApiModelProperty(value = "用户邮箱")
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
@@ -73,6 +76,7 @@ public class SysUser extends BaseEntity {
     /**
      * 手机号码
      */
+    @Sensitive(strategy = SensitiveStrategy.PHONE)
     @ApiModelProperty(value = "手机号码")
     private String phonenumber;
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -1,13 +1,10 @@
 package com.ruoyi.common.core.domain.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 
-import java.util.Collection;
+import java.io.Serializable;
 import java.util.Set;
 
 /**
@@ -19,7 +16,7 @@ import java.util.Set;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-public class LoginUser implements UserDetails {
+public class LoginUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -71,12 +68,12 @@ public class LoginUser implements UserDetails {
     /**
      * 菜单权限
      */
-    private Set<String> menuPermissions;
+    private Set<String> menuPermission;
 
     /**
      * 角色权限
      */
-    private Set<String> rolePermissions;
+    private Set<String> rolePermission;
 
     /**
      * 昵称
@@ -88,60 +85,4 @@ public class LoginUser implements UserDetails {
      */
     private String username;
 
-    /**
-     * 密码
-     */
-    private String password;
-
-    @JsonIgnore
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * 账户是否未过期,过期无法验证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    /**
-     * 指定用户是否解锁,锁定的用户无法进行身份验证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    /**
-     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    /**
-     * 是否可用 ,禁用的用户不能身份验证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return null;
-    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java

@@ -0,0 +1,229 @@
+package com.ruoyi.common.core.mapper;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlMethod;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.baomidou.mybatisplus.core.toolkit.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import org.apache.ibatis.binding.MapperMethod;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 自定义 Mapper 接口, 实现 自定义扩展
+ *
+ * @param <M> mapper 泛型
+ * @param <T> table 泛型
+ * @param <V> vo 泛型
+ * @author Lion Li
+ * @since 2021-05-13
+ */
+@SuppressWarnings("unchecked")
+public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
+
+    Log log = LogFactory.getLog(BaseMapperPlus.class);
+
+    int DEFAULT_BATCH_SIZE = 1000;
+
+    default Class<V> currentVoClass() {
+        return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 2);
+    }
+
+    default Class<T> currentModelClass() {
+        return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 1);
+    }
+
+    default Class<M> currentMapperClass() {
+        return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 0);
+    }
+
+    default List<T> selectList() {
+        return this.selectList(new QueryWrapper<>());
+    }
+
+    /**
+     * 批量插入
+     */
+    default boolean insertBatch(Collection<T> entityList) {
+        return insertBatch(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    /**
+     * 批量更新
+     */
+    default boolean updateBatchById(Collection<T> entityList) {
+        return updateBatchById(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    /**
+     * 批量插入或更新
+     */
+    default boolean insertOrUpdateBatch(Collection<T> entityList) {
+        return insertOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    /**
+     * 批量插入(包含限制条数)
+     */
+    default boolean insertBatch(Collection<T> entityList, int batchSize) {
+        String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.INSERT_ONE);
+        return SqlHelper.executeBatch(this.currentModelClass(), log, entityList, batchSize,
+            (sqlSession, entity) -> sqlSession.insert(sqlStatement, entity));
+    }
+
+    /**
+     * 批量更新(包含限制条数)
+     */
+    default boolean updateBatchById(Collection<T> entityList, int batchSize) {
+        String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.UPDATE_BY_ID);
+        return SqlHelper.executeBatch(this.currentModelClass(), log, entityList, batchSize,
+            (sqlSession, entity) -> {
+                MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
+                param.put(Constants.ENTITY, entity);
+                sqlSession.update(sqlStatement, param);
+            });
+    }
+
+    /**
+     * 批量插入或更新(包含限制条数)
+     */
+    default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(this.currentModelClass());
+        Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
+        String keyProperty = tableInfo.getKeyProperty();
+        Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
+        return SqlHelper.saveOrUpdateBatch(this.currentModelClass(), getClass(), log, entityList, batchSize, (sqlSession, entity) -> {
+            Object idVal = tableInfo.getPropertyValue(entity, keyProperty);
+            String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.INSERT_ONE);
+            return StringUtils.checkValNull(idVal)
+                || CollectionUtils.isEmpty(sqlSession.selectList(sqlStatement, entity));
+        }, (sqlSession, entity) -> {
+            MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
+            param.put(Constants.ENTITY, entity);
+            String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.UPDATE_BY_ID);
+            sqlSession.update(sqlStatement, param);
+        });
+    }
+
+    /**
+     * 插入或更新(包含限制条数)
+     */
+    default boolean insertOrUpdate(T entity) {
+        if (null != entity) {
+            TableInfo tableInfo = TableInfoHelper.getTableInfo(this.currentModelClass());
+            Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
+            String keyProperty = tableInfo.getKeyProperty();
+            Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
+            Object idVal = tableInfo.getPropertyValue(entity, tableInfo.getKeyProperty());
+            return StringUtils.checkValNull(idVal) || Objects.isNull(selectById((Serializable) idVal)) ? insert(entity) > 0 : updateById(entity) > 0;
+        }
+        return false;
+    }
+
+    default V selectVoById(Serializable id) {
+        return selectVoById(id, this.currentVoClass());
+    }
+
+    /**
+     * 根据 ID 查询
+     */
+    default <C> C selectVoById(Serializable id, Class<C> voClass) {
+        T obj = this.selectById(id);
+        if (ObjectUtil.isNull(obj)) {
+            return null;
+        }
+        return BeanCopyUtils.copy(obj, voClass);
+    }
+
+    default List<V> selectVoById(Collection<? extends Serializable> idList) {
+        return selectVoBatchIds(idList, this.currentVoClass());
+    }
+
+    /**
+     * 查询（根据ID 批量查询）
+     */
+    default <C> List<C> selectVoBatchIds(Collection<? extends Serializable> idList, Class<C> voClass) {
+        List<T> list = this.selectBatchIds(idList);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return BeanCopyUtils.copyList(list, voClass);
+    }
+
+    default List<V> selectVoByMap(Map<String, Object> map) {
+        return selectVoByMap(map, this.currentVoClass());
+    }
+
+    /**
+     * 查询（根据 columnMap 条件）
+     */
+    default <C> List<C> selectVoByMap(Map<String, Object> map, Class<C> voClass) {
+        List<T> list = this.selectByMap(map);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return BeanCopyUtils.copyList(list, voClass);
+    }
+
+    default V selectVoOne(Wrapper<T> wrapper) {
+        return selectVoOne(wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据 entity 条件，查询一条记录
+     */
+    default <C> C selectVoOne(Wrapper<T> wrapper, Class<C> voClass) {
+        T obj = this.selectOne(wrapper);
+        if (ObjectUtil.isNull(obj)) {
+            return null;
+        }
+        return BeanCopyUtils.copy(obj, voClass);
+    }
+
+    default List<V> selectVoList(Wrapper<T> wrapper) {
+        return selectVoList(wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据 entity 条件，查询全部记录
+     */
+    default <C> List<C> selectVoList(Wrapper<T> wrapper, Class<C> voClass) {
+        List<T> list = this.selectList(wrapper);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return BeanCopyUtils.copyList(list, voClass);
+    }
+
+    default <P extends IPage<V>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper) {
+        return selectVoPage(page, wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 分页查询VO
+     */
+    default <C, P extends IPage<C>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper, Class<C> voClass) {
+        IPage<T> pageData = this.selectPage(page, wrapper);
+        IPage<C> voPage = new Page<>(pageData.getCurrent(), pageData.getSize(), pageData.getTotal());
+        if (CollUtil.isEmpty(pageData.getRecords())) {
+            return (P) voPage;
+        }
+        voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass));
+        return (P) voPage;
+    }
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java

@@ -1,102 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.core;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import org.apache.ibatis.annotations.Param;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 自定义 Mapper 接口, 实现 自定义扩展
- *
- * @author Lion Li
- * @since 2021-05-13
- */
-public interface BaseMapperPlus<T> extends BaseMapper<T> {
-
-	/**
-	 * 单sql批量插入( 全量填充 )
-	 */
-	int insertAll(@Param("list") Collection<T> batchList);
-
-    /**
-     * 根据 ID 查询
-     */
-    default <V> V selectVoById(Serializable id, Class<V> voClass){
-        T obj = this.selectById(id);
-        if (ObjectUtil.isNull(obj)) {
-            return null;
-        }
-        return BeanCopyUtils.copy(obj, voClass);
-    }
-
-    /**
-     * 查询（根据ID 批量查询）
-     */
-    default <V> List<V> selectVoBatchIds(Collection<? extends Serializable> idList, Class<V> voClass){
-        List<T> list = this.selectBatchIds(idList);
-        if (CollUtil.isEmpty(list)) {
-            return CollUtil.newArrayList();
-        }
-        return BeanCopyUtils.copyList(list, voClass);
-    }
-
-    /**
-     * 查询（根据 columnMap 条件）
-     */
-    default <V> List<V> selectVoByMap(Map<String, Object> map, Class<V> voClass){
-        List<T> list = this.selectByMap(map);
-        if (CollUtil.isEmpty(list)) {
-            return CollUtil.newArrayList();
-        }
-        return BeanCopyUtils.copyList(list, voClass);
-    }
-
-    /**
-     * 根据 entity 条件，查询一条记录
-     */
-    default <V> V selectVoOne(Wrapper<T> wrapper, Class<V> voClass) {
-        T obj = this.selectOne(wrapper);
-        if (ObjectUtil.isNull(obj)) {
-            return null;
-        }
-        return BeanCopyUtils.copy(obj, voClass);
-    }
-
-    /**
-     * 根据 entity 条件，查询全部记录
-     */
-    default <V> List<V> selectVoList(Wrapper<T> wrapper, Class<V> voClass) {
-        List<T> list = this.selectList(wrapper);
-        if (CollUtil.isEmpty(list)) {
-            return CollUtil.newArrayList();
-        }
-        return BeanCopyUtils.copyList(list, voClass);
-    }
-
-    /**
-     * 分页查询VO
-     */
-    default <V, P extends IPage<V>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper, Class<V> voClass) {
-        IPage<T> pageData = this.selectPage(page, wrapper);
-        IPage<V> voPage = new Page<>(pageData.getCurrent(), pageData.getSize(), pageData.getTotal());
-        if (CollUtil.isEmpty(pageData.getRecords())) {
-            return (P) voPage;
-        }
-        voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass));
-        return (P) voPage;
-    }
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java

@@ -1,155 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.core;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.page.PagePlus;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-/**
- * 自定义 Service 接口, 实现 数据库实体与 vo 对象转换返回
- *
- * @param <T> 数据实体类
- * @param <V> vo类
- * @author Lion Li
- */
-public interface IServicePlus<T, V> extends IService<T> {
-
-	/**
-	 * @param id          主键id
-	 * @return V对象
-	 */
-	V getVoById(Serializable id);
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default V getVoById(Serializable id, Function<T, V> convertor) {
-		return convertor.apply(getById(id));
-	}
-
-	/**
-	 * @param idList      id列表
-	 * @return V对象
-	 */
-	List<V> listVoByIds(Collection<? extends Serializable> idList);
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVoByIds(Collection<? extends Serializable> idList,
-								Function<Collection<T>, List<V>> convertor) {
-		List<T> list = getBaseMapper().selectBatchIds(idList);
-		if (list == null) {
-			return null;
-		}
-		return convertor.apply(list);
-	}
-
-	/**
-	 * @param columnMap   表字段 map 对象
-	 * @return V对象
-	 */
-	List<V> listVoByMap(Map<String, Object> columnMap);
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVoByMap(Map<String, Object> columnMap,
-								Function<Collection<T>, List<V>> convertor) {
-		List<T> list = getBaseMapper().selectByMap(columnMap);
-		if (list == null) {
-			return null;
-		}
-		return convertor.apply(list);
-	}
-
-	/**
-	 * @param queryWrapper 查询条件
-	 * @return V对象
-	 */
-	V getVoOne(Wrapper<T> queryWrapper);
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) {
-		return convertor.apply(getOne(queryWrapper, true));
-	}
-
-	/**
-	 * @param queryWrapper 查询条件
-	 * @return V对象
-	 */
-	List<V> listVo(Wrapper<T> queryWrapper);
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<V>> convertor) {
-		List<T> list = getBaseMapper().selectList(queryWrapper);
-		if (list == null) {
-			return null;
-		}
-		return convertor.apply(list);
-	}
-
-	default List<V> listVo() {
-		return listVo(Wrappers.emptyWrapper());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVo(Function<Collection<T>, List<V>> convertor) {
-		return listVo(Wrappers.emptyWrapper(), convertor);
-	}
-
-	/**
-	 * @param page         分页对象
-	 * @param queryWrapper 查询条件
-	 * @return V对象
-     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
-	 */
-    @Deprecated
-	PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper);
-
-    /**
-     * @param convertor 自定义转换器
-     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
-     */
-    @Deprecated
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper,
-								  Function<Collection<T>, List<V>> convertor) {
-		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
-		return result.setRecordsVo(convertor.apply(result.getRecords()));
-	}
-
-    /**
-     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
-     */
-    @Deprecated
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page) {
-		return pageVo(page, Wrappers.emptyWrapper());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
-	 */
-    @Deprecated
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Function<Collection<T>, List<V>> convertor) {
-		return pageVo(page, Wrappers.emptyWrapper(), convertor);
-	}
-
-	boolean saveAll(Collection<T> entityList);
-
-	boolean saveOrUpdateAll(Collection<T> entityList);
-}
-

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java

@@ -1,226 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.core;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * IServicePlus 实现类
- *
- * @param <M> Mapper类
- * @param <T> 数据实体类
- * @param <V> vo类
- * @author Lion Li
- */
-@Slf4j
-@SuppressWarnings("unchecked")
-public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, V> extends ServiceImpl<M, T> implements IServicePlus<T, V> {
-
-	@Autowired
-	protected M baseMapper;
-
-	@Override
-	public M getBaseMapper() {
-		return baseMapper;
-	}
-
-
-	protected Class<T> entityClass = currentModelClass();
-
-	@Override
-	public Class<T> getEntityClass() {
-		return entityClass;
-	}
-
-	protected Class<M> mapperClass = currentMapperClass();
-
-	protected Class<V> voClass = currentVoClass();
-
-	public Class<V> getVoClass() {
-		return voClass;
-	}
-
-	@Override
-	protected Class<M> currentMapperClass() {
-		return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 0);
-	}
-
-	@Override
-	protected Class<T> currentModelClass() {
-		return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 1);
-	}
-
-	protected Class<V> currentVoClass() {
-		return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 2);
-	}
-
-	/**
-	 * 单条执行性能差 适用于列表对象内容不确定
-	 */
-	@Override
-	public boolean saveBatch(Collection<T> entityList, int batchSize) {
-		return super.saveBatch(entityList, batchSize);
-	}
-
-	@Override
-	public boolean saveOrUpdate(T entity) {
-		return super.saveOrUpdate(entity);
-	}
-
-	/**
-	 * 单条执行性能差 适用于列表对象内容不确定
-	 */
-	@Override
-	public boolean saveOrUpdateBatch(Collection<T> entityList, int batchSize) {
-		return super.saveOrUpdateBatch(entityList, batchSize);
-	}
-
-	@Override
-	public boolean updateBatchById(Collection<T> entityList, int batchSize) {
-		return super.updateBatchById(entityList, batchSize);
-	}
-
-	/**
-	 * 单sql批量插入( 全量填充 无视数据库默认值 )
-	 * 适用于无脑插入
-	 */
-	@Override
-	public boolean saveBatch(Collection<T> entityList) {
-		return saveBatch(entityList, DEFAULT_BATCH_SIZE);
-	}
-
-	@Override
-	public boolean saveOrUpdateBatch(Collection<T> entityList) {
-		return saveOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE);
-	}
-
-	@Override
-	public boolean updateBatchById(Collection<T> entityList) {
-		return updateBatchById(entityList, DEFAULT_BATCH_SIZE);
-	}
-
-	/**
-	 * 单sql批量插入( 全量填充 )
-	 */
-	@Override
-	public boolean saveAll(Collection<T> entityList) {
-		if (CollUtil.isEmpty(entityList)) {
-			return false;
-		}
-		return baseMapper.insertAll(entityList) == entityList.size();
-	}
-
-	/**
-	 * 全量保存或更新 ( 按主键区分 )
-	 */
-	@Override
-	public boolean saveOrUpdateAll(Collection<T> entityList) {
-		if (CollUtil.isEmpty(entityList)) {
-			return false;
-		}
-		TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
-		Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
-		String keyProperty = tableInfo.getKeyProperty();
-		Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
-		List<T> addList = new ArrayList<>();
-		List<T> updateList = new ArrayList<>();
-		int row = 0;
-		for (T entity : entityList) {
-			Object id = ReflectUtils.invokeGetter(entity, keyProperty);
-			if (ObjectUtil.isNull(id)) {
-				addList.add(entity);
-			} else {
-				updateList.add(entity);
-			}
-		}
-		if (CollUtil.isNotEmpty(updateList) && updateBatchById(updateList)) {
-			row += updateList.size();
-		}
-        if (CollUtil.isNotEmpty(addList)) {
-            row += baseMapper.insertAll(addList);
-        }
-		return row == entityList.size();
-	}
-
-	/**
-	 * 根据 ID 查询
-	 */
-	@Override
-	public V getVoById(Serializable id) {
-        return getBaseMapper().selectVoById(id, voClass);
-	}
-
-	/**
-	 * 查询（根据ID 批量查询）
-	 */
-	@Override
-	public List<V> listVoByIds(Collection<? extends Serializable> idList) {
-        return getBaseMapper().selectVoBatchIds(idList, voClass);
-	}
-
-	/**
-	 * 查询（根据 columnMap 条件）
-	 */
-	@Override
-	public List<V> listVoByMap(Map<String, Object> columnMap) {
-        return getBaseMapper().selectVoByMap(columnMap, voClass);
-	}
-
-	/**
-	 * 根据 Wrapper，查询一条记录 <br/>
-	 * <p>结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")</p>
-	 */
-	@Override
-	public V getVoOne(Wrapper<T> queryWrapper) {
-        return getBaseMapper().selectVoOne(queryWrapper, voClass);
-	}
-
-	/**
-	 * 查询列表
-	 */
-	@Override
-	public List<V> listVo(Wrapper<T> queryWrapper) {
-        return getBaseMapper().selectVoList(queryWrapper, voClass);
-	}
-
-	/**
-	 * 翻页查询
-     * @deprecated 3.6.0 移除 请使用 {@link #pageVo(IPage, Wrapper)}
-	 */
-	@Override
-    @Deprecated
-	public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
-		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
-		List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
-		result.setRecordsVo(volist);
-		return result;
-	}
-
-    /**
-     * 翻页查询
-     *
-     * @param page         翻页对象
-     * @param queryWrapper 实体对象封装操作类
-     */
-    public <P extends IPage<V>> P pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
-        return getBaseMapper().selectVoPage(page, queryWrapper, voClass);
-    }
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java

@@ -1,101 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.methods;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.ruoyi.common.utils.StringUtils;
-import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
-import org.apache.ibatis.executor.keygen.KeyGenerator;
-import org.apache.ibatis.executor.keygen.NoKeyGenerator;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.SqlSource;
-
-import java.util.List;
-
-/**
- * 单sql批量插入( 全量填充 )
- *
- * @author Lion Li
- */
-public class InsertAll extends AbstractMethod {
-
-	private final static String[] FILL_PROPERTY = {"createTime", "createBy", "updateTime", "updateBy"};
-
-	@Override
-	public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
-		final String sql = "<script>insert into %s %s values %s</script>";
-		final String fieldSql = prepareFieldSql(tableInfo);
-		final String valueSql = prepareValuesSqlForMysqlBatch(tableInfo);
-		KeyGenerator keyGenerator = new NoKeyGenerator();
-		String sqlMethod = "insertAll";
-		String keyProperty = null;
-		String keyColumn = null;
-		// 表包含主键处理逻辑,如果不包含主键当普通字段处理
-		if (StringUtils.isNotBlank(tableInfo.getKeyProperty())) {
-			if (tableInfo.getIdType() == IdType.AUTO) {
-				/** 自增主键 */
-				keyGenerator = new Jdbc3KeyGenerator();
-				keyProperty = tableInfo.getKeyProperty();
-				keyColumn = tableInfo.getKeyColumn();
-			} else {
-				if (null != tableInfo.getKeySequence()) {
-					keyGenerator = TableInfoHelper.genKeyGenerator(sqlMethod, tableInfo, builderAssistant);
-					keyProperty = tableInfo.getKeyProperty();
-					keyColumn = tableInfo.getKeyColumn();
-				}
-			}
-		}
-		final String sqlResult = String.format(sql, tableInfo.getTableName(), fieldSql, valueSql);
-		SqlSource sqlSource = languageDriver.createSqlSource(configuration, sqlResult, modelClass);
-		return this.addInsertMappedStatement(mapperClass, modelClass, sqlMethod, sqlSource, keyGenerator, keyProperty, keyColumn);
-	}
-
-	private String prepareFieldSql(TableInfo tableInfo) {
-		StringBuilder fieldSql = new StringBuilder();
-		if (StringUtils.isNotBlank(tableInfo.getKeyColumn())) {
-			fieldSql.append(tableInfo.getKeyColumn()).append(",");
-		}
-		tableInfo.getFieldList().forEach(x -> fieldSql.append(x.getColumn()).append(","));
-		fieldSql.delete(fieldSql.length() - 1, fieldSql.length());
-		fieldSql.insert(0, "(");
-		fieldSql.append(")");
-		return fieldSql.toString();
-	}
-
-	private String prepareValuesSqlForMysqlBatch(TableInfo tableInfo) {
-		final StringBuilder valueSql = new StringBuilder();
-		valueSql.append("<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"(\" separator=\"),(\" close=\")\">");
-		if (StringUtils.isNotBlank(tableInfo.getKeyColumn())) {
-			valueSql.append("\n#{item.").append(tableInfo.getKeyProperty()).append("},\n");
-		}
-		List<TableFieldInfo> fieldList = tableInfo.getFieldList();
-		int last = fieldList.size() - 1;
-		for (int i = 0; i < fieldList.size(); i++) {
-			String property = fieldList.get(i).getProperty();
-			if (!StringUtils.equalsAny(property, FILL_PROPERTY)) {
-				valueSql.append("<if test=\"item.").append(property).append(" != null\">");
-				valueSql.append("#{item.").append(property).append("}");
-				if (i != last) {
-					valueSql.append(",");
-				}
-				valueSql.append("</if>");
-				valueSql.append("<if test=\"item.").append(property).append(" == null\">");
-				valueSql.append("DEFAULT");
-				if (i != last) {
-					valueSql.append(",");
-				}
-				valueSql.append("</if>");
-			} else {
-				valueSql.append("#{item.").append(property).append("}");
-				if (i != last) {
-					valueSql.append(",");
-				}
-			}
-		}
-		valueSql.append("</foreach>");
-		return valueSql.toString();
-	}
-}
-

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java

@@ -1,158 +0,0 @@
-package com.ruoyi.common.core.page;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 分页 Page 增强对象
- *
- * @param <T> 数据库实体
- * @param <K> vo实体
- * @author Lion Li
- * @deprecated 3.6.0 删除 请使用 {@link com.ruoyi.common.core.domain.PageQuery#build()}
- */
-@Data
-@Accessors(chain = true)
-@Deprecated
-public class PagePlus<T,K> implements IPage<T> {
-
-    /**
-     * domain实体列表
-     */
-    private List<T> records = Collections.emptyList();
-
-    /**
-     * vo实体列表
-     */
-    private List<K> recordsVo = Collections.emptyList();
-
-    /**
-     * 总数
-     */
-    private long total = 0L;
-
-    /**
-     * 页长度
-     */
-    private long size = 10L;
-
-    /**
-     * 当前页
-     */
-    private long current = 1L;
-
-    /**
-     * 排序字段信息
-     */
-    private List<OrderItem> orders = new ArrayList<>();
-
-    /**
-     * 自动优化 COUNT SQL
-     */
-    private boolean optimizeCountSql = true;
-
-    /**
-     * 是否进行 count 查询
-     */
-    private boolean isSearchCount = true;
-
-    /**
-     * 是否命中count缓存
-     */
-    private boolean hitCount = false;
-
-    /**
-     * countId
-     */
-    private String countId;
-
-    /**
-     * 最大limit
-     */
-    private Long maxLimit;
-
-    public PagePlus() {
-    }
-
-    public PagePlus(long current, long size) {
-        this(current, size, 0L);
-    }
-
-    public PagePlus(long current, long size, long total) {
-        this(current, size, total, true);
-    }
-
-    public PagePlus(long current, long size, boolean isSearchCount) {
-        this(current, size, 0L, isSearchCount);
-    }
-
-    public PagePlus(long current, long size, long total, boolean isSearchCount) {
-        if (current > 1L) {
-            this.current = current;
-        }
-        this.size = size;
-        this.total = total;
-        this.isSearchCount = isSearchCount;
-    }
-
-    @Override
-    public String countId() {
-        return this.getCountId();
-    }
-
-    @Override
-    public Long maxLimit() {
-        return this.getMaxLimit();
-    }
-
-    public PagePlus<T, K> addOrder(OrderItem... items) {
-        this.orders.addAll(Arrays.asList(items));
-        return this;
-    }
-
-    public PagePlus<T, K> addOrder(List<OrderItem> items) {
-        this.orders.addAll(items);
-        return this;
-    }
-
-    @Override
-    public List<OrderItem> orders() {
-        return this.getOrders();
-    }
-
-    @Override
-    public boolean optimizeCountSql() {
-        return this.optimizeCountSql;
-    }
-
-	@Override
-	public long getPages() {
-		// 解决 github issues/3208
-		return IPage.super.getPages();
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size) {
-		return of(current, size, 0);
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size, long total) {
-		return of(current, size, total, true);
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size, boolean searchCount) {
-		return of(current, size, 0, searchCount);
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size, long total, boolean searchCount) {
-		return new PagePlus<>(current, size, total, searchCount);
-	}
-
-}
-

ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java

@@ -0,0 +1,18 @@
+package com.ruoyi.common.core.service;
+
+/**
+ * 脱敏服务
+ * 默认管理员不过滤
+ * 需自行根据业务重写实现
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+public interface SensitiveService {
+
+    /**
+     * 是否脱敏
+     */
+    boolean isSensitive();
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java

@@ -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);
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java

@@ -1,27 +0,0 @@
-package com.ruoyi.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 数据源
- *
- * @author Lion Li
- * @deprecated 3.6.0 移除
- */
-@AllArgsConstructor
-@Deprecated
-public enum DataSourceType {
-    /**
-     * 主库
-     */
-    MASTER("master"),
-
-    /**
-     * 从库
-     */
-    SLAVE("slave");
-
-    @Getter
-    private final String source;
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java

@@ -0,0 +1,27 @@
+package com.ruoyi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备类型
+ * 针对一套 用户体系
+ *
+ * @author Lion Li
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceType {
+
+    /**
+     * pc端
+     */
+    PC("pc"),
+
+    /**
+     * app端
+     */
+    APP("app");
+
+    private final String device;
+}

ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java

@@ -0,0 +1,49 @@
+package com.ruoyi.common.enums;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import lombok.AllArgsConstructor;
+
+import java.util.function.Function;
+
+/**
+ * 脱敏策略
+ *
+ * @author Yjoioooo
+ * @version 3.6.0
+ */
+@AllArgsConstructor
+public enum SensitiveStrategy {
+
+    /**
+     * 身份证脱敏
+     */
+    ID_CARD(s -> DesensitizedUtil.idCardNum(s, 3, 4)),
+
+    /**
+     * 手机号脱敏
+     */
+    PHONE(DesensitizedUtil::mobilePhone),
+
+    /**
+     * 地址脱敏
+     */
+    ADDRESS(s -> DesensitizedUtil.address(s, 8)),
+
+    /**
+     * 邮箱脱敏
+     */
+    EMAIL(DesensitizedUtil::email),
+
+    /**
+     * 银行卡
+     */
+    BANK_CARD(DesensitizedUtil::bankCard);
+
+    //可自行添加其他脱敏策略
+
+    private final Function<String, String> desensitizer;
+
+    public Function<String, String> desensitizer() {
+        return desensitizer;
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java

@@ -0,0 +1,27 @@
+package com.ruoyi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备类型
+ * 针对两套 用户体系
+ *
+ * @author Lion Li
+ */
+@Getter
+@AllArgsConstructor
+public enum UserType {
+
+    /**
+     * pc端
+     */
+    SYS_USER("sys_user:"),
+
+    /**
+     * app端
+     */
+    APP_USER("app_user:");
+
+    private final String userType;
+}

ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java

@@ -0,0 +1,45 @@
+package com.ruoyi.common.jackson;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import com.ruoyi.common.annotation.Sensitive;
+import com.ruoyi.common.core.service.SensitiveService;
+import com.ruoyi.common.enums.SensitiveStrategy;
+import com.ruoyi.common.utils.spring.SpringUtils;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * 数据脱敏json序列化工具
+ * @author Yjoioooo
+ */
+public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer {
+
+    private SensitiveStrategy strategy;
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
+        if (sensitiveService.isSensitive()){
+            gen.writeString(value);
+        } else {
+            gen.writeString(strategy.desensitizer().apply(value));
+        }
+
+    }
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException {
+        Sensitive annotation = property.getAnnotation(Sensitive.class);
+        if (Objects.nonNull(annotation)&&Objects.equals(String.class, property.getType().getRawClass())) {
+            this.strategy = annotation.strategy();
+            return this;
+        }
+        return prov.findValueSerializer(property.getType(), property);
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java

@@ -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;
-}

ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.utils;
 import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.utils.redis.RedisUtils;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java

@@ -0,0 +1,114 @@
+package com.ruoyi.common.utils;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.DeviceType;
+import com.ruoyi.common.enums.UserType;
+import com.ruoyi.common.exception.UtilException;
+
+/**
+ * 登录鉴权工具
+ * 为适配多端登录而封装
+ *
+ * @author Lion Li
+ */
+public class LoginUtils {
+
+    private final static String LOGIN_USER_KEY = "loginUser";
+
+    /**
+     * 登录系统
+     * 针对两套用户体系
+     * @param loginUser 登录用户信息
+     */
+    public static void login(LoginUser loginUser, UserType userType) {
+        StpUtil.login(userType.getUserType() + loginUser.getUserId());
+        setLoginUser(loginUser);
+    }
+
+    /**
+     * 登录系统 基于 设备类型
+     * 针对一套用户体系
+     * @param loginUser 登录用户信息
+     */
+    public static void loginByDevice(LoginUser loginUser, UserType userType, DeviceType deviceType) {
+        StpUtil.login(userType.getUserType() + loginUser.getUserId(), deviceType.getDevice());
+        setLoginUser(loginUser);
+    }
+
+    /**
+     * 设置用户数据
+     */
+    public static void setLoginUser(LoginUser loginUser) {
+        StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+    }
+
+    /**
+     * 获取用户
+     **/
+    public static LoginUser getLoginUser() {
+        return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
+    }
+
+    /**
+     * 获取用户id
+     */
+    public static Long getUserId() {
+        LoginUser loginUser = getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            String loginId = StpUtil.getLoginIdAsString();
+            String userId;
+            String replace = "";
+            if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) {
+                userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace);
+            } else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())){
+                userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace);
+            } else {
+                throw new UtilException("登录用户: LoginId异常 => " + loginId);
+            }
+            return Long.parseLong(userId);
+        }
+        return loginUser.getUserId();
+    }
+
+    /**
+     * 获取部门ID
+     **/
+    public static Long getDeptId() {
+        return getLoginUser().getDeptId();
+    }
+
+    /**
+     * 获取用户账户
+     **/
+    public static String getUsername() {
+        return getLoginUser().getUsername();
+    }
+
+    /**
+     * 获取用户账户
+     **/
+    public static String getNickName() {
+        return getLoginUser().getNickName();
+    }
+
+    /**
+     * 获取用户类型
+     */
+    public static UserType getUserType() {
+        String loginId = StpUtil.getLoginIdAsString();
+        return getUserType(loginId);
+    }
+
+    public static UserType getUserType(Object loginId) {
+        if (StringUtils.contains(loginId.toString(), UserType.SYS_USER.getUserType())) {
+            return UserType.SYS_USER;
+        } else if (StringUtils.contains(loginId.toString(), UserType.APP_USER.getUserType())){
+            return UserType.APP_USER;
+        } else {
+            throw new UtilException("登录用户: LoginId异常 => " + loginId);
+        }
+    }
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -1,193 +0,0 @@
-package com.ruoyi.common.utils;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpStatus;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.sql.SqlUtil;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * 分页工具
- *
- * @author Lion Li
- * @deprecated 3.6.0 删除 请使用 {@link PageQuery} 与 {@link TableDataInfo}
- */
-@Deprecated
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class PageUtils {
-
-    /**
-     * 当前记录起始索引
-     */
-    @Deprecated
-    public static final String PAGE_NUM = "pageNum";
-
-    /**
-     * 每页显示记录数
-     */
-    @Deprecated
-    public static final String PAGE_SIZE = "pageSize";
-
-    /**
-     * 排序列
-     */
-    @Deprecated
-    public static final String ORDER_BY_COLUMN = "orderByColumn";
-
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-    @Deprecated
-    public static final String IS_ASC = "isAsc";
-
-    /**
-     * 当前记录起始索引 默认值
-     */
-    @Deprecated
-    public static final int DEFAULT_PAGE_NUM = 1;
-
-    /**
-     * 每页显示记录数 默认值 默认查全部
-     */
-    @Deprecated
-    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
-
-    /**
-     * 构建 plus 分页对象
-     *
-     * @param <T> domain 实体
-     * @param <K> vo 实体
-     * @return 分页对象
-     * @deprecated 3.6.0 删除 请使用 {@link PageQuery#build()}
-     * 由于使用 Servlet 获取只能从 param 获取 灵活性降低 故将传参操作交给用户
-     */
-    @Deprecated
-    public static <T, K> PagePlus<T, K> buildPagePlus() {
-        Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
-        Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
-        String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
-        String isAsc = ServletUtils.getParameter(IS_ASC);
-        if (pageNum <= 0) {
-            pageNum = DEFAULT_PAGE_NUM;
-        }
-        PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
-        OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
-        if (ObjectUtil.isNotNull(orderItem)) {
-            page.addOrder(orderItem);
-        }
-        return page;
-    }
-
-    @Deprecated
-    public static <T> Page<T> buildPage() {
-        return buildPage(null, null);
-    }
-
-    /**
-     * 构建 MP 普通分页对象
-     *
-     * @param <T> domain 实体
-     * @return 分页对象
-     * @deprecated 3.6.0 删除 请使用 {@link PageQuery#build()}
-     * 由于使用 Servlet 获取只能从 param 获取 灵活性降低 故将传参操作交给用户
-     */
-    @Deprecated
-    public static <T> Page<T> buildPage(String defaultOrderByColumn, String defaultIsAsc) {
-        Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
-        Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
-        String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
-        String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
-        if (pageNum <= 0) {
-            pageNum = DEFAULT_PAGE_NUM;
-        }
-        Page<T> page = new Page<>(pageNum, pageSize);
-        OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
-        if (ObjectUtil.isNotNull(orderItem)) {
-            page.addOrder(orderItem);
-        }
-        return page;
-    }
-
-    private static OrderItem buildOrderItem(String orderByColumn, String isAsc) {
-        // 兼容前端排序类型
-        if ("ascending".equals(isAsc)) {
-            isAsc = "asc";
-        } else if ("descending".equals(isAsc)) {
-            isAsc = "desc";
-        }
-        if (StringUtils.isNotBlank(orderByColumn)) {
-            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
-            orderBy = StringUtils.toUnderScoreCase(orderBy);
-            if ("asc".equals(isAsc)) {
-                return OrderItem.asc(orderBy);
-            } else if ("desc".equals(isAsc)) {
-                return OrderItem.desc(orderBy);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 构建 MP 普通分页对象
-     *
-     * @param <T> domain 实体
-     * @return 分页对象
-     * @deprecated 3.6.0 删除 请使用 {@link PageQuery#build()}
-     * 由于使用 Servlet 获取只能从 param 获取 灵活性降低 故将传参操作交给用户
-     */
-    @Deprecated
-    public static <T, K> TableDataInfo<K> buildDataInfo(PagePlus<T, K> page) {
-        TableDataInfo<K> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(page.getRecordsVo());
-        rspData.setTotal(page.getTotal());
-        return rspData;
-    }
-
-    /**
-     * @deprecated 3.6.0 删除 请使用 {@link TableDataInfo#build(IPage)}
-     */
-    @Deprecated
-    public static <T> TableDataInfo<T> buildDataInfo(Page<T> page) {
-        TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(page.getRecords());
-        rspData.setTotal(page.getTotal());
-        return rspData;
-    }
-
-    /**
-     * @deprecated 3.6.0 删除 请使用 {@link TableDataInfo#build(List)}
-     */
-    @Deprecated
-    public static <T> TableDataInfo<T> buildDataInfo(List<T> list) {
-        TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(list.size());
-        return rspData;
-    }
-
-    /**
-     * @deprecated 3.6.0 删除 请使用 {@link TableDataInfo#build()}
-     */
-    @Deprecated
-    public static <T> TableDataInfo<T> buildDataInfo() {
-        TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        return rspData;
-    }
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -1,84 +1,17 @@
 package com.ruoyi.common.utils;
 
-import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 /**
  * 安全服务工具类
  *
- * @author ruoyi
+ * @author Long Li
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class SecurityUtils {
 
-    /**
-     * 用户ID
-     **/
-    public static Long getUserId() {
-        try {
-            return getLoginUser().getUserId();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户ID异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取部门ID
-     **/
-    public static Long getDeptId() {
-        try {
-            return getLoginUser().getDeptId();
-        } catch (Exception e) {
-            throw new ServiceException("获取部门ID异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户昵称
-     **/
-    public static String getNickName() {
-        try {
-            return getLoginUser().getNickName();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户账户
-     **/
-    public static String getUsername() {
-        try {
-            return getLoginUser().getUsername();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户
-     **/
-    public static LoginUser getLoginUser() {
-        try {
-            return (LoginUser) getAuthentication().getPrincipal();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取Authentication
-     */
-    public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
-    }
-
     /**
      * 生成BCryptPasswordEncoder密码
      *

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -5,10 +5,10 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.springframework.util.AntPathMatcher;
 
 import java.util.*;
 
@@ -347,7 +347,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      * @return
      */
     public static boolean isMatch(String pattern, String url) {
-		return ReUtil.isMatch(pattern, url);
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
     }
 
     @SuppressWarnings("unchecked")

ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java

@@ -0,0 +1,222 @@
+package com.ruoyi.common.utils.redis;
+
+import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.redisson.api.*;
+
+import java.util.Comparator;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+/**
+ * 分布式队列工具
+ * 轻量级队列 重量级数据量 请使用 MQ
+ * 要求 redis 5.X 以上
+ *
+ * @author Lion Li
+ * @version 3.6.0 新增
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class QueueUtils {
+
+    private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
+
+
+    /**
+     * 获取客户端实例
+     */
+    public static RedissonClient getClient() {
+        return CLIENT;
+    }
+
+    /**
+     * 添加延迟队列数据 默认毫秒
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     * @param time      延迟时间
+     */
+    public static <T> void addDelayedQueueObject(String queueName, T data, long time) {
+        addDelayedQueueObject(queueName, data, time, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 添加延迟队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     * @param time      延迟时间
+     * @param timeUnit  单位
+     */
+    public static <T> void addDelayedQueueObject(String queueName, T data, long time, TimeUnit timeUnit) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        delayedQueue.offer(data, time, timeUnit);
+    }
+
+    /**
+     * 获取一个延迟队列数据 没有数据返回 null
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getDelayedQueueObject(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        return delayedQueue.poll();
+    }
+
+    /**
+     * 删除延迟队列数据
+     */
+    public static <T> boolean removeDelayedQueueObject(String queueName, T data) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        return delayedQueue.remove(data);
+    }
+
+    /**
+     * 销毁延迟队列 所有阻塞监听 报错
+     */
+    public static <T> void destroyDelayedQueue(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        delayedQueue.destroy();
+    }
+
+    /**
+     * 尝试设置 优先队列比较器 用于排序优先级
+     *
+     * @param queueName  队列名
+     * @param comparator 比较器
+     */
+    public static <T> boolean trySetPriorityQueueComparator(String queueName, Comparator<T> comparator) {
+        RPriorityBlockingQueue<T> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        return priorityBlockingQueue.trySetComparator(comparator);
+    }
+
+    /**
+     * 尝试设置 优先队列比较器 用于排序优先级
+     *
+     * @param queueName  队列名
+     * @param comparator 比较器
+     * @param destroy    已存在是否销毁
+     */
+    public static <T> boolean trySetPriorityQueueComparator(String queueName, Comparator<T> comparator, boolean destroy) {
+        RPriorityBlockingQueue<T> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        if (priorityBlockingQueue.isExists() && destroy) {
+            destroyPriorityQueueObject(queueName);
+        }
+        return priorityBlockingQueue.trySetComparator(comparator);
+    }
+
+    /**
+     * 添加优先队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     */
+    public static <T> boolean addPriorityQueueObject(String queueName, T data) {
+        RPriorityBlockingQueue<T> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        return priorityBlockingQueue.offer(data);
+    }
+
+    /**
+     * 获取一个优先队列数据 没有数据返回 null
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getPriorityQueueObject(String queueName) {
+        RPriorityBlockingQueue<T> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        return priorityBlockingQueue.poll();
+    }
+
+    /**
+     * 删除优先队列数据
+     */
+    public static <T> boolean removePriorityQueueObject(String queueName, T data) {
+        RPriorityBlockingQueue<T> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        return priorityBlockingQueue.remove(data);
+    }
+
+    /**
+     * 销毁优先队列
+     */
+    public static boolean destroyPriorityQueueObject(String queueName) {
+        RPriorityBlockingQueue<?> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        return priorityBlockingQueue.delete();
+    }
+
+    /**
+     * 尝试设置 有界队列 容量 用于限制数量
+     *
+     * @param queueName 队列名
+     * @param capacity  容量
+     */
+    public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.trySetCapacity(capacity);
+    }
+
+    /**
+     * 尝试设置 有界队列 容量 用于限制数量
+     *
+     * @param queueName 队列名
+     * @param capacity  容量
+     * @param destroy   已存在是否销毁
+     */
+    public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity, boolean destroy) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        if (boundedBlockingQueue.isExists() && destroy) {
+            destroyBoundedQueueObject(queueName);
+        }
+        return boundedBlockingQueue.trySetCapacity(capacity);
+    }
+
+    /**
+     * 添加有界队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     * @return 添加成功 true 已达到界限 false
+     */
+    public static <T> boolean addBoundedQueueObject(String queueName, T data) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.offer(data);
+    }
+
+    /**
+     * 获取一个有界队列数据 没有数据返回 null
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getBoundedQueueObject(String queueName) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.poll();
+    }
+
+    /**
+     * 删除有界队列数据
+     */
+    public static <T> boolean removeBoundedQueueObject(String queueName, T data) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.remove(data);
+    }
+
+    /**
+     * 销毁有界队列
+     */
+    public static boolean destroyBoundedQueueObject(String queueName) {
+        RBoundedBlockingQueue<?> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.delete();
+    }
+
+    /**
+     * 订阅阻塞队列(可订阅所有实现类 例如: 延迟 优先 有界 等)
+     */
+    public static <T> void subscribeBlockingQueue(String queueName, Consumer<T> consumer) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        queue.subscribeOnElements(consumer);
+    }
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.ruoyi.common.utils.redis;
 
 import cn.hutool.core.collection.IterUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -376,4 +376,14 @@ public class RedisUtils {
         Iterable<String> iterable = CLIENT.getKeys().getKeysByPattern(pattern);
         return IterUtil.toList(iterable);
     }
+
+    /**
+     * 检查redis中是否存在key
+     *
+     * @param key 键
+     */
+    public static Boolean hasKey(String key) {
+        RKeys rKeys = CLIENT.getKeys();
+        return rKeys.countExists(key) > 0;
+    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.RedisUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.RedisUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.domain.TestDemo;
-import com.ruoyi.demo.service.ITestDemoService;
+import com.ruoyi.demo.mapper.TestDemoMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -29,7 +29,10 @@ import java.util.List;
 @RequestMapping("/demo/batch")
 public class TestBatchController extends BaseController {
 
-    private final ITestDemoService iTestDemoService;
+    /**
+     * 为了便于测试 直接引入mapper
+     */
+    private final TestDemoMapper testDemoMapper;
 
     /**
      * 新增批量方法 可完美替代 saveBatch 秒级插入上万数据 (对mysql负荷较大)
@@ -44,7 +47,7 @@ public class TestBatchController extends BaseController {
         for (int i = 0; i < 1000; i++) {
             list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
         }
-        return toAjax(iTestDemoService.saveAll(list) ? 1 : 0);
+        return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0);
     }
 
     /**
@@ -60,7 +63,7 @@ public class TestBatchController extends BaseController {
         for (int i = 0; i < 1000; i++) {
             list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
         }
-        iTestDemoService.saveAll(list);
+        testDemoMapper.insertBatch(list);
         for (int i = 0; i < list.size(); i++) {
             TestDemo testDemo = list.get(i);
             testDemo.setTestKey("批量新增或修改").setValue("批量新增或修改");
@@ -68,7 +71,7 @@ public class TestBatchController extends BaseController {
                 testDemo.setId(null);
             }
         }
-        return toAjax(iTestDemoService.saveOrUpdateAll(list) ? 1 : 0);
+        return toAjax(testDemoMapper.insertOrUpdateBatch(list) ? 1 : 0);
     }
 
     /**
@@ -78,8 +81,8 @@ public class TestBatchController extends BaseController {
     @DeleteMapping()
 //    @DS("slave")
     public R<Void> remove() {
-        return toAjax(iTestDemoService.remove(new LambdaQueryWrapper<TestDemo>()
-            .eq(TestDemo::getOrderNum, -1L)) ? 1 : 0);
+        return toAjax(testDemoMapper.delete(new LambdaQueryWrapper<TestDemo>()
+            .eq(TestDemo::getOrderNum, -1L)));
     }
 
 }

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 cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -22,7 +23,6 @@ import com.ruoyi.demo.service.ITestDemoService;
 import io.swagger.annotations.*;
 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.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -53,7 +53,7 @@ public class TestDemoController extends BaseController {
      * 查询测试单表列表
      */
     @ApiOperation("查询测试单表列表")
-    @PreAuthorize("@ss.hasPermi('demo:demo:list')")
+    @SaCheckPermission("demo:demo:list")
     @GetMapping("/list")
     public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
         return iTestDemoService.queryPageList(bo, pageQuery);
@@ -63,7 +63,7 @@ public class TestDemoController extends BaseController {
      * 自定义分页查询
      */
     @ApiOperation("自定义分页查询")
-    @PreAuthorize("@ss.hasPermi('demo:demo:list')")
+    @SaCheckPermission("demo:demo:list")
     @GetMapping("/page")
     public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
         return iTestDemoService.customPageList(bo, pageQuery);
@@ -74,13 +74,13 @@ public class TestDemoController extends BaseController {
         @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
     })
     @Log(title = "测试单表", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('demo:demo:import')")
+    @SaCheckPermission("demo:demo:import")
     @PostMapping("/importData")
     public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
         ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
         List<TestDemoImportVo> volist = excelResult.getList();
         List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class);
-        iTestDemoService.saveAll(list);
+        iTestDemoService.saveBatch(list);
         return R.success(excelResult.getAnalysis());
     }
 
@@ -88,7 +88,7 @@ public class TestDemoController extends BaseController {
      * 导出测试单表列表
      */
     @ApiOperation("导出测试单表列表")
-    @PreAuthorize("@ss.hasPermi('demo:demo:export')")
+    @SaCheckPermission("demo:demo:export")
     @Log(title = "测试单表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(@Validated TestDemoBo bo, HttpServletResponse response) {
@@ -104,7 +104,7 @@ public class TestDemoController extends BaseController {
      * 获取测试单表详细信息
      */
     @ApiOperation("获取测试单表详细信息")
-    @PreAuthorize("@ss.hasPermi('demo:demo:query')")
+    @SaCheckPermission("demo:demo:query")
     @GetMapping("/{id}")
     public R<TestDemoVo> getInfo(@ApiParam("测试ID")
                                           @NotNull(message = "主键不能为空")
@@ -116,7 +116,7 @@ public class TestDemoController extends BaseController {
      * 新增测试单表
      */
     @ApiOperation("新增测试单表")
-    @PreAuthorize("@ss.hasPermi('demo:demo:add')")
+    @SaCheckPermission("demo:demo:add")
     @Log(title = "测试单表", businessType = BusinessType.INSERT)
     @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "不允许重复提交")
     @PostMapping()
@@ -131,7 +131,7 @@ public class TestDemoController extends BaseController {
      * 修改测试单表
      */
     @ApiOperation("修改测试单表")
-    @PreAuthorize("@ss.hasPermi('demo:demo:edit')")
+    @SaCheckPermission("demo:demo:edit")
     @Log(title = "测试单表", businessType = BusinessType.UPDATE)
     @RepeatSubmit
     @PutMapping()
@@ -143,8 +143,8 @@ public class TestDemoController extends BaseController {
      * 删除测试单表
      */
     @ApiOperation("删除测试单表")
-    @PreAuthorize("@ss.hasPermi('demo:demo:remove')")
-    @Log(title = "测试单表", businessType = BusinessType.DELETE)
+    @SaCheckPermission("demo:demo:remove")
+    @Log(title = "测试单表" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@ApiParam("测试ID串")
                                    @NotEmpty(message = "主键不能为空")

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java

@@ -30,7 +30,7 @@ public class TestI18nController {
     /**
      * 通过code获取国际化内容
      * code为 messages.properties 中的 key
-	 *
+     * <p>
      * 测试使用 user.register.success
      */
     @ApiOperation("通过code获取国际化内容")
@@ -42,7 +42,7 @@ public class TestI18nController {
     /**
      * Validator 校验国际化
      * 不传值 分别查看异常返回
-     *
+     * <p>
      * 测试使用 not.null
      */
     @ApiOperation("Validator 校验国际化")
@@ -54,7 +54,7 @@ public class TestI18nController {
     /**
      * Bean 校验国际化
      * 不传值 分别查看异常返回
-     *
+     * <p>
      * 测试使用 not.null
      */
     @ApiOperation("Bean 校验国际化")

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java

@@ -0,0 +1,81 @@
+package com.ruoyi.demo.controller;
+
+import com.ruoyi.common.annotation.Sensitive;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.SensitiveStrategy;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 测试数据脱敏控制器
+ *
+ * 默认管理员不过滤
+ * 需自行根据业务重写实现
+ *
+ * @see com.ruoyi.common.core.service.SensitiveService
+ * @author Lion Li
+ * @version 3.6.0
+ */
+@Api(value = "测试数据脱敏控制器", tags = {"测试数据脱敏管理"})
+@RestController
+@RequestMapping("/demo/sensitive")
+public class TestSensitiveController extends BaseController {
+
+    /**
+     * 测试数据脱敏
+     */
+    @ApiOperation("查询测试单表列表")
+    @GetMapping("/test")
+    public R<TestSensitive> test() {
+        TestSensitive testSensitive = new TestSensitive()
+            .setIdCard("210397198608215431")
+            .setPhone("17640125371")
+            .setAddress("北京市朝阳区某某四合院1203室")
+            .setEmail("17640125371@163.com")
+            .setBankCard("6226456952351452853");
+        return R.success(testSensitive);
+    }
+
+    @Data
+    @Accessors(chain = true)
+    static class TestSensitive {
+
+        /**
+         * 身份证
+         */
+        @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+        private String idCard;
+
+        /**
+         * 电话
+         */
+        @Sensitive(strategy = SensitiveStrategy.PHONE)
+        private String phone;
+
+        /**
+         * 地址
+         */
+        @Sensitive(strategy = SensitiveStrategy.ADDRESS)
+        private String address;
+
+        /**
+         * 邮箱
+         */
+        @Sensitive(strategy = SensitiveStrategy.EMAIL)
+        private String email;
+
+        /**
+         * 银行卡
+         */
+        @Sensitive(strategy = SensitiveStrategy.BANK_CARD)
+        private String bankCard;
+
+    }
+
+}

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;
@@ -17,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.*;
 
@@ -46,7 +46,7 @@ public class TestTreeController extends BaseController {
      * 查询测试树表列表
      */
     @ApiOperation("查询测试树表列表")
-    @PreAuthorize("@ss.hasPermi('demo:tree:list')")
+    @SaCheckPermission("demo:tree:list")
     @GetMapping("/list")
     public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
         List<TestTreeVo> list = iTestTreeService.queryList(bo);
@@ -57,7 +57,7 @@ public class TestTreeController extends BaseController {
      * 导出测试树表列表
      */
     @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) {
@@ -69,7 +69,7 @@ public class TestTreeController extends BaseController {
      * 获取测试树表详细信息
      */
     @ApiOperation("获取测试树表详细信息")
-    @PreAuthorize("@ss.hasPermi('demo:tree:query')")
+    @SaCheckPermission("demo:tree:query")
     @GetMapping("/{id}")
     public R<TestTreeVo> getInfo(@ApiParam("测试树ID")
                                           @NotNull(message = "主键不能为空")
@@ -81,7 +81,7 @@ public class TestTreeController extends BaseController {
      * 新增测试树表
      */
     @ApiOperation("新增测试树表")
-    @PreAuthorize("@ss.hasPermi('demo:tree:add')")
+    @SaCheckPermission("demo:tree:add")
     @Log(title = "测试树表", businessType = BusinessType.INSERT)
     @RepeatSubmit
     @PostMapping()
@@ -93,7 +93,7 @@ public class TestTreeController extends BaseController {
      * 修改测试树表
      */
     @ApiOperation("修改测试树表")
-    @PreAuthorize("@ss.hasPermi('demo:tree:edit')")
+    @SaCheckPermission("demo:tree:edit")
     @Log(title = "测试树表", businessType = BusinessType.UPDATE)
     @RepeatSubmit
     @PutMapping()
@@ -105,8 +105,8 @@ public class TestTreeController extends BaseController {
      * 删除测试树表
      */
     @ApiOperation("删除测试树表")
-    @PreAuthorize("@ss.hasPermi('demo:tree:remove')")
-    @Log(title = "测试树表", businessType = BusinessType.DELETE)
+    @SaCheckPermission("demo:tree:remove")
+    @Log(title = "测试树表" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@ApiParam("测试树ID串")
                                    @NotEmpty(message = "主键不能为空")

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java

@@ -0,0 +1,83 @@
+package com.ruoyi.demo.controller.queue;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.redis.QueueUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 有界队列 演示案例
+ * <p>
+ * 轻量级队列 重量级数据量 请使用 MQ
+ * <p>
+ * 集群测试通过 同一个数据只会被消费一次 做好事务补偿
+ * 集群测试流程 在其中一台发送数据 两端分别调用获取接口 一次获取一条
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+@Slf4j
+@Api(value = "有界队列 演示案例", tags = {"有界队列"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/demo/queue/bounded")
+public class BoundedQueueController {
+
+
+    @ApiOperation("添加队列数据")
+    @GetMapping("/add")
+    public R<Void> add(@ApiParam("队列名") String queueName,
+                                @ApiParam("容量") int capacity) {
+        // 用完了一定要销毁 否则会一直存在
+        boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
+        log.info("通道: {} , 删除: {}", queueName, b);
+        // 初始化设置一次即可
+        if (QueueUtils.trySetBoundedQueueCapacity(queueName, capacity)) {
+            log.info("通道: {} , 设置容量: {}", queueName, capacity);
+        } else {
+            log.info("通道: {} , 设置容量失败", queueName);
+            return R.error("操作失败");
+        }
+        for (int i = 0; i < 11; i++) {
+            String data = "data-" + i;
+            boolean flag = QueueUtils.addBoundedQueueObject(queueName, data);
+            if (flag == false) {
+                log.info("通道: {} , 发送数据: {} 失败, 通道已满", queueName, data);
+            } else {
+                log.info("通道: {} , 发送数据: {}", queueName, data);
+            }
+        }
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("删除队列数据")
+    @GetMapping("/remove")
+    public R<Void> remove(@ApiParam("队列名") String queueName) {
+        String data = "data-" + 5;
+        if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
+            log.info("通道: {} , 删除数据: {}", queueName, data);
+        } else {
+            return R.error("操作失败");
+        }
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("获取队列数据")
+    @GetMapping("/get")
+    public R<Void> get(@ApiParam("队列名") String queueName) {
+        String data;
+        do {
+            data = QueueUtils.getBoundedQueueObject(queueName);
+            log.info("通道: {} , 获取数据: {}", queueName, data);
+        } while (data != null);
+        return R.success("操作成功");
+    }
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java

@@ -0,0 +1,79 @@
+package com.ruoyi.demo.controller.queue;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.redis.QueueUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 延迟队列 演示案例
+ * <p>
+ * 轻量级队列 重量级数据量 请使用 MQ
+ * 例如: 创建订单30分钟后过期处理
+ * <p>
+ * 集群测试通过 同一个数据只会被消费一次 做好事务补偿
+ * 集群测试流程 两台集群分别开启订阅 在其中一台发送数据 观察接收消息的规律
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+@Slf4j
+@Api(value = "延迟队列 演示案例", tags = {"延迟队列"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/demo/queue/delayed")
+public class DelayedQueueController {
+
+    @ApiOperation("订阅队列")
+    @GetMapping("/subscribe")
+    public R<Void> subscribe(@ApiParam("队列名") String queueName) {
+        log.info("通道: {} 监听中......", queueName);
+        // 项目初始化设置一次即可
+        QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
+            // 观察接收时间
+            log.info("通道: {}, 收到数据: {}", queueName, orderNum);
+        });
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("添加队列数据")
+    @GetMapping("/add")
+    public R<Void> add(@ApiParam("队列名") String queueName,
+                                @ApiParam("订单号") String orderNum,
+                                @ApiParam("延迟时间(秒)") Long time) {
+        QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
+        // 观察发送时间
+        log.info("通道: {} , 发送数据: {}", queueName, orderNum);
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("删除队列数据")
+    @GetMapping("/remove")
+    public R<Void> remove(@ApiParam("队列名") String queueName,
+                                   @ApiParam("订单号") String orderNum) {
+        if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
+            log.info("通道: {} , 删除数据: {}", queueName, orderNum);
+        } else {
+            return R.error("操作失败");
+        }
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("销毁队列")
+    @GetMapping("/destroy")
+    public R<Void> destroy(@ApiParam("队列名") String queueName) {
+        // 用完了一定要销毁 否则会一直存在
+        QueueUtils.destroyDelayedQueue(queueName);
+        return R.success("操作成功");
+    }
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.demo.controller.queue;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 实体类 注意不允许使用内部类 否则会找不到类
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+public class PriorityDemo {
+    private String name;
+    private Integer orderNum;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemoComparator.java

@@ -0,0 +1,16 @@
+package com.ruoyi.demo.controller.queue;
+
+import java.util.Comparator;
+
+/**
+ * 比较器 注意不允许使用 内部类或匿名类或lambda表达式 会找不到类
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+public class PriorityDemoComparator implements Comparator<PriorityDemo> {
+    @Override
+    public int compare(PriorityDemo pd1, PriorityDemo pd2) {
+        return Integer.compare(pd1.getOrderNum(), pd2.getOrderNum());
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java

@@ -0,0 +1,85 @@
+package com.ruoyi.demo.controller.queue;
+
+import cn.hutool.core.util.RandomUtil;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.redis.QueueUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 优先队列 演示案例
+ * <p>
+ * 轻量级队列 重量级数据量 请使用 MQ
+ * <p>
+ * 集群测试通过 同一个消息只会被消费一次 做好事务补偿
+ * 集群测试流程 在其中一台发送数据 两端分别调用获取接口 一次获取一条
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+@Slf4j
+@Api(value = "优先队列 演示案例", tags = {"优先队列"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/demo/queue/priority")
+public class PriorityQueueController {
+
+    @ApiOperation("添加队列数据")
+    @GetMapping("/add")
+    public R<Void> add(@ApiParam("队列名") String queueName) {
+        // 用完了一定要销毁 否则会一直存在
+        boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
+        log.info("通道: {} , 删除: {}", queueName, b);
+        // 初始化设置一次即可 此处注意 不允许用内部类或匿名类
+        boolean flag = QueueUtils.trySetPriorityQueueComparator(queueName, new PriorityDemoComparator());
+        if (flag) {
+            log.info("通道: {} , 设置比较器成功", queueName);
+        } else {
+            log.info("通道: {} , 设置比较器失败", queueName);
+            return R.error("操作失败");
+        }
+        for (int i = 0; i < 10; i++) {
+            int randomNum = RandomUtil.randomInt(10);
+            PriorityDemo data = new PriorityDemo().setName("data-" + i).setOrderNum(randomNum);
+            if (QueueUtils.addPriorityQueueObject(queueName, data)) {
+                log.info("通道: {} , 发送数据: {}", queueName, data);
+            } else {
+                log.info("通道: {} , 发送数据: {}, 发送失败", queueName, data);
+            }
+        }
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("删除队列数据")
+    @GetMapping("/remove")
+    public R<Void> remove(@ApiParam("队列名") String queueName,
+                                   @ApiParam("对象名") String name,
+                                   @ApiParam("排序号") Integer orderNum) {
+        PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum);
+        if (QueueUtils.removePriorityQueueObject(queueName, data)) {
+            log.info("通道: {} , 删除数据: {}", queueName, data);
+        } else {
+            return R.error("操作失败");
+        }
+        return R.success("操作成功");
+    }
+
+    @ApiOperation("获取队列数据")
+    @GetMapping("/get")
+    public R<Void> get(@ApiParam("队列名") String queueName) {
+        PriorityDemo data;
+        do {
+            data = QueueUtils.getPriorityQueueObject(queueName);
+            log.info("通道: {} , 获取数据: {}", queueName, data);
+        } while (data != null);
+        return R.success("操作成功");
+    }
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @TableName("test_demo")
 public class TestDemo extends BaseEntity {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @TableName("test_tree")
 public class TestTree extends TreeEntity {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java

@@ -27,42 +27,42 @@ public class TestDemoBo extends BaseEntity {
      * 主键
      */
     @ApiModelProperty("主键")
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 部门id
      */
     @ApiModelProperty("部门id")
-    @NotNull(message = "部门id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deptId;
 
     /**
      * 用户id
      */
     @ApiModelProperty("用户id")
-    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
     /**
      * 排序号
      */
     @ApiModelProperty("排序号")
-    @NotNull(message = "排序号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "排序号不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long orderNum;
 
     /**
      * key键
      */
     @ApiModelProperty("key键")
-    @NotBlank(message = "key键不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "key键不能为空", groups = {AddGroup.class, EditGroup.class})
     private String testKey;
 
     /**
      * 值
      */
     @ApiModelProperty("值")
-    @NotBlank(message = "值不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "值不能为空", groups = {AddGroup.class, EditGroup.class})
     private String value;
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java

@@ -27,28 +27,28 @@ public class TestTreeBo extends TreeEntity {
      * 主键
      */
     @ApiModelProperty("主键")
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 部门id
      */
     @ApiModelProperty("部门id")
-    @NotNull(message = "部门id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deptId;
 
     /**
      * 用户id
      */
     @ApiModelProperty("用户id")
-    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
     /**
      * 树节点名
      */
     @ApiModelProperty("树节点名")
-    @NotBlank(message = "树节点名不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "树节点名不能为空", groups = {AddGroup.class, EditGroup.class})
     private String treeName;
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import java.util.Date;
 
 
-
 /**
  * 测试单表视图对象 test_demo
  *

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import java.util.Date;
 
 
-
 /**
  * 测试树表视图对象 test_tree
  *

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java

@@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DataColumn;
 import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.demo.domain.TestDemo;
 import com.ruoyi.demo.domain.vo.TestDemoVo;
 import org.apache.ibatis.annotations.Param;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 
@@ -21,7 +20,7 @@ import java.util.List;
  * @author Lion Li
  * @date 2021-07-26
  */
-public interface TestDemoMapper extends BaseMapperPlus<TestDemo> {
+public interface TestDemoMapper extends BaseMapperPlus<TestDemoMapper, TestDemo, TestDemoVo> {
 
     @DataPermission({
         @DataColumn(key = "deptName", value = "dept_id"),
@@ -55,5 +54,5 @@ public interface TestDemoMapper extends BaseMapperPlus<TestDemo> {
         @DataColumn(key = "deptName", value = "dept_id"),
         @DataColumn(key = "userName", value = "user_id")
     })
-    int deleteBatchIds(@Param(Constants.COLLECTION) Collection<? extends Serializable> idList);
+    int deleteBatchIds(@Param(Constants.COLLECTION) Collection<?> idList);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java

@@ -2,8 +2,9 @@ package com.ruoyi.demo.mapper;
 
 import com.ruoyi.common.annotation.DataColumn;
 import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.demo.domain.TestTree;
+import com.ruoyi.demo.domain.vo.TestTreeVo;
 
 /**
  * 测试树表Mapper接口
@@ -15,6 +16,6 @@ import com.ruoyi.demo.domain.TestTree;
     @DataColumn(key = "deptName", value = "dept_id"),
     @DataColumn(key = "userName", value = "user_id")
 })
-public interface TestTreeMapper extends BaseMapperPlus<TestTree> {
+public interface TestTreeMapper extends BaseMapperPlus<TestTreeMapper, TestTree, TestTreeVo> {
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java

@@ -1,11 +1,10 @@
 package com.ruoyi.demo.service;
 
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.demo.domain.TestDemo;
-import com.ruoyi.demo.domain.vo.TestDemoVo;
-import com.ruoyi.demo.domain.bo.TestDemoBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.demo.domain.TestDemo;
+import com.ruoyi.demo.domain.bo.TestDemoBo;
+import com.ruoyi.demo.domain.vo.TestDemoVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,10 +15,11 @@ import java.util.List;
  * @author Lion Li
  * @date 2021-07-26
  */
-public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> {
+public interface ITestDemoService {
 
     /**
      * 查询单个
+     *
      * @return
      */
     TestDemoVo queryById(Long id);
@@ -41,6 +41,7 @@ public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> {
 
     /**
      * 根据新增业务对象插入测试单表
+     *
      * @param bo 测试单表新增业务对象
      * @return
      */
@@ -48,6 +49,7 @@ public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> {
 
     /**
      * 根据编辑业务对象修改测试单表
+     *
      * @param bo 测试单表编辑业务对象
      * @return
      */
@@ -55,9 +57,15 @@ public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> {
 
     /**
      * 校验并删除数据
+     *
      * @param ids     主键集合
      * @param isValid 是否校验,true-删除前校验,false-不校验
      * @return
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 批量保存
+     */
+    Boolean saveBatch(List<TestDemo> list);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java

@@ -1,9 +1,7 @@
 package com.ruoyi.demo.service;
 
-import com.ruoyi.demo.domain.TestTree;
-import com.ruoyi.demo.domain.vo.TestTreeVo;
 import com.ruoyi.demo.domain.bo.TestTreeBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.demo.domain.vo.TestTreeVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -14,9 +12,10 @@ import java.util.List;
  * @author Lion Li
  * @date 2021-07-26
  */
-public interface ITestTreeService extends IServicePlus<TestTree, TestTreeVo> {
+public interface ITestTreeService {
     /**
      * 查询单个
+     *
      * @return
      */
     TestTreeVo queryById(Long id);
@@ -28,6 +27,7 @@ public interface ITestTreeService extends IServicePlus<TestTree, TestTreeVo> {
 
     /**
      * 根据新增业务对象插入测试树表
+     *
      * @param bo 测试树表新增业务对象
      * @return
      */
@@ -35,6 +35,7 @@ public interface ITestTreeService extends IServicePlus<TestTree, TestTreeVo> {
 
     /**
      * 根据编辑业务对象修改测试树表
+     *
      * @param bo 测试树表编辑业务对象
      * @return
      */
@@ -42,6 +43,7 @@ public interface ITestTreeService extends IServicePlus<TestTree, TestTreeVo> {
 
     /**
      * 校验并删除数据
+     *
      * @param ids     主键集合
      * @param isValid 是否校验,true-删除前校验,false-不校验
      * @return

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.demo.domain.TestDemo;
@@ -13,6 +12,7 @@ import com.ruoyi.demo.domain.bo.TestDemoBo;
 import com.ruoyi.demo.domain.vo.TestDemoVo;
 import com.ruoyi.demo.mapper.TestDemoMapper;
 import com.ruoyi.demo.service.ITestDemoService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -25,18 +25,21 @@ import java.util.Map;
  * @author Lion Li
  * @date 2021-07-26
  */
+@RequiredArgsConstructor
 @Service
-public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDemo, TestDemoVo> implements ITestDemoService {
+public class TestDemoServiceImpl implements ITestDemoService {
+
+    private final TestDemoMapper baseMapper;
 
     @Override
     public TestDemoVo queryById(Long id) {
-		return getVoById(id);
+        return baseMapper.selectVoById(id);
     }
 
     @Override
     public TableDataInfo<TestDemoVo> queryPageList(TestDemoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TestDemo> lqw = buildQueryWrapper(bo);
-        Page<TestDemoVo> result = pageVo(pageQuery.build(), lqw);
+        Page<TestDemoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -52,7 +55,7 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
 
     @Override
     public List<TestDemoVo> queryList(TestDemoBo bo) {
-		return listVo(buildQueryWrapper(bo));
+        return baseMapper.selectVoList(buildQueryWrapper(bo));
     }
 
     private LambdaQueryWrapper<TestDemo> buildQueryWrapper(TestDemoBo bo) {
@@ -69,7 +72,7 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
     public Boolean insertByBo(TestDemoBo bo) {
         TestDemo add = BeanUtil.toBean(bo, TestDemo.class);
         validEntityBeforeSave(add);
-		boolean flag = save(add);
+        boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -80,7 +83,7 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
     public Boolean updateByBo(TestDemoBo bo) {
         TestDemo update = BeanUtil.toBean(bo, TestDemo.class);
         validEntityBeforeSave(update);
-		return updateById(update);
+        return baseMapper.updateById(update) > 0;
     }
 
     /**
@@ -97,6 +100,11 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-		return removeByIds(ids);
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public Boolean saveBatch(List<TestDemo> list) {
+        return baseMapper.insertBatch(list);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java

@@ -3,13 +3,13 @@ package com.ruoyi.demo.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.demo.domain.TestTree;
 import com.ruoyi.demo.domain.bo.TestTreeBo;
 import com.ruoyi.demo.domain.vo.TestTreeVo;
 import com.ruoyi.demo.mapper.TestTreeMapper;
 import com.ruoyi.demo.service.ITestTreeService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -23,19 +23,22 @@ import java.util.Map;
  * @date 2021-07-26
  */
 // @DS("slave") // 切换从库查询
+@RequiredArgsConstructor
 @Service
-public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
+public class TestTreeServiceImpl implements ITestTreeService {
+
+    private final TestTreeMapper baseMapper;
 
     @Override
     public TestTreeVo queryById(Long id) {
-		return getVoById(id);
+        return baseMapper.selectVoById(id);
     }
 
-//	@DS("slave") // 切换从库查询
+    // @DS("slave") // 切换从库查询
     @Override
     public List<TestTreeVo> queryList(TestTreeBo bo) {
         LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);
-        return listVo(lqw);
+        return baseMapper.selectVoList(lqw);
     }
 
     private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeBo bo) {
@@ -51,7 +54,7 @@ public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTre
     public Boolean insertByBo(TestTreeBo bo) {
         TestTree add = BeanUtil.toBean(bo, TestTree.class);
         validEntityBeforeSave(add);
-		boolean flag = save(add);
+        boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -62,7 +65,7 @@ public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTre
     public Boolean updateByBo(TestTreeBo bo) {
         TestTree update = BeanUtil.toBean(bo, TestTree.class);
         validEntityBeforeSave(update);
-		return updateById(update);
+        return baseMapper.updateById(update) > 0;
     }
 
     /**
@@ -79,6 +82,6 @@ public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTre
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-		return removeByIds(ids);
+        return baseMapper.deleteBatchIds(ids) > 0;
     }
 }

ruoyi-extend/ruoyi-monitor-admin/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java

@@ -13,7 +13,7 @@ public class MonitorAdminApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(MonitorAdminApplication.class, args);
-		System.out.println("Admin 监控启动成功" );
+        System.out.println("Admin 监控启动成功");
     }
 
 }

ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/notifier/CustomNotifier.java

@@ -0,0 +1,40 @@
+package com.ruoyi.monitor.admin.notifier;
+
+import de.codecentric.boot.admin.server.domain.entities.Instance;
+import de.codecentric.boot.admin.server.domain.entities.InstanceRepository;
+import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
+import de.codecentric.boot.admin.server.domain.events.InstanceStatusChangedEvent;
+import de.codecentric.boot.admin.server.notify.AbstractEventNotifier;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+/**
+ * 自定义事件通知处理
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@Component
+public class CustomNotifier extends AbstractEventNotifier {
+
+    protected CustomNotifier(InstanceRepository repository) {
+        super(repository);
+    }
+
+    @Override
+    @SuppressWarnings("all")
+    protected Mono<Void> doNotify(InstanceEvent event, Instance instance) {
+        return Mono.fromRunnable(() -> {
+            // 实例状态改变事件
+            if (event instanceof InstanceStatusChangedEvent) {
+                String registName = instance.getRegistration().getName();
+                String instanceId = event.getInstance().getValue();
+                String status = ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus();
+                log.info("Instance Status Change: [{}],[{}],[{}]", registName, instanceId, status);
+            }
+
+        });
+    }
+
+}

ruoyi-extend/ruoyi-xxl-job-admin/pom.xml

@@ -99,19 +99,6 @@
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-				<configuration>
-					<nonFilteredFileExtensions>
-						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-						<nonFilteredFileExtension>jks</nonFilteredFileExtension>
-						<nonFilteredFileExtension>woff</nonFilteredFileExtension>
-						<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-					</nonFilteredFileExtensions>
-				</configuration>
-			</plugin>
             <!-- docker -->
             <plugin>
                 <groupId>com.spotify</groupId>

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java

@@ -24,6 +24,7 @@ import java.util.Map;
 
 /**
  * index controller
+ *
  * @author xuxueli 2015-12-19 16:13:16
  */
 @Controller
@@ -52,27 +53,27 @@ public class IndexController {
     }
 
     @RequestMapping("/toLogin")
-	@PermissionLimit(limit=false)
-	public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse response,ModelAndView modelAndView) {
+    @PermissionLimit(limit = false)
+    public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView) {
         if (loginService.ifLogin(request, response) != null) {
-			modelAndView.setView(new RedirectView("/",true,false));
+            modelAndView.setView(new RedirectView("/" , true, false));
             return modelAndView;
         }
         return new ModelAndView("login");
     }
 
-	@RequestMapping(value="login", method=RequestMethod.POST)
+    @RequestMapping(value = "login" , method = RequestMethod.POST)
     @ResponseBody
-	@PermissionLimit(limit=false)
-	public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){
-		boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false;
+    @PermissionLimit(limit = false)
+    public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember) {
+        boolean ifRem = (ifRemember != null && ifRemember.trim().length() > 0 && "on".equals(ifRemember)) ? true : false;
         return loginService.login(request, response, userName, password, ifRem);
     }
 
-	@RequestMapping(value="logout", method=RequestMethod.POST)
+    @RequestMapping(value = "logout" , method = RequestMethod.POST)
     @ResponseBody
-	@PermissionLimit(limit=false)
-	public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
+    @PermissionLimit(limit = false)
+    public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response) {
         return loginService.logout(request, response);
     }
 

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java

@@ -19,6 +19,7 @@ import java.util.List;
 
 /**
  * job code controller
+ *
  * @author xuxueli 2015-12-19 16:13:16
  */
 @Controller
@@ -46,10 +47,10 @@ public class JobCodeController {
         JobInfoController.validPermission(request, jobInfo.getJobGroup());
 
         // Glue类型-字典
-		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());
+        model.addAttribute("GlueTypeEnum" , GlueTypeEnum.values());
 
-		model.addAttribute("jobInfo", jobInfo);
-		model.addAttribute("jobLogGlues", jobLogGlues);
+        model.addAttribute("jobInfo" , jobInfo);
+        model.addAttribute("jobLogGlues" , jobLogGlues);
         return "jobcode/jobcode.index";
     }
 
@@ -57,10 +58,10 @@ public class JobCodeController {
     @ResponseBody
     public ReturnT<String> save(Model model, int id, String glueSource, String glueRemark) {
         // valid
-		if (glueRemark==null) {
-			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) );
+        if (glueRemark == null) {
+            return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")));
         }
-		if (glueRemark.length()<4 || glueRemark.length()>100) {
+        if (glueRemark.length() < 4 || glueRemark.length() > 100) {
             return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_remark_limit"));
         }
         XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id);

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java

@@ -20,6 +20,7 @@ import java.util.*;
 
 /**
  * job group controller
+ *
  * @author xuxueli 2016-10-02 20:52:56
  */
 @Controller
@@ -51,44 +52,44 @@ public class JobGroupController {
 
         // package result
         Map<String, Object> maps = new HashMap<String, Object>();
-		maps.put("recordsTotal", list_count);		// 总记录数
-		maps.put("recordsFiltered", list_count);	// 过滤后的总记录数
-		maps.put("data", list);  					// 分页列表
+        maps.put("recordsTotal" , list_count);        // 总记录数
+        maps.put("recordsFiltered" , list_count);    // 过滤后的总记录数
+        maps.put("data" , list);                    // 分页列表
         return maps;
     }
 
     @RequestMapping("/save")
     @ResponseBody
-	public ReturnT<String> save(XxlJobGroup xxlJobGroup){
+    public ReturnT<String> save(XxlJobGroup xxlJobGroup) {
 
         // valid
-		if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) {
-			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
+        if (xxlJobGroup.getAppname() == null || xxlJobGroup.getAppname().trim().length() == 0) {
+            return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + "AppName"));
         }
-		if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
+        if (xxlJobGroup.getAppname().length() < 4 || xxlJobGroup.getAppname().length() > 64) {
+            return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length"));
         }
         if (xxlJobGroup.getAppname().contains(">") || xxlJobGroup.getAppname().contains("<")) {
-			return new ReturnT<String>(500, "AppName"+I18nUtil.getString("system_unvalid") );
+            return new ReturnT<String>(500, "AppName" + I18nUtil.getString("system_unvalid"));
         }
-		if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
-			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
+        if (xxlJobGroup.getTitle() == null || xxlJobGroup.getTitle().trim().length() == 0) {
+            return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")));
         }
         if (xxlJobGroup.getTitle().contains(">") || xxlJobGroup.getTitle().contains("<")) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") );
+            return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_title") + I18nUtil.getString("system_unvalid"));
         }
-		if (xxlJobGroup.getAddressType()!=0) {
-			if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) {
-				return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit") );
+        if (xxlJobGroup.getAddressType() != 0) {
+            if (xxlJobGroup.getAddressList() == null || xxlJobGroup.getAddressList().trim().length() == 0) {
+                return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit"));
             }
             if (xxlJobGroup.getAddressList().contains(">") || xxlJobGroup.getAddressList().contains("<")) {
-				return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") );
+                return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList") + I18nUtil.getString("system_unvalid"));
             }
 
             String[] addresss = xxlJobGroup.getAddressList().split(",");
-			for (String item: addresss) {
-				if (item==null || item.trim().length()==0) {
-					return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") );
+            for (String item : addresss) {
+                if (item == null || item.trim().length() == 0) {
+                    return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid"));
                 }
             }
         }
@@ -97,44 +98,44 @@ public class JobGroupController {
         xxlJobGroup.setUpdateTime(new Date());
 
         int ret = xxlJobGroupDao.save(xxlJobGroup);
-		return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
+        return (ret > 0) ? ReturnT.SUCCESS : ReturnT.FAIL;
     }
 
     @RequestMapping("/update")
     @ResponseBody
-	public ReturnT<String> update(XxlJobGroup xxlJobGroup){
+    public ReturnT<String> update(XxlJobGroup xxlJobGroup) {
         // valid
-		if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) {
-			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
+        if (xxlJobGroup.getAppname() == null || xxlJobGroup.getAppname().trim().length() == 0) {
+            return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + "AppName"));
         }
-		if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
+        if (xxlJobGroup.getAppname().length() < 4 || xxlJobGroup.getAppname().length() > 64) {
+            return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length"));
         }
-		if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
-			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
+        if (xxlJobGroup.getTitle() == null || xxlJobGroup.getTitle().trim().length() == 0) {
+            return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")));
         }
         if (xxlJobGroup.getAddressType() == 0) {
             // 0=自动注册
             List<String> registryList = findRegistryByAppName(xxlJobGroup.getAppname());
             String addressListStr = null;
-			if (registryList!=null && !registryList.isEmpty()) {
+            if (registryList != null && !registryList.isEmpty()) {
                 Collections.sort(registryList);
                 addressListStr = "";
-				for (String item:registryList) {
+                for (String item : registryList) {
                     addressListStr += item + ",";
                 }
-				addressListStr = addressListStr.substring(0, addressListStr.length()-1);
+                addressListStr = addressListStr.substring(0, addressListStr.length() - 1);
             }
             xxlJobGroup.setAddressList(addressListStr);
         } else {
             // 1=手动录入
-			if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) {
-				return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit") );
+            if (xxlJobGroup.getAddressList() == null || xxlJobGroup.getAddressList().trim().length() == 0) {
+                return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit"));
             }
             String[] addresss = xxlJobGroup.getAddressList().split(",");
-			for (String item: addresss) {
-				if (item==null || item.trim().length()==0) {
-					return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") );
+            for (String item : addresss) {
+                if (item == null || item.trim().length() == 0) {
+                    return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid"));
                 }
             }
         }
@@ -143,14 +144,14 @@ public class JobGroupController {
         xxlJobGroup.setUpdateTime(new Date());
 
         int ret = xxlJobGroupDao.update(xxlJobGroup);
-		return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
+        return (ret > 0) ? ReturnT.SUCCESS : ReturnT.FAIL;
     }
 
-	private List<String> findRegistryByAppName(String appnameParam){
+    private List<String> findRegistryByAppName(String appnameParam) {
         HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
         List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
         if (list != null) {
-			for (XxlJobRegistry item: list) {
+            for (XxlJobRegistry item : list) {
                 if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
                     String appname = item.getRegistryKey();
                     List<String> registryList = appAddressMap.get(appname);
@@ -170,28 +171,28 @@ public class JobGroupController {
 
     @RequestMapping("/remove")
     @ResponseBody
-	public ReturnT<String> remove(int id){
+    public ReturnT<String> remove(int id) {
 
         // valid
         int count = xxlJobInfoDao.pageListCount(0, 10, id, -1, null, null, null);
         if (count > 0) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_0") );
+            return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_0"));
         }
 
         List<XxlJobGroup> allList = xxlJobGroupDao.findAll();
         if (allList.size() == 1) {
-			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_1") );
+            return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_1"));
         }
 
         int ret = xxlJobGroupDao.remove(id);
-		return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
+        return (ret > 0) ? ReturnT.SUCCESS : ReturnT.FAIL;
     }
 
     @RequestMapping("/loadById")
     @ResponseBody
-	public ReturnT<XxlJobGroup> loadById(int id){
+    public ReturnT<XxlJobGroup> loadById(int id) {
         XxlJobGroup jobGroup = xxlJobGroupDao.load(id);
-		return jobGroup!=null?new ReturnT<XxlJobGroup>(jobGroup):new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null);
+        return jobGroup != null ? new ReturnT<XxlJobGroup>(jobGroup) : new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null);
     }
 
 }

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java

@@ -1,6 +1,5 @@
 package com.xxl.job.admin.controller;
 
-import com.xxl.job.admin.core.cron.CronExpression;
 import com.xxl.job.admin.core.exception.XxlJobException;
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobInfo;
@@ -29,11 +28,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
 import java.util.*;
 
 /**
  * index controller
+ *
  * @author xuxueli 2015-12-19 16:13:16
  */
 @Controller
@@ -50,39 +49,39 @@ public class JobInfoController {
     public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
 
         // 枚举-字典
-		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	    // 路由策略-列表
-		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());								// Glue类型-字典
-		model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values());	    // 阻塞处理策略-字典
-		model.addAttribute("ScheduleTypeEnum", ScheduleTypeEnum.values());	    				// 调度类型
-		model.addAttribute("MisfireStrategyEnum", MisfireStrategyEnum.values());	    			// 调度过期策略
+        model.addAttribute("ExecutorRouteStrategyEnum" , ExecutorRouteStrategyEnum.values());        // 路由策略-列表
+        model.addAttribute("GlueTypeEnum" , GlueTypeEnum.values());                                // Glue类型-字典
+        model.addAttribute("ExecutorBlockStrategyEnum" , ExecutorBlockStrategyEnum.values());        // 阻塞处理策略-字典
+        model.addAttribute("ScheduleTypeEnum" , ScheduleTypeEnum.values());                        // 调度类型
+        model.addAttribute("MisfireStrategyEnum" , MisfireStrategyEnum.values());                    // 调度过期策略
 
         // 执行器列表
         List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
 
         // filter group
         List<XxlJobGroup> jobGroupList = filterJobGroupByRole(request, jobGroupList_all);
-		if (jobGroupList==null || jobGroupList.size()==0) {
+        if (jobGroupList == null || jobGroupList.size() == 0) {
             throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
         }
 
-		model.addAttribute("JobGroupList", jobGroupList);
-		model.addAttribute("jobGroup", jobGroup);
+        model.addAttribute("JobGroupList" , jobGroupList);
+        model.addAttribute("jobGroup" , jobGroup);
 
         return "jobinfo/jobinfo.index";
     }
 
-	public static List<XxlJobGroup> filterJobGroupByRole(HttpServletRequest request, List<XxlJobGroup> jobGroupList_all){
+    public static List<XxlJobGroup> filterJobGroupByRole(HttpServletRequest request, List<XxlJobGroup> jobGroupList_all) {
         List<XxlJobGroup> jobGroupList = new ArrayList<>();
-		if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
+        if (jobGroupList_all != null && jobGroupList_all.size() > 0) {
             XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
             if (loginUser.getRole() == 1) {
                 jobGroupList = jobGroupList_all;
             } else {
                 List<String> groupIdStrs = new ArrayList<>();
-				if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
+                if (loginUser.getPermission() != null && loginUser.getPermission().trim().length() > 0) {
                     groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
                 }
-				for (XxlJobGroup groupItem:jobGroupList_all) {
+                for (XxlJobGroup groupItem : jobGroupList_all) {
                     if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
                         jobGroupList.add(groupItem);
                     }
@@ -91,10 +90,11 @@ public class JobInfoController {
         }
         return jobGroupList;
     }
+
     public static void validPermission(HttpServletRequest request, int jobGroup) {
         XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
         if (!loginUser.validPermission(jobGroup)) {
-			throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]");
+            throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username=" + loginUser.getUsername() + "]");
         }
     }
 
@@ -171,7 +171,7 @@ public class JobInfoController {
             }
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
-			return new ReturnT<List<String>>(ReturnT.FAIL_CODE, (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) + e.getMessage());
+            return new ReturnT<List<String>>(ReturnT.FAIL_CODE, (I18nUtil.getString("schedule_type") + I18nUtil.getString("system_unvalid")) + e.getMessage());
         }
         return new ReturnT<List<String>>(result);
 

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.controller;
 
-import com.xxl.job.admin.core.exception.XxlJobException;
 import com.xxl.job.admin.core.complete.XxlJobCompleter;
+import com.xxl.job.admin.core.exception.XxlJobException;
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobInfo;
 import com.xxl.job.admin.core.model.XxlJobLog;
@@ -33,6 +33,7 @@ import java.util.Map;
 
 /**
  * index controller
+ *
  * @author xuxueli 2015-12-19 16:13:16
  */
 @Controller
@@ -55,11 +56,11 @@ public class JobLogController {
 
         // filter group
         List<XxlJobGroup> jobGroupList = JobInfoController.filterJobGroupByRole(request, jobGroupList_all);
-		if (jobGroupList==null || jobGroupList.size()==0) {
+        if (jobGroupList == null || jobGroupList.size() == 0) {
             throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
         }
 
-		model.addAttribute("JobGroupList", jobGroupList);
+        model.addAttribute("JobGroupList" , jobGroupList);
 
         // 任务
         if (jobId > 0) {
@@ -68,7 +69,7 @@ public class JobLogController {
                 throw new RuntimeException(I18nUtil.getString("jobinfo_field_id") + I18nUtil.getString("system_unvalid"));
             }
 
-			model.addAttribute("jobInfo", jobInfo);
+            model.addAttribute("jobInfo" , jobInfo);
 
             // valid permission
             JobInfoController.validPermission(request, jobInfo.getJobGroup());
@@ -79,7 +80,7 @@ public class JobLogController {
 
     @RequestMapping("/getJobsByGroup")
     @ResponseBody
-	public ReturnT<List<XxlJobInfo>> getJobsByGroup(int jobGroup){
+    public ReturnT<List<XxlJobInfo>> getJobsByGroup(int jobGroup) {
         List<XxlJobInfo> list = xxlJobInfoDao.getJobsByGroup(jobGroup);
         return new ReturnT<List<XxlJobInfo>>(list);
     }
@@ -97,7 +98,7 @@ public class JobLogController {
         // parse param
         Date triggerTimeStart = null;
         Date triggerTimeEnd = null;
-		if (filterTime!=null && filterTime.trim().length()>0) {
+        if (filterTime != null && filterTime.trim().length() > 0) {
             String[] temp = filterTime.split(" - ");
             if (temp.length == 2) {
                 triggerTimeStart = DateUtil.parseDateTime(temp[0]);
@@ -111,14 +112,14 @@ public class JobLogController {
 
         // package result
         Map<String, Object> maps = new HashMap<String, Object>();
-	    maps.put("recordsTotal", list_count);		// 总记录数
-	    maps.put("recordsFiltered", list_count);	// 过滤后的总记录数
-	    maps.put("data", list);  					// 分页列表
+        maps.put("recordsTotal" , list_count);        // 总记录数
+        maps.put("recordsFiltered" , list_count);    // 过滤后的总记录数
+        maps.put("data" , list);                    // 分页列表
         return maps;
     }
 
     @RequestMapping("/logDetailPage")
-	public String logDetailPage(int id, Model model){
+    public String logDetailPage(int id, Model model) {
 
         // base check
         ReturnT<String> logStatue = ReturnT.SUCCESS;
@@ -127,23 +128,23 @@ public class JobLogController {
             throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid"));
         }
 
-        model.addAttribute("triggerCode", jobLog.getTriggerCode());
-        model.addAttribute("handleCode", jobLog.getHandleCode());
-        model.addAttribute("executorAddress", jobLog.getExecutorAddress());
-        model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime());
-        model.addAttribute("logId", jobLog.getId());
+        model.addAttribute("triggerCode" , jobLog.getTriggerCode());
+        model.addAttribute("handleCode" , jobLog.getHandleCode());
+        model.addAttribute("executorAddress" , jobLog.getExecutorAddress());
+        model.addAttribute("triggerTime" , jobLog.getTriggerTime().getTime());
+        model.addAttribute("logId" , jobLog.getId());
         return "joblog/joblog.detail";
     }
 
     @RequestMapping("/logDetailCat")
     @ResponseBody
-	public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum){
+    public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum) {
         try {
             ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(executorAddress);
             ReturnT<LogResult> logResult = executorBiz.log(new LogParam(triggerTime, logId, fromLineNum));
 
             // is end
-            if (logResult.getContent()!=null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) {
+            if (logResult.getContent() != null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) {
                 XxlJobLog jobLog = xxlJobLogDao.load(logId);
                 if (jobLog.getHandleCode() > 0) {
                     logResult.getContent().setEnd(true);
@@ -159,11 +160,11 @@ public class JobLogController {
 
     @RequestMapping("/logKill")
     @ResponseBody
-	public ReturnT<String> logKill(int id){
+    public ReturnT<String> logKill(int id) {
         // base check
         XxlJobLog log = xxlJobLogDao.load(id);
         XxlJobInfo jobInfo = xxlJobInfoDao.loadById(log.getJobId());
-		if (jobInfo==null) {
+        if (jobInfo == null) {
             return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
         }
         if (ReturnT.SUCCESS_CODE != log.getTriggerCode()) {
@@ -182,7 +183,7 @@ public class JobLogController {
 
         if (ReturnT.SUCCESS_CODE == runResult.getCode()) {
             log.setHandleCode(ReturnT.FAIL_CODE);
-			log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():""));
+            log.setHandleMsg(I18nUtil.getString("joblog_kill_log_byman") + ":" + (runResult.getMsg() != null ? runResult.getMsg() : ""));
             log.setHandleTime(new Date());
             XxlJobCompleter.updateHandleInfoAndFinish(log);
             return new ReturnT<String>(runResult.getMsg());
@@ -193,7 +194,7 @@ public class JobLogController {
 
     @RequestMapping("/clearLog")
     @ResponseBody
-	public ReturnT<String> clearLog(int jobGroup, int jobId, int type){
+    public ReturnT<String> clearLog(int jobGroup, int jobId, int type) {
 
         Date clearBeforeTime = null;
         int clearBeforeNum = 0;
@@ -222,10 +223,10 @@ public class JobLogController {
         List<Long> logIds = null;
         do {
             logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000);
-			if (logIds!=null && logIds.size()>0) {
+            if (logIds != null && logIds.size() > 0) {
                 xxlJobLogDao.clearLog(logIds);
             }
-		} while (logIds!=null && logIds.size()>0);
+        } while (logIds != null && logIds.size() > 0);
 
         return ReturnT.SUCCESS;
     }

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java

@@ -40,7 +40,7 @@ public class UserController {
 
         // 执行器列表
         List<XxlJobGroup> groupList = xxlJobGroupDao.findAll();
-        model.addAttribute("groupList", groupList);
+        model.addAttribute("groupList" , groupList);
 
         return "user/user.index";
     }
@@ -57,17 +57,17 @@ public class UserController {
         int list_count = xxlJobUserDao.pageListCount(start, length, username, role);
 
         // filter
-        if (list!=null && list.size()>0) {
-            for (XxlJobUser item: list) {
+        if (list != null && list.size() > 0) {
+            for (XxlJobUser item : list) {
                 item.setPassword(null);
             }
         }
 
         // package result
         Map<String, Object> maps = new HashMap<String, Object>();
-        maps.put("recordsTotal", list_count);		// 总记录数
-        maps.put("recordsFiltered", list_count);	// 过滤后的总记录数
-        maps.put("data", list);  					// 分页列表
+        maps.put("recordsTotal" , list_count);        // 总记录数
+        maps.put("recordsFiltered" , list_count);    // 过滤后的总记录数
+        maps.put("data" , list);                      // 分页列表
         return maps;
     }
 
@@ -78,19 +78,19 @@ public class UserController {
 
         // valid username
         if (!StringUtils.hasText(xxlJobUser.getUsername())) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_username") );
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input") + I18nUtil.getString("user_username"));
         }
         xxlJobUser.setUsername(xxlJobUser.getUsername().trim());
-        if (!(xxlJobUser.getUsername().length()>=4 && xxlJobUser.getUsername().length()<=20)) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+        if (!(xxlJobUser.getUsername().length() >= 4 && xxlJobUser.getUsername().length() <= 20)) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit") + "[4-20]");
         }
         // valid password
         if (!StringUtils.hasText(xxlJobUser.getPassword())) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_password") );
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input") + I18nUtil.getString("user_password"));
         }
         xxlJobUser.setPassword(xxlJobUser.getPassword().trim());
-        if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+        if (!(xxlJobUser.getPassword().length() >= 4 && xxlJobUser.getPassword().length() <= 20)) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit") + "[4-20]");
         }
         // md5 password
         xxlJobUser.setPassword(DigestUtils.md5DigestAsHex(xxlJobUser.getPassword().getBytes()));
@@ -98,7 +98,7 @@ public class UserController {
         // check repeat
         XxlJobUser existUser = xxlJobUserDao.loadByUserName(xxlJobUser.getUsername());
         if (existUser != null) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("user_username_repeat") );
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("user_username_repeat"));
         }
 
         // write
@@ -120,8 +120,8 @@ public class UserController {
         // valid password
         if (StringUtils.hasText(xxlJobUser.getPassword())) {
             xxlJobUser.setPassword(xxlJobUser.getPassword().trim());
-            if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) {
-                return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+            if (!(xxlJobUser.getPassword().length() >= 4 && xxlJobUser.getPassword().length() <= 20)) {
+                return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit") + "[4-20]");
             }
             // md5 password
             xxlJobUser.setPassword(DigestUtils.md5DigestAsHex(xxlJobUser.getPassword().getBytes()));
@@ -151,15 +151,15 @@ public class UserController {
 
     @RequestMapping("/updatePwd")
     @ResponseBody
-    public ReturnT<String> updatePwd(HttpServletRequest request, String password){
+    public ReturnT<String> updatePwd(HttpServletRequest request, String password) {
 
         // valid password
-        if (password==null || password.trim().length()==0){
+        if (password == null || password.trim().length() == 0) {
             return new ReturnT<String>(ReturnT.FAIL.getCode(), "密码不可为空");
         }
         password = password.trim();
-        if (!(password.length()>=4 && password.length()<=20)) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+        if (!(password.length() >= 4 && password.length() <= 20)) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit") + "[4-20]");
         }
 
         // md5 password

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java

@@ -8,6 +8,7 @@ import java.lang.annotation.Target;
 
 /**
  * 权限限制
+ *
  * @author xuxueli 2015-12-12 18:29:02
  */
 @Target(ElementType.METHOD)

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java

@@ -24,17 +24,17 @@ public class CookieInterceptor implements AsyncHandlerInterceptor {
                            ModelAndView modelAndView) throws Exception {
 
         // cookie
-		if (modelAndView!=null && request.getCookies()!=null && request.getCookies().length>0) {
+        if (modelAndView != null && request.getCookies() != null && request.getCookies().length > 0) {
             HashMap<String, Cookie> cookieMap = new HashMap<String, Cookie>();
             for (Cookie ck : request.getCookies()) {
                 cookieMap.put(ck.getName(), ck);
             }
-			modelAndView.addObject("cookieMap", cookieMap);
+            modelAndView.addObject("cookieMap" , cookieMap);
         }
 
         // static method
         if (modelAndView != null) {
-			modelAndView.addObject("I18nUtil", FtlUtil.generateStaticModel(I18nUtil.class.getName()));
+            modelAndView.addObject("I18nUtil" , FtlUtil.generateStaticModel(I18nUtil.class.getName()));
         }
 
         AsyncHandlerInterceptor.super.postHandle(request, response, handler, modelAndView);

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java

@@ -33,9 +33,9 @@ public class PermissionInterceptor implements AsyncHandlerInterceptor {
         // if need login
         boolean needLogin = true;
         boolean needAdminuser = false;
-		HandlerMethod method = (HandlerMethod)handler;
+        HandlerMethod method = (HandlerMethod) handler;
         PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class);
-		if (permission!=null) {
+        if (permission != null) {
             needLogin = permission.limit();
             needAdminuser = permission.adminuser();
         }
@@ -44,10 +44,10 @@ public class PermissionInterceptor implements AsyncHandlerInterceptor {
             XxlJobUser loginUser = loginService.ifLogin(request, response);
             if (loginUser == null) {
                 response.setStatus(302);
-				response.setHeader("location", request.getContextPath()+"/toLogin");
+                response.setHeader("location" , request.getContextPath() + "/toLogin");
                 return false;
             }
-			if (needAdminuser && loginUser.getRole()!=1) {
+            if (needAdminuser && loginUser.getRole() != 1) {
                 throw new RuntimeException(I18nUtil.getString("system_permission_limit"));
             }
             request.setAttribute(LoginService.LOGIN_IDENTITY_KEY, loginUser);

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java

@@ -1,8 +1,8 @@
 package com.xxl.job.admin.controller.resolver;
 
 import com.xxl.job.admin.core.exception.XxlJobException;
-import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.admin.core.util.JacksonUtil;
+import com.xxl.job.core.biz.model.ReturnT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -29,13 +29,13 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
                                          HttpServletResponse response, Object handler, Exception ex) {
 
         if (!(ex instanceof XxlJobException)) {
-			logger.error("WebExceptionResolver:{}", ex);
+            logger.error("WebExceptionResolver:{}" , ex);
         }
 
         // if json
         boolean isJson = false;
         if (handler instanceof HandlerMethod) {
-			HandlerMethod method = (HandlerMethod)handler;
+            HandlerMethod method = (HandlerMethod) handler;
             ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
             if (responseBody != null) {
                 isJson = true;
@@ -43,7 +43,7 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
         }
 
         // error result
-		ReturnT<String> errorResult = new ReturnT<String>(ReturnT.FAIL_CODE, ex.toString().replaceAll("\n", "<br/>"));
+        ReturnT<String> errorResult = new ReturnT<String>(ReturnT.FAIL_CODE, ex.toString().replaceAll("\n" , "<br/>"));
 
         // response
         ModelAndView mv = new ModelAndView();
@@ -57,7 +57,7 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
             return mv;
         } else {
 
-			mv.addObject("exceptionMsg", errorResult.getMsg());
+            mv.addObject("exceptionMsg" , errorResult.getMsg());
             mv.setViewName("/common/common.exception");
             return mv;
         }

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 /**
  * xxl-job log, used to track trigger process
+ *
  * @author xuxueli  2015-12-19 23:19:09
  */
 public class XxlJobLog {

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 /**
  * xxl-job log for glue, used to track job code process
+ *
  * @author xuxueli 2016-5-19 17:57:46
  */
 public class XxlJobLogGlue {

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java

@@ -54,7 +54,7 @@ public class XxlJobUser {
     }
 
     // plugin
-	public boolean validPermission(int jobGroup){
+    public boolean validPermission(int jobGroup) {
         if (this.role == 1) {
             return true;
         } else {

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java

@@ -23,7 +23,8 @@ public class JobCompleteHelper {
     private static Logger logger = LoggerFactory.getLogger(JobCompleteHelper.class);
 
     private static JobCompleteHelper instance = new JobCompleteHelper();
-	public static JobCompleteHelper getInstance(){
+
+    public static JobCompleteHelper getInstance() {
         return instance;
     }
 
@@ -32,7 +33,8 @@ public class JobCompleteHelper {
     private ThreadPoolExecutor callbackThreadPool = null;
     private Thread monitorThread;
     private volatile boolean toStop = false;
-	public void start(){
+
+    public void start() {
 
         // for callback
         callbackThreadPool = new ThreadPoolExecutor(
@@ -78,15 +80,15 @@ public class JobCompleteHelper {
                         Date losedTime = DateUtil.addMinutes(new Date(), -10);
                         List<Long> losedJobIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findLostJobIds(losedTime);
 
-						if (losedJobIds!=null && losedJobIds.size()>0) {
-							for (Long logId: losedJobIds) {
+                        if (losedJobIds != null && losedJobIds.size() > 0) {
+                            for (Long logId : losedJobIds) {
 
                                 XxlJobLog jobLog = new XxlJobLog();
                                 jobLog.setId(logId);
 
                                 jobLog.setHandleTime(new Date());
                                 jobLog.setHandleCode(ReturnT.FAIL_CODE);
-								jobLog.setHandleMsg( I18nUtil.getString("joblog_lost_fail") );
+                                jobLog.setHandleMsg(I18nUtil.getString("joblog_lost_fail"));
 
                                 XxlJobCompleter.updateHandleInfoAndFinish(jobLog);
                             }
@@ -94,7 +96,7 @@ public class JobCompleteHelper {
                         }
                     } catch (Exception e) {
                         if (!toStop) {
-							logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}", e);
+                            logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}" , e);
                         }
                     }
 
@@ -117,7 +119,7 @@ public class JobCompleteHelper {
         monitorThread.start();
     }
 
-	public void toStop(){
+    public void toStop() {
         toStop = true;
 
         // stop registryOrRemoveThreadPool
@@ -140,10 +142,10 @@ public class JobCompleteHelper {
         callbackThreadPool.execute(new Runnable() {
             @Override
             public void run() {
-				for (HandleCallbackParam handleCallbackParam: callbackParamList) {
+                for (HandleCallbackParam handleCallbackParam : callbackParamList) {
                     ReturnT<String> callbackResult = callback(handleCallbackParam);
-					logger.debug(">>>>>>>>> JobApiController.callback {}, handleCallbackParam={}, callbackResult={}",
-							(callbackResult.getCode()== ReturnT.SUCCESS_CODE?"success":"fail"), handleCallbackParam, callbackResult);
+                    logger.debug(">>>>>>>>> JobApiController.callback {}, handleCallbackParam={}, callbackResult={}" ,
+                        (callbackResult.getCode() == ReturnT.SUCCESS_CODE ? "success" : "fail"), handleCallbackParam, callbackResult);
                 }
             }
         });
@@ -163,7 +165,7 @@ public class JobCompleteHelper {
 
         // handle msg
         StringBuffer handleMsg = new StringBuffer();
-		if (log.getHandleMsg()!=null) {
+        if (log.getHandleMsg() != null) {
             handleMsg.append(log.getHandleMsg()).append("<br>");
         }
         if (handleCallbackParam.getHandleMsg() != null) {
@@ -180,5 +182,4 @@ public class JobCompleteHelper {
     }
 
 
-
 }

ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java

@@ -20,7 +20,8 @@ public class JobFailMonitorHelper {
     private static Logger logger = LoggerFactory.getLogger(JobFailMonitorHelper.class);
 
     private static JobFailMonitorHelper instance = new JobFailMonitorHelper();
-	public static JobFailMonitorHelper getInstance(){
+
+    public static JobFailMonitorHelper getInstance() {
         return instance;
     }
 
@@ -28,7 +29,8 @@ public class JobFailMonitorHelper {
 
     private Thread monitorThread;
     private volatile boolean toStop = false;
-	public void start(){
+
+    public void start() {
         monitorThread = new Thread(new Runnable() {
 
             @Override
@@ -39,8 +41,8 @@ public class JobFailMonitorHelper {
                     try {
 
                         List<Long> failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000);
-						if (failLogIds!=null && !failLogIds.isEmpty()) {
-							for (long failLogId: failLogIds) {
+                        if (failLogIds != null && !failLogIds.isEmpty()) {
+                            for (long failLogId : failLogIds) {
 
                                 // lock log
                                 int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1);
@@ -52,17 +54,17 @@ public class JobFailMonitorHelper {
 
                                 // 1、fail retry monitor
                                 if (log.getExecutorFailRetryCount() > 0) {
-									JobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount()-1), log.getExecutorShardingParam(), log.getExecutorParam(), null);
-									String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
+                                    JobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount() - 1), log.getExecutorShardingParam(), log.getExecutorParam(), null);
+                                    String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>" + I18nUtil.getString("jobconf_trigger_type_retry") + "<<<<<<<<<<< </span><br>";
                                     log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
                                     XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(log);
                                 }
 
                                 // 2、fail alarm monitor
                                 int newAlarmStatus = 0;        // 告警状态：0-默认、-1=锁定状态、1-无需告警、2-告警成功、3-告警失败
-								if (info!=null && info.getAlarmEmail()!=null && info.getAlarmEmail().trim().length()>0) {
+                                if (info != null && info.getAlarmEmail() != null && info.getAlarmEmail().trim().length() > 0) {
                                     boolean alarmResult = XxlJobAdminConfig.getAdminConfig().getJobAlarmer().alarm(info, log);
-									newAlarmStatus = alarmResult?2:3;
+                                    newAlarmStatus = alarmResult ? 2 : 3;
                                 } else {
                                     newAlarmStatus = 1;
                                 }
@@ -73,7 +75,7 @@ public class JobFailMonitorHelper {
 
                     } catch (Exception e) {
                         if (!toStop) {
-							logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}", e);
+                            logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}" , e);
                         }
                     }
 
@@ -96,7 +98,7 @@ public class JobFailMonitorHelper {
         monitorThread.start();
     }
 
-	public void toStop(){
+    public void toStop() {
         toStop = true;
         // interrupt and wait
         monitorThread.interrupt();