From 17407d012701deef5d92f8f91a5893dfdbfe88fb Mon Sep 17 00:00:00 2001 From: wangze <73400@163.com> Date: Fri, 2 Apr 2021 22:40:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4cache=5Frepeat=5Fkey?= =?UTF-8?q?=E4=B8=BA=E9=A9=BC=E5=B3=B0=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/interceptor/impl/SameUrlDataInterceptor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java index e3864c7..3e82309 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -78,9 +78,9 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor } // 唯一标识（指定key + 消息头） - String cache_repeat_key = Constants.REPEAT_SUBMIT_KEY + submitKey; + String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey; - Object sessionObj = redisCache.getCacheObject(cache_repeat_key); + Object sessionObj = redisCache.getCacheObject(cacheRepeatKey); if (sessionObj != null) { Map sessionMap = (Map) sessionObj; @@ -95,7 +95,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor } Map cacheMap = new HashMap(); cacheMap.put(url, nowDataMap); - redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS); + redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS); return false; } From ba5ab4b091341aa02c83f3ff8c6867fc42cfe9d4 Mon Sep 17 00:00:00 2001 From: wangze <73400@163.com> Date: Fri, 2 Apr 2021 22:49:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=8D=95=E6=9D=A1=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E5=85=B6=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 2 +- ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 0a8bc70..243ce82 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_role where role_id = #{roleId} + update sys_role set del_flag = '2' where role_id = #{roleId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 3fc3448..13e1bea 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_user where user_id = #{userId} + update sys_user set del_flag = '2' where user_id = #{userId} From 9f6bc13e64ba80d92854832533f64b4ec65315d9 Mon Sep 17 00:00:00 2001 From: wangze <73400@163.com> Date: Fri, 2 Apr 2021 23:06:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:fire:=20=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysRoleMapper.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 243ce82..7e3ab1e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -135,10 +135,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where role_id = #{roleId} - - update sys_user set status = #{status} where user_id = #{userId} - - update sys_role set del_flag = '2' where role_id = #{roleId}