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 @@
com.pig4cloud
pigx-common-bom
pom
- ${pigx.version}
+ 6.2.0
pigx 公共版本控制,在此pom定义的依赖,全局业务微服务不需要指定版本。
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
*
*/
+ @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 @@
17
4.1.2
3.14.1
+ 3.1.4
0.0.47
10.0.1
3.6.4
@@ -186,6 +187,11 @@
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${maven-deploy-plugin.version}
+
org.springframework.boot