Merge branch 'dev'

pig-mesh · Jan 28, 2024 · 97066e8 · 97066e8
2 parents 2a6a311 + 47a7e7a
commit 97066e8
Show file tree

Hide file tree

Showing 33 changed files with 231 additions and 229 deletions.
diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
@@ -14,12 +14,3 @@ jobs:
         with:
           source-repo: "[email protected]:pig-mesh/pig.git"
           destination-repo: "[email protected]:lengleng/pig.git"
-  atomgit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: wearerequired/git-mirror-action@master #同步至 atomgit
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
-        with:
-          source-repo: "[email protected]:pig-mesh/pig.git"
-          destination-repo: "[email protected]:log4j/pig.git"
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,4 @@ target/
 Thumbs.db
 Servers
 .metadata
+.flattened-pom.xml
diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-auth</artifactId>

diff --git a/...va/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java b/...va/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java
@@ -147,14 +147,14 @@ public Authentication authenticate(Authentication authentication) throws Authent
 					.principal(usernamePasswordAuthentication)
 					.authorizationServerContext(AuthorizationServerContextHolder.getContext())
 					.authorizedScopes(authorizedScopes)
-					.authorizationGrantType(AuthorizationGrantType.PASSWORD)
+					.authorizationGrantType(resouceOwnerBaseAuthentication.getAuthorizationGrantType())
 					.authorizationGrant(resouceOwnerBaseAuthentication);
 			// @formatter:on
 
 			OAuth2Authorization.Builder authorizationBuilder = OAuth2Authorization
 				.withRegisteredClient(registeredClient)
 				.principalName(usernamePasswordAuthentication.getName())
-				.authorizationGrantType(AuthorizationGrantType.PASSWORD)
+				.authorizationGrantType(resouceOwnerBaseAuthentication.getAuthorizationGrantType())
 				// 0.4.0 新增的方法
 				.authorizedScopes(authorizedScopes);
 

diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
@@ -6,28 +6,26 @@
 
     <groupId>com.pig4cloud</groupId>
     <artifactId>pig-common-bom</artifactId>
-    <version>3.7.1-JDK8</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <name>pig-common-bom</name>
     <url>pig cloud parent</url>
     <description>pig cloud parent</description>
 
     <properties>
-        <pig.common.version>${project.version}</pig.common.version>
+        <revision>3.7.4-JDK8</revision>
         <spring-boot.version>2.7.18</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <log4j2.version>2.17.1</log4j2.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <git.commit.plugin>4.9.9</git.commit.plugin>
-        <spring.checkstyle.plugin>0.0.39</spring.checkstyle.plugin>
         <fastjson.version>1.2.83</fastjson.version>
         <knife4j.version>3.0.3</knife4j.version>
         <springdoc.version>1.6.9</springdoc.version>
         <swagger.core.version>2.2.0</swagger.core.version>
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
-        <dynamic-ds.version>4.2.0</dynamic-ds.version>
+        <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <mysql.version>8.0.33</mysql.version>
         <seata.version>1.6.1</seata.version>
         <excel.version>1.2.6</excel.version>
@@ -39,6 +37,9 @@
         <hutool.version>5.8.23</hutool.version>
         <mica.version>2.7.4</mica.version>
         <sentinel.version>1.8.4</sentinel.version>
+        <git.commit.plugin>4.9.9</git.commit.plugin>
+        <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
+        <spring.checkstyle.plugin>0.0.39</spring.checkstyle.plugin>
     </properties>
 
     <!-- 定义全局jar版本,模块使用需要再次引入但不用写版本号-->
@@ -47,62 +48,62 @@
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-core</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-datasource</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-job</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-log</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-mybatis</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-security</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-feign</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-swagger</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-seata</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-xss</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-common-oss</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.pig4cloud</groupId>
                 <artifactId>pig-upms-api</artifactId>
-                <version>${pig.common.version}</version>
+                <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>com.mysql</groupId>
@@ -228,6 +229,32 @@
 
     <build>
         <plugins>
+            <!-- 统一 revision 版本 -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven-plugin.version}</version>
+                <configuration>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                    <updatePomFile>true</updatePomFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <!--打包jar 与git commit 关联插件-->
             <plugin>
                 <groupId>io.github.git-commit-id</groupId>

diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-core</artifactId>

diff --git a/...g-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java b/...g-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java
@@ -47,11 +47,6 @@ public interface SecurityConstants {
 	 */
 	String FROM = "from";
 
-	/**
-	 * 请求header
-	 */
-	String HEADER_FROM_IN = FROM + "=" + FROM_IN;
-
 	/**
 	 * 默认登录URL
 	 */
@@ -82,11 +77,6 @@ public interface SecurityConstants {
 	 */
 	String NOOP = "{noop}";
 
-	/***
-	 * 资源服务器默认bean名称
-	 */
-	String RESOURCE_SERVER_CONFIGURER = "resourceServerConfigurerAdapter";
-
 	/**
 	 * 用户名
 	 */

diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>pig-common</artifactId>
         <groupId>com.pig4cloud</groupId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pig-common/pig-common-feign/pom.xml b/pig-common/pig-common-feign/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pig-common/pig-common-job/pom.xml b/pig-common/pig-common-job/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>3.7.1-JDK8</version>
+		<version>${revision}</version>
 	</parent>
 
 	<artifactId>pig-common-job</artifactId>

diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-log</artifactId>

diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-mybatis</artifactId>

diff --git a/pig-common/pig-common-oss/pom.xml b/pig-common/pig-common-oss/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-oss</artifactId>

diff --git a/pig-common/pig-common-seata/pom.xml b/pig-common/pig-common-seata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-seata</artifactId>

diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-security</artifactId>

diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-swagger</artifactId>

diff --git a/pig-common/pig-common-xss/pom.xml b/pig-common/pig-common-xss/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig-common</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common-xss</artifactId>

diff --git a/pig-common/pom.xml b/pig-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-common</artifactId>

diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.pig4cloud</groupId>
         <artifactId>pig</artifactId>
-        <version>3.7.1-JDK8</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>pig-gateway</artifactId>