diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 2c1bea6b5d..0e28eb555d 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -158,4 +160,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-commons/epmet-commons-mybatis/pom.xml b/epmet-commons/epmet-commons-mybatis/pom.xml index db396c4042..df0ecffb56 100644 --- a/epmet-commons/epmet-commons-mybatis/pom.xml +++ b/epmet-commons/epmet-commons-mybatis/pom.xml @@ -70,6 +70,12 @@ pagehelper-spring-boot-starter 1.2.12 + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + 4.0.0-RC1 + diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml index b0f7737940..3f75302370 100644 --- a/epmet-commons/epmet-commons-tools/pom.xml +++ b/epmet-commons/epmet-commons-tools/pom.xml @@ -75,6 +75,12 @@ commons-fileupload commons-fileupload ${commons.fileupload.version} + + + commons-io + commons-io + + commons-io diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 7cab2dfdbf..e50d1982cc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -32,6 +32,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + com.epmet diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index b5c54347b9..839272531e 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -28,6 +28,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + com.epmet diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 4b65998598..54b10fbbb1 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -22,6 +22,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + org.springframework.boot diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 052a4fb3e2..25b17e24d5 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -84,6 +84,10 @@ slf4j-log4j12 org.slf4j + + commons-io + commons-io + @@ -122,6 +126,10 @@ spring-security-crypto org.springframework.security + + commons-io + commons-io + diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml index f48d8e63c1..7db04184c5 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml index 477dfeead3..77138fd835 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 8a38624e35..0d38855a4b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -125,6 +125,38 @@ dev + + false + + + 8088 + dev + + + + + + epmet_demo_user + EpmEt-db-UsEr + + 0 + 192.168.1.140 + 6379 + 123456 + + true + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 + + + false + + + true + + + + local true diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml index 06cca196a6..5b6aed6fec 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -39,6 +41,15 @@ spring: url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ + # 数据迁移工具flyway + flyway: + enabled: false + locations: classpath:db/migration + url: + user: + password: + baseline-on-migrate: true + baseline-version: 0 cloud: nacos: discovery: diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml index 45763d3192..03fe99915c 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml @@ -29,6 +29,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index c768d617f9..75a6f2547d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -29,6 +29,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index 458982fe09..9893b21193 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 3f1bfc5e5d..9dda1591c0 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-oss/epmet-oss-client/pom.xml b/epmet-module/epmet-oss/epmet-oss-client/pom.xml index 3b07913b6e..3f4f3057bd 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-client/pom.xml @@ -32,6 +32,12 @@ commons-fileupload commons-fileupload 1.3.3 + + + commons-io + commons-io + + net.coobird diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 4260920a27..e2477c17c2 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -55,6 +55,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + commons-io + commons-io + + com.alibaba.cloud @@ -85,6 +91,12 @@ com.github.tobato fastdfs-client ${fastdfs.version} + + + commons-io + commons-io + + org.springframework diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml index e84091a0eb..97fde10faf 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml @@ -32,6 +32,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index e9806784c0..a7e2df7e6f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -29,6 +29,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -155,4 +157,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 388b63d125..84d0c084ae 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -29,6 +29,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml index 33c6ae4288..47479d4410 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml @@ -29,6 +29,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 705e18b83e..d4c4b44d34 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -29,6 +29,8 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index a12bbbd779..1c1623f05b 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -33,11 +33,6 @@ epmet-commons-mybatis 2.0.0 - - com.epmet - epmet-commons-dynamic-datasource - 2.0.0 - com.epmet epmet-oss-client diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index df84bed116..7f3e68df7f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -111,6 +111,8 @@ public class CustomerGridServiceImpl extends BaseServiceImplepmet-commons-mybatis 2.0.0 - + org.springframework.boot spring-boot-starter-web 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..e289b9c5a9 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.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 + 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@ +# 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@