From b9eab27a1c32fab5129e1f875f5e513eb71156ec Mon Sep 17 00:00:00 2001 From: ye_star <17705172417@189.cn> Date: Tue, 11 Apr 2023 13:40:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=907.4.0=E3=80=91=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BD=BF=E7=94=A8fastjson2=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?map=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/factory/DefaultThemeFactory.java | 2 +- .../theme/service/impl/SysThemeServiceImpl.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java index bf741ed50..20cd0837c 100644 --- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java +++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.theme.factory; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.system.modular.theme.pojo.DefaultTheme; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import lombok.Data; import java.beans.IntrospectionException; diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java index f3535735e..d3649efa1 100644 --- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java +++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java @@ -33,8 +33,9 @@ import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeService; import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateFieldService; import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateRelService; import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -110,7 +111,8 @@ public class SysThemeServiceImpl extends ServiceImpl i // 删除保存的图片 String themeValue = sysTheme.getThemeValue(); - Map themeMap = JSON.parseObject(themeValue, Map.class); + Map themeMap = JSON.parseObject(themeValue, new TypeReference>() { + }); // 获取map的key List themeKeys = new ArrayList<>(themeMap.keySet()); @@ -185,14 +187,15 @@ public class SysThemeServiceImpl extends ServiceImpl i // 设置动态属性表单 String themeValueJson = sysTheme.getThemeValue(); - JSONObject jsonObject = JSON.parseObject(themeValueJson); - sysTheme.setDynamicForm(jsonObject.getInnerMap()); + Map jsonObject = JSON.parseObject(themeValueJson, new TypeReference>() { + }); + sysTheme.setDynamicForm(jsonObject); // 遍历表单属性，找到所有文件类型的，组装文件的图片和名称等信息 HashMap tempFileList = new HashMap<>(); for (Map.Entry keyValues : jsonObject.entrySet()) { String key = keyValues.getKey(); - String value = jsonObject.getString(key); + String value = (String) jsonObject.get(key); // 判断是否是文件类型 boolean keyFileFlag = sysThemeTemplateFieldService.getKeyFileFlag(key); if (keyFileFlag) { From 9f08a05e11ee06519e81202ba558c29bc2f26fa6 Mon Sep 17 00:00:00 2001 From: ye_star <17705172417@189.cn> Date: Tue, 11 Apr 2023 13:46:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=907.4.0=E3=80=91=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=90=8E=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E7=BC=93=E5=AD=98=E4=B8=AD=E7=9A=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/modular/user/service/impl/SysUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 58ab0d1a4..7231fbbb7 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -354,6 +354,9 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setPassword(passwordStoredEncryptApi.encrypt(password)); this.updateById(sysUser); + + // 清除缓存中的用户信息 + sysUserCacheOperatorApi.remove(String.valueOf(sysUser.getUserId())); } @Override