Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix dynamic cache exception #4164

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix dynamic cache exception #4164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed94d16
add 401 exception code
94464562 Oct 28, 2022
9b14c25
encrypt the password
94464562 Oct 28, 2022
fbef599
Update DataSourceCachePool.java
94464562 Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@ public JeecgBoot401Exception(String message, Throwable cause)
{
super(message,cause);
}

public JeecgBootException(String message,Throwable cause)
{
super(message,cause);
}
}
4 changes: 2 additions & 2 deletions jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down Expand Up @@ -351,4 +351,4 @@ public static String getBaseUrl(HttpServletRequest request) {
log.debug("-----Common getBaseUrl----- : " + baseDomainPath);
return baseDomainPath;
}
}
}
4 changes: 3 additions & 1 deletion jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ private static RedisTemplate<String, Object> 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);
Expand Down