From 73154265c36caa483e4dad03fdf92756530a592d Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 5 Sep 2023 14:54:47 +0800
Subject: [PATCH] =?UTF-8?q?:rewind:=20Reverting=20changes.=20=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A=E9=94=99=E8=AF=AF=E8=BE=BE=E6=A2=A6=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   2 -
 pigx-register/pom.xml                         | 189 ++++++++----------
 .../src/main/resources/application.yml        |  11 +-
 3 files changed, 92 insertions(+), 110 deletions(-)

diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/application.yml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/application.yml
index 11ed644f2..c8907744f 100644
--- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/application.yml
+++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/resources/application.yml
@@ -16,5 +16,3 @@ spring:
     import:
       - optional:nacos:application-@profiles.active@.yml
       - optional:nacos:${spring.application.name}-@profiles.active@.yml
-  liquibase:
-    enabled: false
diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
index 091f71611..55e825eb6 100644
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -12,115 +12,102 @@
   limitations under the License.
  -->
 <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>
-    <parent>
-        <groupId>com.pig4cloud</groupId>
-        <artifactId>pigx</artifactId>
-        <version>5.2.0-snapshot</version>
-    </parent>
+		 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>
+	<parent>
+		<groupId>com.pig4cloud</groupId>
+		<artifactId>pigx</artifactId>
+		<version>5.2.0-snapshot</version>
+	</parent>
 
-    <artifactId>pigx-register</artifactId>
-    <packaging>jar</packaging>
-    <name>pigx-register</name>
-    <description>nacos 注册配置中心</description>
+	<artifactId>pigx-register</artifactId>
+	<packaging>jar</packaging>
+	<name>pigx-register</name>
+	<description>nacos 注册配置中心</description>
 
-    <properties>
-        <nacos.version>2.2.4-OEM</nacos.version>
-    </properties>
+	<properties>
+		<nacos.version>2.2.4-OEM</nacos.version>
+	</properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>io.springboot.nacos</groupId>
-            <artifactId>nacos-config</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>io.springboot.nacos</groupId>
+			<artifactId>nacos-config</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>io.springboot.nacos</groupId>
-            <artifactId>nacos-naming</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>io.springboot.nacos</groupId>
+			<artifactId>nacos-naming</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>io.springboot.nacos</groupId>
-            <artifactId>nacos-istio</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>io.springboot.nacos</groupId>
+			<artifactId>nacos-istio</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>io.springboot.nacos</groupId>
-            <artifactId>nacos-plugin-default-impl</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>io.springboot.nacos</groupId>
+			<artifactId>nacos-plugin-default-impl</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>io.springboot.nacos</groupId>
-            <artifactId>nacos-prometheus</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>io.springboot.nacos</groupId>
+			<artifactId>nacos-prometheus</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-system</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-system</artifactId>
+		</dependency>
+	</dependencies>
 
-        <!--达梦数据库插件-->
-        <dependency>
-            <groupId>com.pig4cloud.plugin</groupId>
-            <artifactId>nacos-datasource-plugin-dm8</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dameng</groupId>
-            <artifactId>DmJdbcDriver18</artifactId>
-            <version>8.1.1.193</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>**/*.woff</exclude>
-                    <exclude>**/*.woff2</exclude>
-                    <exclude>**/*.ttf</exclude>
-                    <exclude>**/*.eot</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**/*.woff</include>
-                    <include>**/*.woff2</include>
-                    <include>**/*.ttf</include>
-                    <include>**/*.eot</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>**/*.woff</exclude>
+					<exclude>**/*.woff2</exclude>
+					<exclude>**/*.ttf</exclude>
+					<exclude>**/*.eot</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.woff</include>
+					<include>**/*.woff2</include>
+					<include>**/*.ttf</include>
+					<include>**/*.eot</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
 </project>
diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml
index 05cff5071..d62e442d6 100644
--- a/pigx-register/src/main/resources/application.yml
+++ b/pigx-register/src/main/resources/application.yml
@@ -6,13 +6,10 @@ server:
     include-message: always
 db:
   num: 1
-  user: SYSDBA
-  password: SYSDBA
+  user: ${MYSQL_USER:root}
+  password: ${MYSQL_PWD:root}
   url:
-    0: jdbc:dm://home:35236
-  pool:
-    config:
-      driver-class-name: dm.jdbc.driver.DmDriver
+    0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
 
 nacos:
   core:
@@ -29,7 +26,7 @@ nacos:
 
 spring:
   datasource:
-    platform: dameng  #这个过期属性不能修改，nacos 代码对此有硬编码
+    platform: mysql  #这个过期属性不能修改，nacos 代码对此有硬编码
   security:
     enabled: true
   boot: # 接入 spring boot admin