Merge branch '17' into dev

pig-auth/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-auth</artifactId>
@@ -44,19 +44,19 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-feign</artifactId>
-			<version>3.3.4</version>
+			<version>3.3.5</version>
 		</dependency>
 		<!--upms api、model 模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>3.3.4</version>
+			<version>3.3.5</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>3.3.4</version>
+			<version>3.3.5</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>

pig-common/pig-common-bom/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pig-common-bom</artifactId>
-	<version>3.3.4</version>
+	<version>3.3.5</version>
 	<packaging>pom</packaging>
 
 	<name>pig-common-bom</name>
@@ -17,7 +17,7 @@
 		<pig.common.version>${project.version}</pig.common.version>
 		<spring-boot.version>2.5.4</spring-boot.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
+		<security.oauth.version>2.1.8.RELEASE</security.oauth.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<git.commit.plugin>2.2.5</git.commit.plugin>
@@ -31,6 +31,7 @@
 		<nacos.version>2.0.3</nacos.version>
 		<excel.version>1.0.0</excel.version>
 		<oss.version>1.0.1</oss.version>
+		<jaxb.version>2.3.5</jaxb.version>
 	</properties>
 
 	<!-- 定义全局jar版本,模块使用需要再次引入但不用写版本号-->
@@ -93,8 +94,8 @@
 			</dependency>
 			<!--稳定版本，替代spring security bom内置-->
 			<dependency>
-				<groupId>org.springframework.security.oauth</groupId>
-				<artifactId>spring-security-oauth2</artifactId>
+				<groupId>org.springframework.security.oauth.boot</groupId>
+				<artifactId>spring-security-oauth2-autoconfigure</artifactId>
 				<version>${security.oauth.version}</version>
 			</dependency>
 			<!--swagger 最新依赖内置版本-->

pig-common/pig-common-core/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-core</artifactId>

pig-common/pig-common-datascope/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>pig-common</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

pig-common/pig-common-datasource/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>pig-common</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

pig-common/pig-common-feign/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>3.3.4</version>
+			<version>3.3.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>

pig-common/pig-common-job/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-job</artifactId>

pig-common/pig-common-log/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-log</artifactId>
@@ -35,13 +35,11 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>3.3.4</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>3.3.4</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>
@@ -49,8 +47,8 @@
 			<artifactId>spring-security-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.security.oauth</groupId>
-			<artifactId>spring-security-oauth2</artifactId>
+			<groupId>org.springframework.security.oauth.boot</groupId>
+			<artifactId>spring-security-oauth2-autoconfigure</artifactId>
 		</dependency>
 	</dependencies>
 </project>

pig-common/pig-common-mybatis/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-mybatis</artifactId>

pig-common/pig-common-security/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-security</artifactId>
@@ -35,7 +35,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>3.3.4</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -46,7 +45,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>3.3.4</version>
 		</dependency>
 	</dependencies>
 </project>

pig-common/pig-common-swagger/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-swagger</artifactId>

pig-common/pig-common-test/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common-test</artifactId>
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>3.3.4</version>
+			<version>3.3.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>

pig-common/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-common</artifactId>

pig-gateway/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-gateway</artifactId>

pig-register/pom.xml

@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-register</artifactId>

pig-upms/pig-upms-api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-upms-api</artifactId>

pig-upms/pig-upms-biz/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-upms-biz</artifactId>

pig-upms/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-upms</artifactId>

pig-visual/pig-codegen/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-codegen</artifactId>

pig-visual/pig-monitor/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-monitor</artifactId>

pig-visual/pig-sentinel-dashboard/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-sentinel-dashboard</artifactId>

pig-visual/pig-xxl-job-admin/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-xxl-job-admin</artifactId>

pig-visual/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 	</parent>
 
 	<artifactId>pig-visual</artifactId>

pom.xml

@@ -22,7 +22,7 @@
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pig</artifactId>
 	<name>${project.artifactId}</name>
-	<version>3.3.4</version>
+	<version>3.3.5</version>
 	<packaging>pom</packaging>
 	<url>https://www.pig4cloud.com</url>