Merge branch 'big' into leng_dev

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java

@@ -31,6 +31,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
+import org.springframework.context.annotation.Primary;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -47,6 +48,7 @@ import java.util.Set;
  * @author lengleng
  */
 @Slf4j
+@Primary
 @RequiredArgsConstructor
 public class PigxUserDetailsServiceImpl implements PigxUserDetailsService {
 

pigx-visual/pigx-pay-platform/pom.xml

@@ -13,6 +13,9 @@
 	<packaging>jar</packaging>
 
 	<description>支付系统</description>
+	<properties>
+		<hutool.version>5.4.0</hutool.version>
+	</properties>
 
 	<dependencies>
 		<!--注册中心客户端-->
@@ -115,6 +118,15 @@
 		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-core</artifactId>
+				<version>${hutool.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<build>
 		<plugins>
 			<plugin>