Merge remote-tracking branch 'origin/master'

common/common-core/src/main/java/com/tacit/common/utils/AesPasswordEncoder.java

@@ -1,4 +1,4 @@
-package com.tacit.common.utils;
+package com.tacit.common.utils;
 
 import org.springframework.security.crypto.password.PasswordEncoder;
 

pom.xml

@@ -24,7 +24,8 @@
         <java.version>21</java.version>
         <spring-boot.version>3.1.12</spring-boot.version>
         <spring-cloud.version>2022.0.4</spring-cloud.version>
-        <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2023.0.1.3</spring-cloud-alibaba.version>
+        <nacos-client.version>3.1.0</nacos-client.version>
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <lombok.version>1.18.30</lombok.version>
         <jjwt.version>0.11.5</jjwt.version>
@@ -99,12 +100,29 @@
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-                <version>2023.0.1.0</version>
+                <version>${spring-cloud-alibaba.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-                <version>2023.0.1.0</version>
+                <version>${spring-cloud-alibaba.version}</version>
+            </dependency>
+
+            <!-- Nacos Client 版本覆盖 -->
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-client</artifactId>
+                <version>${nacos-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-auth</artifactId>
+                <version>${nacos-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-encryption-plugin</artifactId>
+                <version>${nacos-client.version}</version>
             </dependency>
             
             <!-- Spring Cloud Bootstrap -->

tacit-admin/src/main/java/com/tacit/admin/config/SecurityConfig.java

@@ -1,5 +1,6 @@
 package com.tacit.admin.config;
 
+import com.tacit.common.utils.AesPasswordEncoder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
@@ -10,7 +11,6 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
-import com.tacit.common.utils.AesPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.filter.OncePerRequestFilter;