Merge remote-tracking branch 'origin/dev' into dev

epmet-admin/epmet-admin-server/pom.xml

@@ -110,6 +110,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -140,6 +142,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -66,6 +66,15 @@ spring:
         namespace: @nacos.config.namespace@
         group: @nacos.config.group@
         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:
   endpoints:
     web:

epmet-commons/epmet-commons-mybatis/pom.xml

@@ -72,10 +72,10 @@
         </dependency>
 
         <!--flyway 数据库迁移工具-->
-        <!--<dependency>
+        <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -184,6 +184,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -211,6 +213,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml

@@ -30,6 +30,16 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
+
   cloud:
     nacos:
       discovery:

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -114,6 +114,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -144,6 +146,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -123,6 +123,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -153,6 +155,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -146,6 +146,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -176,6 +178,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -35,6 +35,15 @@ spring:
       max-file-size: 1024MB
       max-request-size: 1024MB
       enabled: true
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -113,6 +113,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -137,6 +139,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -38,6 +38,15 @@ spring:
         namespace: @nacos.config.namespace@
         group: @nacos.config.group@
         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:
   endpoints:
     web:

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

@@ -145,6 +145,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -175,6 +177,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -42,6 +42,15 @@ spring:
         namespace: @nacos.config.namespace@
         group: @nacos.config.group@
         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:
   endpoints:
     web:

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

@@ -140,6 +140,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -170,6 +172,9 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -23,6 +23,15 @@ spring:
     port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+  # 数据迁移工具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
   datasource:
     druid:
       #MySQL

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

@@ -145,6 +145,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -175,6 +177,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -27,6 +27,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -132,6 +132,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -162,6 +164,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -27,6 +27,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

epmet-module/oper-access/oper-access-server/pom.xml

@@ -120,6 +120,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -150,6 +152,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -135,6 +135,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -165,6 +167,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -118,6 +118,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -148,6 +150,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -148,6 +148,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -178,6 +180,7 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -135,6 +135,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -165,6 +167,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -30,6 +30,16 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
+
   cloud:
     nacos:
       discovery:

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

@@ -99,6 +99,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -123,6 +125,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -38,6 +38,15 @@ spring:
         namespace: @nacos.config.namespace@
         group: @nacos.config.group@
         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:
   endpoints:
     web:

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

@@ -147,6 +147,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -177,6 +179,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

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

@@ -30,6 +30,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery:

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

@@ -2,15 +2,17 @@
 <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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <version>0.3.3</version>
+    <artifactId>epmet-openapi-scan</artifactId>
+    <packaging>jar</packaging>
+
     <parent>
         <artifactId>epmet-openapi</artifactId>
         <groupId>com.epmet</groupId>
         <version>2.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.3</version>
-    <artifactId>epmet-openapi-scan</artifactId>
-    <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -138,6 +138,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
             </properties>
         </profile>
         <profile>
@@ -168,6 +170,8 @@
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
             </properties>
         </profile>
     </profiles>

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -51,6 +51,15 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+  # 数据迁移工具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
   cloud:
     nacos:
       discovery: