Browse Source

Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice

dev_shibei_match
yinzuomei 5 years ago
parent
commit
4f73be3e73
  1. 2
      epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
  2. 1
      epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.1__demo.sql
  3. 2
      epmet-auth/deploy/docker-compose-test.yml
  4. 2
      epmet-gateway/deploy/docker-compose-test.yml
  5. 4
      epmet-gateway/pom.xml
  6. 1
      epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.1__demo.sql
  7. 1
      epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.1__demo.sql
  8. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  9. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  10. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
  11. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  12. 1
      epmet-module/epmet-oss/epmet-oss-server/src/main/resources/db/migration/V0.0.1__demo.sql
  13. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  14. 1
      epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
  15. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  17. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  18. 10
      epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
  19. 1
      epmet-module/gov-grid/gov-grid-server/src/main/resources/db/migration/V0.0.1__demo.sql
  20. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  21. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  22. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  23. 1
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.1__demo.sql
  24. 0
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/epmet_gov_issue.sql
  25. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
  26. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  27. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  28. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  29. 1
      epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.1__demo.sql
  30. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  31. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  32. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  33. 1
      epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.1__demo.sql
  34. 0
      epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/epmet_gov_project.sql
  35. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  36. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
  37. 4
      epmet-module/gov-voice/gov-voice-server/pom.xml
  38. 1
      epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.1__demo.sql
  39. 2
      epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql
  40. 1
      epmet-module/oper-access/oper-access-server/src/main/resources/db/migration/V0.0.1__demo.sql
  41. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  42. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  43. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  44. 1
      epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.1__demo.sql
  45. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
  46. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
  47. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  48. 1
      epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.1__demo.sql
  49. 0
      epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/customer_foot_bar.sql
  50. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  51. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  52. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  53. 1
      epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.1__demo.sql
  54. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  55. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
  56. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  57. 1
      epmet-module/resi-guide/resi-guide-server/src/main/resources/db/migration/V0.0.1__demo.sql
  58. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  59. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
  60. 2
      epmet-module/resi-hall/resi-hall-server/pom.xml
  61. 10
      epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
  62. 1
      epmet-module/resi-hall/resi-hall-server/src/main/resources/db/migration/V0.0.1__demo.sql
  63. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
  64. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  65. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
  66. 20
      epmet-module/resi-mine/resi-mine-server/pom.xml
  67. 7
      epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
  68. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
  69. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
  70. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  71. 1
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.1__demo.sql
  72. 2
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
  73. 2
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
  74. 2
      epmet-module/resi-voice/resi-voice-server/pom.xml
  75. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
  76. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
  77. 2
      epmet-openapi/epmet-openapi-scan/pom.xml
  78. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  79. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  80. 2
      epmet-user/epmet-user-server/pom.xml
  81. 1
      epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.1__demo.sql

2
epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@ -70,7 +70,7 @@ spring:
flyway: flyway:
enabled: @spring.flyway.enabled@ enabled: @spring.flyway.enabled@
locations: classpath:db/migration locations: classpath:db/migration
url: @spring.datasource.druid.url url: @spring.datasource.druid.url@
user: @spring.datasource.druid.username@ user: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@ password: @spring.datasource.druid.password@
baseline-on-migrate: true baseline-on-migrate: true

1
epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-auth/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-test container_name: epmet-auth-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.16 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.20
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-gateway/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-gateway-server: epmet-gateway-server:
container_name: epmet-gateway-server-test container_name: epmet-gateway-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.13 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.17
ports: ports:
- "8080:8080" - "8080:8080"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

4
epmet-gateway/pom.xml

@ -170,8 +170,8 @@
<gateway.routes.resi-home-server.uri>lb://resi-home-server</gateway.routes.resi-home-server.uri> <gateway.routes.resi-home-server.uri>lb://resi-home-server</gateway.routes.resi-home-server.uri>
<!-- <gateway.routes.resi-home-server.uri>http://localhost:8104</gateway.routes.resi-home-server.uri>--> <!-- <gateway.routes.resi-home-server.uri>http://localhost:8104</gateway.routes.resi-home-server.uri>-->
<!-- 26、政府端-党建声音 --> <!-- 26、政府端-党建声音 -->
<gateway.routes.gov-voice-server.uri>lb://gov-voice-server</gateway.routes.gov-voice-server.uri> <!-- <gateway.routes.gov-voice-server.uri>lb://gov-voice-server</gateway.routes.gov-voice-server.uri>-->
<!-- <gateway.routes.gov-voice-server.uri>http://localhost:8105</gateway.routes.gov-voice-server.uri>--> <gateway.routes.gov-voice-server.uri>http://localhost:8105</gateway.routes.gov-voice-server.uri>
<!-- 27、居民端-党建声音 --> <!-- 27、居民端-党建声音 -->
<gateway.routes.resi-voice-server.uri>lb://resi-voice-server</gateway.routes.resi-voice-server.uri> <gateway.routes.resi-voice-server.uri>lb://resi-voice-server</gateway.routes.resi-voice-server.uri>
<!-- <gateway.routes.resi-voice-server.uri>http://localhost:8106</gateway.routes.resi-voice-server.uri>--> <!-- <gateway.routes.resi-voice-server.uri>http://localhost:8106</gateway.routes.resi-voice-server.uri>-->

1
epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

1
epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-message-server: epmet-message-server:
container_name: epmet-message-server-test container_name: epmet-message-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.14 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.18
ports: ports:
- "8085:8085" - "8085:8085"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server: epmet-oss-server:
container_name: epmet-oss-server-dev container_name: epmet-oss-server-dev
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.17 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.18
ports: ports:
- "8083:8083" - "8083:8083"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server: epmet-oss-server:
container_name: epmet-oss-server-test container_name: epmet-oss-server-test
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.13 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.18
ports: ports:
- "8083:8083" - "8083:8083"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.17</version> <version>0.3.18</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId> <artifactId>epmet-oss</artifactId>

1
epmet-module/epmet-oss/epmet-oss-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-access-server: gov-access-server:
container_name: gov-access-server-test container_name: gov-access-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.23 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.29
ports: ports:
- "8099:8099" - "8099:8099"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

1
epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@ -59,6 +59,7 @@ spring:
user: @spring.datasource.druid.username@ user: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@ password: @spring.datasource.druid.password@
baseline-on-migrate: true baseline-on-migrate: true
baseline-version: 0
management: management:

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-grid-server: gov-grid-server:
container_name: gov-grid-server-dev container_name: gov-grid-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.28 image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.30
ports: ports:
- "8097:8097" - "8097:8097"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-grid-server: gov-grid-server:
container_name: gov-grid-server-test container_name: gov-grid-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.27 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.30
ports: ports:
- "8097:8097" - "8097:8097"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.28</version> <version>0.3.30</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId> <artifactId>gov-grid</artifactId>

10
epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@ -38,15 +38,7 @@ spring:
namespace: @nacos.config.namespace@ namespace: @nacos.config.namespace@
group: @nacos.config.group@ group: @nacos.config.group@
file-extension: yaml file-extension: yaml
# 数据迁移工具flyway
flyway:
enabled: @spring.flyway.enabled@
locations: classpath:db/migration
url: @spring.datasource.druid.url@
user: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
baseline-on-migrate: true
baseline-version: 0
management: management:
endpoints: endpoints:
web: web:

1
epmet-module/gov-grid/gov-grid-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-issue-server: gov-issue-server:
container_name: gov-issue-server-dev container_name: gov-issue-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.41 image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.42
ports: ports:
- "8101:8101" - "8101:8101"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-issue-server: gov-issue-server:
container_name: gov-issue-server-test container_name: gov-issue-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.40 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.42
ports: ports:
- "8101:8101" - "8101:8101"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.41</version> <version>0.3.42</version>
<parent> <parent>
<artifactId>gov-issue</artifactId> <artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

1
epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

0
epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql → epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/epmet_gov_issue.sql

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-mine-server: gov-mine-server:
container_name: gov-mine-server-test container_name: gov-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.25 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.27
ports: ports:
- "8098:8098" - "8098:8098"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-org-server: gov-org-server:
container_name: gov-org-server-dev container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.65 image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.66
ports: ports:
- "8092:8092" - "8092:8092"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-org-server: gov-org-server:
container_name: gov-org-server-test container_name: gov-org-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.59 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.66
ports: ports:
- "8092:8092" - "8092:8092"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.65</version> <version>0.3.66</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId> <artifactId>gov-org</artifactId>

1
epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-dev container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.26 image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.27
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-test container_name: gov-project-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.23 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.27
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.26</version> <version>0.3.27</version>
<parent> <parent>
<artifactId>gov-project</artifactId> <artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

1
epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

0
epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql → epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/epmet_gov_project.sql

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-voice-server: gov-voice-server:
container_name: gov-voice-server-dev container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.37 image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.41
ports: ports:
- "8105:8105" - "8105:8105"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-voice-server: gov-voice-server:
container_name: gov-voice-server-test container_name: gov-voice-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.1 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.41
ports: ports:
- "8105:8105" - "8105:8105"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

4
epmet-module/gov-voice/gov-voice-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.37</version> <version>0.3.41</version>
<parent> <parent>
<artifactId>gov-voice</artifactId> <artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
@ -133,7 +133,7 @@
<nacos.config-enabled>false</nacos.config-enabled> <nacos.config-enabled>false</nacos.config-enabled>
<nacos.ip/> <nacos.ip/>
<spring.flyway.enabled>false</spring.flyway.enabled> <spring.flyway.enabled>true</spring.flyway.enabled>
<openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url> <openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url>
</properties> </properties>
</profile> </profile>

1
epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql → epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql

@ -5,7 +5,7 @@
-- SET NAMES utf8mb4; -- SET NAMES utf8mb4;
-- #SET FOREIGN_KEY_CHECKS = 0; -- #SET FOREIGN_KEY_CHECKS = 0;
CREATE DATABASE `epmet_gov_access` DEFAULT CHARACTER SET utf8mb4; CREATE DATABASE `epmet_gov_voice` DEFAULT CHARACTER SET utf8mb4;
CREATE TABLE tag_default( CREATE TABLE tag_default(
ID VARCHAR(64) NOT NULL COMMENT '主键ID' , ID VARCHAR(64) NOT NULL COMMENT '主键ID' ,
TAG_NAME VARCHAR(32) NOT NULL COMMENT '标签名称' , TAG_NAME VARCHAR(32) NOT NULL COMMENT '标签名称' ,

1
epmet-module/oper-access/oper-access-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-crm-server: oper-crm-server:
container_name: oper-crm-server-dev container_name: oper-crm-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.22 image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.23
ports: ports:
- "8090:8090" - "8090:8090"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-crm-server: oper-crm-server:
container_name: oper-crm-server-test container_name: oper-crm-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.21 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.23
ports: ports:
- "8090:8090" - "8090:8090"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.22</version> <version>0.3.23</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId> <artifactId>oper-crm</artifactId>

1
epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-customize-server: oper-customize-server:
container_name: oper-customize-server-dev container_name: oper-customize-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.21 image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.22
ports: ports:
- "8089:8089" - "8089:8089"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-customize-server: oper-customize-server:
container_name: oper-customize-server-test container_name: oper-customize-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.20 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.22
ports: ports:
- "8089:8089" - "8089:8089"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.21</version> <version>0.3.22</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId> <artifactId>oper-customize</artifactId>

1
epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

0
epmet-module/oper-customize/oper-customize-server/src/main/resources/db.migration/customer_foot_bar.sql → epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/customer_foot_bar.sql

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-group-server: resi-group-server:
container_name: resi-group-server-dev container_name: resi-group-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.52 image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.53
ports: ports:
- "8095:8095" - "8095:8095"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-group-server: resi-group-server:
container_name: resi-group-server-test container_name: resi-group-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.50 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.53
ports: ports:
- "8095:8095" - "8095:8095"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.52</version> <version>0.3.53</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId> <artifactId>resi-group</artifactId>

1
epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-guide-server: resi-guide-server:
container_name: resi-guide-server-dev container_name: resi-guide-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.14 image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.15
ports: ports:
- "8091:8091" - "8091:8091"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-guide-server: resi-guide-server:
container_name: resi-guide-server-test container_name: resi-guide-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.13 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.15
ports: ports:
- "8091:8091" - "8091:8091"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.14</version> <version>0.3.15</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId> <artifactId>resi-guide</artifactId>

1
epmet-module/resi-guide/resi-guide-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-hall-server: resi-hall-server:
container_name: resi-hall-server-dev container_name: resi-hall-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.18 image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.20
ports: ports:
- "8100:8100" - "8100:8100"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-hall-server: resi-hall-server:
container_name: resi-hall-server-test container_name: resi-hall-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.17 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.20
ports: ports:
- "8100:8100" - "8100:8100"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.18</version> <version>0.3.20</version>
<parent> <parent>
<artifactId>resi-hall</artifactId> <artifactId>resi-hall</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

10
epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml

@ -38,15 +38,7 @@ spring:
namespace: @nacos.config.namespace@ namespace: @nacos.config.namespace@
group: @nacos.config.group@ group: @nacos.config.group@
file-extension: yaml file-extension: yaml
# 数据迁移工具flyway
flyway:
enabled: @spring.flyway.enabled@
locations: classpath:db/migration
url: @spring.datasource.druid.url@
user: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
baseline-on-migrate: true
baseline-version: 0
management: management:
endpoints: endpoints:
web: web:

1
epmet-module/resi-hall/resi-hall-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-home-server: resi-home-server:
container_name: resi-home-server-test container_name: resi-home-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.12 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.15
ports: ports:
- "8104:8104" - "8104:8104"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-mine-server: resi-mine-server:
container_name: resi-mine-server-dev container_name: resi-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.24 image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.25
ports: ports:
- "8094:8094" - "8094:8094"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-mine-server: resi-mine-server:
container_name: resi-mine-server-test container_name: resi-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.23 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.25
ports: ports:
- "8094:8094" - "8094:8094"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

20
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.24</version> <version>0.3.25</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId> <artifactId>resi-mine</artifactId>
@ -17,11 +17,11 @@
<artifactId>epmet-commons-tools</artifactId> <artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-commons-mybatis</artifactId> <artifactId>epmet-commons-mybatis</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
@ -117,13 +117,6 @@
<properties> <properties>
<server.port>8094</server.port> <server.port>8094</server.port>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<!-- 数据库配置-->
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epmet_resi_guide_user</spring.datasource.druid.username>
<spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <spring.redis.index>0</spring.redis.index>
<spring.redis.host>192.168.1.130</spring.redis.host> <spring.redis.host>192.168.1.130</spring.redis.host>
@ -147,13 +140,6 @@
<properties> <properties>
<server.port>8094</server.port> <server.port>8094</server.port>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置-->
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epmet</spring.datasource.druid.username>
<spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <spring.redis.index>0</spring.redis.index>
<spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host> <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>

7
epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml

@ -23,13 +23,6 @@ spring:
port: @spring.redis.port@ port: @spring.redis.port@
password: @spring.redis.password@ password: @spring.redis.password@
timeout: 30s timeout: 30s
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@
cloud: cloud:
nacos: nacos:
discovery: discovery:

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-partymember-server: resi-partymember-server:
container_name: resi-partymember-server-dev container_name: resi-partymember-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.43 image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.44
ports: ports:
- "8096:8096" - "8096:8096"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-partymember-server: resi-partymember-server:
container_name: resi-partymember-server-test container_name: resi-partymember-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.42 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.44
ports: ports:
- "8096:8096" - "8096:8096"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.43</version> <version>0.3.44</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId> <artifactId>resi-partymember</artifactId>

1
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;

2
epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-voice-server: resi-voice-server:
container_name: resi-voice-server-dev container_name: resi-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.6 image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.7
ports: ports:
- "8106:8106" - "8106:8106"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-voice-server: resi-voice-server:
container_name: resi-voice-server-test container_name: resi-voice-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-voice-server:0.3.1 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-voice-server:0.3.7
ports: ports:
- "8106:8106" - "8106:8106"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-voice/resi-voice-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.6</version> <version>0.3.7</version>
<parent> <parent>
<artifactId>resi-voice</artifactId> <artifactId>resi-voice</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-openapi-scan: epmet-openapi-scan:
container_name: epmet-openapi-scan-dev container_name: epmet-openapi-scan-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.6 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.8
ports: ports:
- "8107:8107" - "8107:8107"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-openapi-scan: epmet-openapi-scan:
container_name: epmet-openapi-scan-test container_name: epmet-openapi-scan-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-scan:0.3.1 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.8
ports: ports:
- "8107:8107" - "8107:8107"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-openapi/epmet-openapi-scan/pom.xml

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.6</version> <version>0.3.8</version>
<artifactId>epmet-openapi-scan</artifactId> <artifactId>epmet-openapi-scan</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-dev container_name: epmet-user-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.57 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.58
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-test container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.53 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.58
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.57</version> <version>0.3.58</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId> <artifactId>epmet-user</artifactId>

1
epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.1__demo.sql

@ -0,0 +1 @@
select 0;
Loading…
Cancel
Save