From b04588ffae45dceb661d50d505c2f799704cdbaf Mon Sep 17 00:00:00 2001
From: PIGCLOUD <wangiegie@gmail.com>
Date: Fri, 16 Oct 2026 17:14:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=93=BE=E9=A1=BA=E5=BA=8F=E5=B9=B6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E6=9E=84=E5=BB=BA=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 7dfeb3b7ed6b44b12f72cc82aed92a38e9d39af0)
---
 pigx-common/pigx-common-bom/pom.xml                         | 2 +-
 .../security/component/PigxResourceServerConfiguration.java | 2 +-
 .../pig4cloud/pigx/common/security/service/PigxUser.java    | 4 ++--
 .../src/main/java/com/pig4cloud/pigx/flow/vo/UserVo.java    | 1 +
 pom.xml                                                     | 6 ++++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 7ded13928..f8a003c14 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.pig4cloud</groupId>
     <artifactId>pigx-common-bom</artifactId>
     <packaging>pom</packaging>
-    <version>${pigx.version}</version>
+    <version>6.2.0</version>
     <description>pigx 公共版本控制，在此pom定义的依赖，全局业务微服务不需要指定版本。</description>
 
     <properties>
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java
index 0ed499347..b269132f5 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfiguration.java
@@ -56,7 +56,7 @@ public class PigxResourceServerConfiguration {
     private final PigxBootCorsProperties corsProperties;
 
     @Bean
-    @Order(Ordered.HIGHEST_PRECEDENCE)
+    @Order(Ordered.HIGHEST_PRECEDENCE + 1)
     SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         PathPatternRequestMatcher[] permitMatchers = permitAllUrl.getIgnoreUrls()
                 .stream()
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java
index d36251b27..a454b547d 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java
@@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.SpringSecurityCoreVersion;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.oauth2.core.OAuth2AuthenticatedPrincipal;
 
@@ -40,7 +39,8 @@ import java.util.Map;
 public class PigxUser extends User implements OAuth2AuthenticatedPrincipal {
 
     @Serial
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+    // 保留原序列化版本，兼容已有授权缓存。
+    private static final long serialVersionUID = 620L;
 
     /**
      * 扩展属性，方便存放oauth 上下文相关信息
diff --git a/pigx-flow/pigx-flow-api/src/main/java/com/pig4cloud/pigx/flow/vo/UserVo.java b/pigx-flow/pigx-flow-api/src/main/java/com/pig4cloud/pigx/flow/vo/UserVo.java
index 949e40a20..6d87da326 100644
--- a/pigx-flow/pigx-flow-api/src/main/java/com/pig4cloud/pigx/flow/vo/UserVo.java
+++ b/pigx-flow/pigx-flow-api/src/main/java/com/pig4cloud/pigx/flow/vo/UserVo.java
@@ -74,6 +74,7 @@ public class UserVo {
 	 * 用户的处理状态：0-待处理，1-处理中，2-已完成。默认为0
 	 * </p>
 	 */
+	@Builder.Default
 	private Integer status = 0;
 
 }
diff --git a/pom.xml b/pom.xml
index 7e3ed1adb..9da3eed22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <spring-boot-admin.version>4.1.2</spring-boot-admin.version>
         <maven.compiler.version>3.14.1</maven.compiler.version>
+        <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
         <spring.checkstyle.version>0.0.47</spring.checkstyle.version>
         <git.commit.version>10.0.1</git.commit.version>
         <cas.sdk.version>3.6.4</cas.sdk.version>
@@ -186,6 +187,11 @@
         </resources>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven-deploy-plugin.version}</version>
+                </plugin>
                 <!--spring boot 默认插件-->
                 <plugin>
                     <groupId>org.springframework.boot</groupId>