diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
index 6bbf4f1eb..d270fc002 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
spring:
redis:
- database: 0
+ database: 2
host: 47.104.224.45
timeout: 30s
port: 6379
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
index 0470b8574..f63f14cb3 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
@@ -1,6 +1,6 @@
spring:
redis:
- database: 0
+ database: 2
host: redis
timeout: 30s
port: 6379
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml
index 0470b8574..f63f14cb3 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
spring:
redis:
- database: 0
+ database: 2
host: redis
timeout: 30s
port: 6379
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index b55835234..d60930b98 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -88,6 +88,7 @@
dev
+ 2
47.104.224.45
6379
elink@888
@@ -104,6 +105,7 @@
test
+ 2
47.104.224.45
6379
elink@888
@@ -120,6 +122,7 @@
prod
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-auth/src/main/resources/application.yml b/esua-epdc/epdc-auth/src/main/resources/application.yml
index c978fa2bf..c5e84b24d 100644
--- a/esua-epdc/epdc-auth/src/main/resources/application.yml
+++ b/esua-epdc/epdc-auth/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
index 64682ac20..ae522f7c5 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
@@ -14,65 +14,63 @@ package com.elink.esua.epdc.commons.tools.redis;
*/
public class RedisKeys {
- private final static String MODULE_FLAG = "epdc:";
-
/**
* 系统参数Key
*/
public static String getSysParamsKey() {
- return MODULE_FLAG + "sys:params";
+ return "sys:params";
}
/**
* 登录验证码Key
*/
public static String getLoginCaptchaKey(String uuid) {
- return MODULE_FLAG + "sys:captcha:" + uuid;
+ return "sys:captcha:" + uuid;
}
/**
* 登录用户Key
*/
public static String getSecurityUserKey(Long id) {
- return MODULE_FLAG + "sys:security:user:" + id;
+ return "sys:security:user:" + id;
}
/**
* 系统日志Key
*/
public static String getSysLogKey() {
- return MODULE_FLAG + "sys:log";
+ return "sys:log";
}
/**
* 系统资源Key
*/
public static String getSysResourceKey() {
- return MODULE_FLAG + "sys:resource";
+ return "sys:resource";
}
/**
* 用户菜单导航Key
*/
public static String getUserMenuNavKey(Long userId, String language) {
- return MODULE_FLAG + "sys:user:nav:" + userId + "_" + language;
+ return "sys:user:nav:" + userId + "_" + language;
}
/**
* 用户菜单导航Key
*/
public static String getUserMenuNavKey(Long userId) {
- return MODULE_FLAG + "sys:user:nav:" + userId + "_*";
+ return "sys:user:nav:" + userId + "_*";
}
/**
* 用户权限标识Key
*/
public static String getUserPermissionsKey(Long userId) {
- return MODULE_FLAG + "sys:user:permissions:" + userId;
+ return "sys:user:permissions:" + userId;
}
public static String getCpUserKey(String id) {
- return MODULE_FLAG + "sys:security:cpuser:" + id;
+ return "sys:security:cpuser:" + id;
}
}
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 0c9e9c81c..d144b59c4 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -68,15 +68,16 @@
9094
+ 2
47.104.224.45
6379
elink@888
- lb://epdc-auth-server
-
- lb://epdc-admin-server
-
+
+ http://127.0.0.1:9091
+
+ http://127.0.0.1:9092
lb://epdc-activiti-server
lb://epdc-api-server
lb://epdc-app-server
@@ -109,6 +110,7 @@
9094
+ 2
47.104.224.45
6379
elink@888
@@ -140,6 +142,7 @@
9002
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index ac8e81c47..c62805584 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
application:
name: epdc-gateway-server
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
index 864ee1c86..e81072ca7 100644
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
@@ -80,6 +80,7 @@
9058
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9058
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9058
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
index bdb3aa82a..2e38a195a 100644
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index c06e167d0..a46e09e90 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -80,6 +80,7 @@
9060
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9060
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9060
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
index f7061b3e9..81774510b 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index f128d3464..be3236e25 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -109,6 +109,7 @@
9061
+ 2
47.104.224.45
6379
elink@888
@@ -131,6 +132,7 @@
9061
+ 2
47.104.224.45
6379
elink@888
@@ -153,6 +155,7 @@
9061
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
index c009ed353..7196c93c2 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 67539c47b..3e8a66a7a 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -115,6 +115,7 @@
9062
+ 2
47.104.224.45
6379
elink@888
@@ -137,6 +138,7 @@
9062
+ 2
47.104.224.45
6379
elink@888
@@ -159,6 +161,7 @@
9062
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
index b1b1931bd..863382852 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
index 96a2fc29d..b95f3ed7d 100644
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
@@ -80,6 +80,7 @@
9063
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9063
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9063
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
index bbf98fa49..d8c580a31 100644
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index 528cd69af..f593d7112 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -80,6 +80,7 @@
9064
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9064
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9064
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
index 03d86c1cc..7d628be9b 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index 64cf3c844..6ac5138dd 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -123,6 +123,7 @@
9065
+ 2
47.104.224.45
6379
elink@888
@@ -145,6 +146,7 @@
9065
+ 2
47.104.224.45
6379
elink@888
@@ -167,6 +169,7 @@
9065
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
index 6a844d52a..fb12748b3 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
@@ -21,7 +21,7 @@ spring:
max-request-size: 1024MB
enabled: true
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
index 675bcee63..81bc78c89 100644
--- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
@@ -80,6 +80,7 @@
9066
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9066
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9066
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
index 2d2b41f22..d75b3e9aa 100644
--- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
index 18d36ca66..c3b3307b9 100644
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
@@ -80,6 +80,7 @@
9067
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9067
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9067
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
index 82e71dcf4..5cb96ea74 100644
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 27da1f565..8f991068c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -80,6 +80,7 @@
9068
+ 2
47.104.224.45
6379
elink@888
@@ -102,6 +103,7 @@
9068
+ 2
47.104.224.45
6379
elink@888
@@ -124,6 +126,7 @@
9068
+ 2
47.104.224.45
6379
elink@888
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
index 30e59bb36..1bc23e826 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis:
- database: 0
+ database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: @spring.redis.port@