Browse Source

Merge pull request 'REPORT-43364 fix: 官网的redis插件连接失败' (#1) from Roger.Chen/demo-tabledata-redis:master into master

Reviewed-on: fanruan/demo-tabledata-redis#1
master
richie 4 years ago
parent
commit
60b7cf1d52
  1. 3
      plugin.xml
  2. 4
      src/main/java/com/fr/plugin/db/redis/RedisUniversalConnectionImpl.java

3
plugin.xml

@ -3,12 +3,13 @@
<id>com.fr.solution.plugin.db.redis.v10</id> <id>com.fr.solution.plugin.db.redis.v10</id>
<name><![CDATA[Redis数据集]]></name> <name><![CDATA[Redis数据集]]></name>
<active>yes</active> <active>yes</active>
<version>7.4.0</version> <version>7.4.1</version>
<env-version>10.0</env-version> <env-version>10.0</env-version>
<jartime>2020-01-20</jartime> <jartime>2020-01-20</jartime>
<vendor>richie</vendor> <vendor>richie</vendor>
<description><![CDATA[可以连接Redis数据库,支持哈希表、列表、集合以及有序集合]]></description> <description><![CDATA[可以连接Redis数据库,支持哈希表、列表、集合以及有序集合]]></description>
<change-notes><![CDATA[ <change-notes><![CDATA[
[2020-11-16]修复保存数据连接后平台测试连接报错的问题。<br/>
[2020-10-28]支持单一主机的集群模式连接选项。<br/> [2020-10-28]支持单一主机的集群模式连接选项。<br/>
[2020-07-07]修复了数据集没有随着参数的变化而变化的问题。<br> [2020-07-07]修复了数据集没有随着参数的变化而变化的问题。<br>
[2020-06-30]修复了一个失误导致连接被重复关闭的问题。<br/> [2020-06-30]修复了一个失误导致连接被重复关闭的问题。<br/>

4
src/main/java/com/fr/plugin/db/redis/RedisUniversalConnectionImpl.java

@ -44,7 +44,9 @@ public class RedisUniversalConnectionImpl extends AbstractUniversalConnectionPro
public JSONObject serialize(RedisDatabaseConnection connection) { public JSONObject serialize(RedisDatabaseConnection connection) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
try { try {
jsonObject.put(BASIC_INFO, JSONObject.mapFrom(connection.clone())); JSONObject basicInfo = JSONObject.mapFrom(connection.clone());
basicInfo.put("password", DecisionServiceConstants.DEFAULT_PASSWORD);
jsonObject.put(BASIC_INFO, basicInfo);
//将ConnectionPoolConfig和RedisConnectionProxyConfig也一次塞给前台展示 //将ConnectionPoolConfig和RedisConnectionProxyConfig也一次塞给前台展示
jsonObject.put(POOL_INFO, JSONObject.mapFrom(RedisConnectionPoolConfig.getInstance().clone())); jsonObject.put(POOL_INFO, JSONObject.mapFrom(RedisConnectionPoolConfig.getInstance().clone()));
JSONObject proxy = JSONObject.mapFrom(RedisConnectionProxyConfig.getInstance().clone()); JSONObject proxy = JSONObject.mapFrom(RedisConnectionProxyConfig.getInstance().clone());

Loading…
Cancel
Save