From c4f7525f489ee6d5d98d52c3fd70074e457f111d Mon Sep 17 00:00:00 2001 From: liuchuang Date: Sun, 26 Apr 2020 10:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin/epdc-admin-server/pom.xml | 22 ++++++++ .../src/main/resources/application-dev.yml | 54 ++++++------------- .../src/main/resources/application-test.yml | 14 ++--- .../epdc-api-server/epdc-api-server.iml | 2 + .../epdc-api/epdc-api-server/pom.xml | 12 ++--- esua-epdc/epdc-module/epdc-api/epdc-api.iml | 2 + .../epdc-custom/epdc-custom-server/pom.xml | 12 ++--- .../epdc-events/epdc-events-server/pom.xml | 12 ++--- .../epdc-group/epdc-group-server/pom.xml | 12 ++--- .../epdc-job/epdc-job-server/pom.xml | 12 ++--- .../epdc-kpi/epdc-kpi-server/pom.xml | 12 ++--- .../epdc-message/epdc-message-server/pom.xml | 12 ++--- .../epdc-news/epdc-news-server/pom.xml | 12 ++--- .../epdc-oss/epdc-oss-server/pom.xml | 12 ++--- .../epdc-user/epdc-user-server/pom.xml | 12 ++--- .../epdc-websocket-server/pom.xml | 12 ++--- 16 files changed, 116 insertions(+), 110 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index b2094296..bbbba044 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -138,6 +138,17 @@ 9092 dev + 2 + 114.215.125.123 + 9603 + epdc!redis@master1405 + + + + + jinshui + jinshui@833066 + false 47.104.224.45:8848 @@ -160,6 +171,17 @@ 9308 test + 2 + 114.215.125.123 + 9603 + epdc!redis@master1405 + + + + + jinshui + jinshui@833066 + true 47.104.224.45:8848 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 cd056059..83a069a2 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,31 +1,16 @@ spring: redis: - database: 2 - host: 47.104.224.45 + database: @spring.redis.index@ + host: @spring.redis.host@ timeout: 30s - port: 6379 - password: elink@888 + port: @spring.redis.port@ + password: @spring.redis.password@ datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epdc - password: elink833066 - #Oracle -# driver-class-name: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@localhost:1521:xe -# username: renren_cloud -# password: 123456 - #SQLServer -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud -# username: sa -# password: 123456 - #postgresql -# driver-class-name: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/renren_cloud -# username: postgres -# password: 123456 + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ initial-size: 10 max-active: 100 min-idle: 10 @@ -39,18 +24,13 @@ spring: test-while-idle: true test-on-borrow: false test-on-return: false - - -##多数据源的配置,需要引用renren-commons-dynamic-datasource -#dynamic: -# datasource: -# slave1: -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud -# username: sa -# password: 123456 -# slave2: -# driver-class-name: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/renren_cloud -# username: postgres -# password: 123456 + stat-view-servlet: + enabled: true + url-pattern: /druid/* + #login-username: admin + #login-password: admin + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: false \ No newline at end of file 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 f3556698..83a069a2 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,16 +1,16 @@ spring: redis: - database: 2 - host: 47.104.224.45 + database: @spring.redis.index@ + host: @spring.redis.host@ timeout: 30s - port: 6379 - password: elink@888 + port: @spring.redis.port@ + password: @spring.redis.password@ datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epdc - password: elink833066 + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ initial-size: 10 max-active: 100 min-idle: 10 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml index f0c77953..c883fa26 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml @@ -255,5 +255,7 @@ + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 9f89094e..7b5691c4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -157,10 +157,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -191,10 +191,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api.iml b/esua-epdc/epdc-module/epdc-api/epdc-api.iml index 318fbe19..d1f05fac 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api.iml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api.iml @@ -45,5 +45,7 @@ + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml index 240ee35e..bf6d129e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml @@ -134,10 +134,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -158,10 +158,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index bffbd67a..c794bd3c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -153,10 +153,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -191,10 +191,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index 27020bda..cb5f556b 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -129,10 +129,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -155,10 +155,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 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 b80fd2ca..0beee4fe 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 @@ -152,10 +152,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -175,10 +175,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 60a7c3d5..2aa86f1f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -123,10 +123,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -146,10 +146,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 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 ea6c9d61..846fb76c 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 @@ -152,10 +152,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -175,10 +175,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 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 a45bc7f3..ca240846 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 @@ -123,10 +123,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -149,10 +149,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 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 9a0e6939..3b5142e3 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 @@ -165,10 +165,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -188,10 +188,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 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 824c64b0..617d9ce7 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 @@ -128,10 +128,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -154,10 +154,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 4beab8f7..d7381e10 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -146,10 +146,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 false 47.104.224.45:8848 @@ -177,10 +177,10 @@ elink@888 - + - epdc - elink833066 + jinshui + jinshui@833066 true 47.104.224.45:8848