From f4c9545366efc0d13beff6fb7042b1deb31f706b Mon Sep 17 00:00:00 2001
From: lbw <eoyacm81453@unionstone.com.cn>
Date: Fri, 7 Jan 2022 15:36:43 +0800
Subject: [PATCH] =?UTF-8?q?:white=5Fcheck=5Fmark:=20Adding=20tests.=20pom?=
 =?UTF-8?q?=20=E6=94=AF=E6=8C=81=E5=A4=9A=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-upms/pigx-upms-biz/pom.xml                    | 10 ++++++++++
 .../pigx-upms-biz/src/main/resources/bootstrap.yml |  1 +
 pigx-visual/pigx-daemon-quartz/pom.xml             |  7 ++++++-
 .../src/main/resources/bootstrap.yml               |  1 +
 pom.xml                                            | 14 +++++++++++---
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index 1aef5b2a7..889f0e9e3 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -38,6 +38,16 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+		<!-- ojdbc8 -->
+		<dependency>
+			<groupId>com.oracle.database.jdbc</groupId>
+			<artifactId>ojdbc8</artifactId>
+		</dependency>
+		<!--PG-->
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+		</dependency>
 		<!--upms api、model 模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
index 45d9e39ed..461b279f0 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
@@ -13,5 +13,6 @@ spring:
         file-extension: yml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @db.type@
   profiles:
     active: @profiles.active@
diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml
index 4f010425e..889f98edc 100644
--- a/pigx-visual/pigx-daemon-quartz/pom.xml
+++ b/pigx-visual/pigx-daemon-quartz/pom.xml
@@ -44,6 +44,11 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+		<!-- ojdbc8 -->
+		<dependency>
+			<groupId>com.oracle.database.jdbc</groupId>
+			<artifactId>ojdbc8</artifactId>
+		</dependency>
 		<!-- druid 连接池 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -101,4 +106,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-mp-platform/src/main/resources/bootstrap.yml
index f26e3ca52..d5dfc9927 100644
--- a/pigx-visual/pigx-mp-platform/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-mp-platform/src/main/resources/bootstrap.yml
@@ -13,5 +13,6 @@ spring:
         file-extension: yml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @db.type@
   profiles:
     active: @profiles.active@
diff --git a/pom.xml b/pom.xml
index 05314db93..5ce905b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 	</organization>
 
 	<properties>
-		<spring-boot.version>2.5.7</spring-boot.version>
+		<spring-boot.version>2.5.8</spring-boot.version>
 		<spring-cloud.version>2020.0.4</spring-cloud.version>
 		<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -282,9 +282,17 @@
 			</activation>
 		</profile>
 		<profile>
-			<id>test</id>
+			<id>oracle</id>
 			<properties>
-				<profiles.active>test</profiles.active>
+				<profiles.active>dev</profiles.active>
+				<db.type>oracle</db.type>
+			</properties>
+		</profile>
+		<profile>
+			<id>pg</id>
+			<properties>
+				<profiles.active>dev</profiles.active>
+				<db.type>pg</db.type>
 			</properties>
 		</profile>
 		<profile>