diff --git a/common/common-core/src/main/java/com/tacit/common/utils/AesPasswordEncoder.java b/common/common-core/src/main/java/com/tacit/common/utils/AesPasswordEncoder.java index 7df45ec..9df4b2b 100644 --- a/common/common-core/src/main/java/com/tacit/common/utils/AesPasswordEncoder.java +++ b/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; @@ -14,4 +14,4 @@ public class AesPasswordEncoder implements PasswordEncoder { String decrypted = AesUtils.decrypt(encodedPassword); return rawPassword.toString().equals(decrypted); } -} +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index ab9b081..5fc031c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,8 @@ 21 3.1.12 2022.0.4 - 2023.0.1.0 + 2023.0.1.3 + 3.1.0 3.5.5 1.18.30 0.11.5 @@ -99,12 +100,29 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - 2023.0.1.0 + ${spring-cloud-alibaba.version} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - 2023.0.1.0 + ${spring-cloud-alibaba.version} + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + + + com.alibaba.nacos + nacos-auth + ${nacos-client.version} + + + com.alibaba.nacos + nacos-encryption-plugin + ${nacos-client.version} diff --git a/tacit-admin/src/main/java/com/tacit/admin/config/SecurityConfig.java b/tacit-admin/src/main/java/com/tacit/admin/config/SecurityConfig.java index 0d43410..f72d6a2 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/config/SecurityConfig.java +++ b/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;