From ed94d168ffb89a34823e1dad502fd9323f13abdc Mon Sep 17 00:00:00 2001 From: 94464562 <45187888+94464562@users.noreply.github.com> Date: Sat, 29 Oct 2022 07:15:28 +0800 Subject: [PATCH 1/3] add 401 exception code add 401 exception code for addtional infomation --- .../org/jeecg/common/exception/JeecgBoot401Exception.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java index 6f7205bed9..022e9d940e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java @@ -20,4 +20,9 @@ public JeecgBoot401Exception(String message, Throwable cause) { super(message,cause); } + + public JeecgBootException(String message,Throwable cause) + { + super(message,cause); + } } From 9b14c25e94f91a574494e5d1cb26b4f388f20a9b Mon Sep 17 00:00:00 2001 From: 94464562 <45187888+94464562@users.noreply.github.com> Date: Sat, 29 Oct 2022 07:21:59 +0800 Subject: [PATCH 2/3] encrypt the password the password should be cntrypt before save --- .../src/main/java/org/jeecg/common/util/CommonUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index e2cc671f0e..9fc77cf492 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -275,7 +275,7 @@ public static Connection getDataSourceConnect(String sourceKey) throws SQLExcept ds.setDriverClassName(db.getDriverClassName()); ds.setUrl(db.getUrl()); ds.setUsername(db.getUsername()); - ds.setPassword(db.getPassword()); + ds.setPassword(SecurityUtil.jiami(db.getPassword())); return ds.getConnection(); } @@ -351,4 +351,4 @@ public static String getBaseUrl(HttpServletRequest request) { log.debug("-----Common getBaseUrl----- : " + baseDomainPath); return baseDomainPath; } -} \ No newline at end of file +} From fbef59940cea1a396a1e7a74eb502e9daef2fc33 Mon Sep 17 00:00:00 2001 From: 94464562 <45187888+94464562@users.noreply.github.com> Date: Sat, 29 Oct 2022 07:41:38 +0800 Subject: [PATCH 3/3] Update DataSourceCachePool.java --- .../org/jeecg/common/util/dynamic/db/DataSourceCachePool.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java index 01998791b7..1e459af929 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java @@ -35,7 +35,9 @@ private static RedisTemplate getRedisTemplate() { public static DynamicDataSourceModel getCacheDynamicDataSourceModel(String dbKey) { String redisCacheKey = CacheConstant.SYS_DYNAMICDB_CACHE + dbKey; if (getRedisTemplate().hasKey(redisCacheKey)) { - return (DynamicDataSourceModel) getRedisTemplate().opsForValue().get(redisCacheKey); + DynamicDataSourceModel dynamicDataSourceModel = (DynamicDataSourceModel) getRedisTemplate().opsForValue().get(redisCacheKey); + if(dynamicDataSourceModel!=null) + return dynamicDataSourceModel } CommonAPI commonApi = SpringContextUtils.getBean(CommonAPI.class); DynamicDataSourceModel dbSource = commonApi.getDynamicDbSourceByCode(dbKey);