diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index a12bbbd779..9a6e3f7a14 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -363,6 +363,16 @@ epmet_gov_org_user EpmEt-db-UsEr + + + + epmet_gov_org_user + EpmEt-db-UsEr + + + + epmet_gov_org_user + EpmEt-db-UsEr 0 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 @@ -370,7 +380,7 @@ 3 EpmEtclOUdrEdIs@py - true + false 172.22.76.5:8848 762652d0-b22e-4d56-93ed-b012ad735309 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 8b65e6bffa..73c05e13fa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -41,34 +41,129 @@ spring: password: @spring.datasource.druid.password@ baseline-on-migrate: true baseline-version: 0 - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave1.url@ + username: @spring.datasource.slave1.username@ + password: @spring.datasource.slave1.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave2.url@ + username: @spring.datasource.slave2.username@ + password: @spring.datasource.slave2.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true cloud: nacos: discovery: diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index eedd673afd..5eec77763e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -341,6 +341,16 @@ epmet_gov_project_user EpmEt-db-UsEr + + + + epmet_gov_project_user + EpmEt-db-UsEr + + + + epmet_gov_project_user + EpmEt-db-UsEr 0 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index f9cda54e57..9190b75656 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -29,22 +29,117 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - #监控页面 - stat-view-servlet: - enabled: false - #loginUsername: admin - #loginPassword: admin - allow: - web-stat-filter: - enabled: false - filters: stat,wall,log4j2 + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave1.url@ + username: @spring.datasource.slave1.username@ + password: @spring.datasource.slave1.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave2.url@ + username: @spring.datasource.slave2.username@ + password: @spring.datasource.slave2.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# #监控页面 +# stat-view-servlet: +# enabled: false +# #loginUsername: admin +# #loginPassword: admin +# allow: +# web-stat-filter: +# enabled: false +# filters: stat,wall,log4j2 # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c6364f2d59..231448ada7 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -353,6 +353,16 @@ epmet_user_user EpmEt-db-UsEr + + + + epmet_user_user + EpmEt-db-UsEr + + + + epmet_user_user + EpmEt-db-UsEr 0 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 2dd7087887..dc13900a84 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -32,34 +32,129 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave1.url@ + username: @spring.datasource.slave1.username@ + password: @spring.datasource.slave1.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave2.url@ + username: @spring.datasource.slave2.username@ + password: @spring.datasource.slave2.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@