From a2073eb2c77099a3ae437555dcaf4ad996d15b4c Mon Sep 17 00:00:00 2001 From: D <3066417822@qq.com> Date: Wed, 13 Dec 2023 14:09:08 +0800 Subject: [PATCH] update --- .vscode/settings.json | 7 ++++++- pom.xml | 4 ++-- .../framework/config/FastJson2JsonRedisSerializer.java | 7 +++++++ .../ruoyi/system/service/impl/SysConfigServiceImpl.java | 2 +- .../ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 2 +- .../com/ruoyi/system/service/impl/SysPostServiceImpl.java | 2 +- .../com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b..11da8a3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,8 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "interactive", + "files.associations": { + "*.yml": "yaml" + }, + "java.compile.nullAnalysis.mode": "disabled", + // "java.compile.nullAnalysis.mode": "automatic" } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 41a4c25..8c9fef8 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.3 0.9.1 4.3.0 - 3.0.2 + 3.0.3 @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-dependencies - 3.1.5 + 3.2.0 pom import diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java index b6d6110..ae9ccb4 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java @@ -6,6 +6,7 @@ import org.springframework.data.redis.serializer.SerializationException; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; +// import com.alibaba.fastjson2.filter.Filter; /** * Redis使用FastJson序列化 @@ -16,6 +17,11 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer { public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); + // static final Filter autoTypeFilter = JSONReader.autoTypeFilter( + // 按需加上需要支持自动类型的类名前缀，范围越小越安全 + // "org.springframework.security.core.authority.SimpleGrantedAuthority" + // ); + private Class clazz; public FastJson2JsonRedisSerializer(Class clazz) @@ -44,5 +50,6 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer String str = new String(bytes, DEFAULT_CHARSET); return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType); + // return JSON.parseObject(str, clazz, autoTypeFilter); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 83750e7..9e2d0f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -161,7 +161,7 @@ public class SysConfigServiceImpl implements ISysConfigService SysConfig config = selectConfigById(configId); if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { - throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); + throw new ServiceException("内置参数【%1$s】不能删除 ".formatted(config.getConfigKey())); } configMapper.deleteConfigById(configId); redisCache.deleteObject(getCacheKey(config.getConfigKey())); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 37928c4..d3fd7fe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -124,7 +124,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService SysDictType dictType = selectDictTypeById(dictId); if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) { - throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); + throw new ServiceException("%1$s已分配,不能删除".formatted(dictType.getDictName())); } dictTypeMapper.deleteDictTypeById(dictId); DictUtils.removeDictCache(dictType.getDictType()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 5e5fe06..4964acd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -146,7 +146,7 @@ public class SysPostServiceImpl implements ISysPostService SysPost post = selectPostById(postId); if (countUserPostById(postId) > 0) { - throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); + throw new ServiceException("%1$s已分配,不能删除".formatted(post.getPostName())); } } return postMapper.deletePostByIds(postIds); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index d6cee80..51301df 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -365,7 +365,7 @@ public class SysRoleServiceImpl implements ISysRoleService SysRole role = selectRoleById(roleId); if (countUserRoleByRoleId(roleId) > 0) { - throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName())); + throw new ServiceException("%1$s已分配,不能删除".formatted(role.getRoleName())); } } // 删除角色与菜单关联