From 70c5bf42b83d12c7991c3a83c13527571e8a1dd1 Mon Sep 17 00:00:00 2001 From: panxuejie <15855548138@163.com> Date: Tue, 6 Jan 2026 13:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 +++++++++++++ .../java/com/tacit/admin/config/SecurityConfig.java | 7 +++++++ .../com/tacit/admin/controller/AuthController.java | 3 ++- .../com/tacit/admin/controller/UserController.java | 4 ++-- .../tacit/admin/service/impl/UserServiceImpl.java | 8 ++++---- .../com/tacit/app/controller/AuthController.java | 6 +++--- .../com/tacit/app/controller/UserController.java | 4 ++-- .../com/tacit/app/service/impl/UserServiceImpl.java | 8 ++++---- tacit-gateway/pom.xml | 6 ------ .../com/tacit/gateway/config/SecurityConfig.java | 1 + 10 files changed, 38 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index e8c7d92..ab9b081 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.0 3.14.0 5.9.3 + 4.0.4 @@ -70,6 +71,12 @@ ${mybatis-plus.version} + + org.springframework.cloud + spring-cloud-starter-loadbalancer + ${loadbalancer.version} + + io.jsonwebtoken @@ -225,6 +232,12 @@ org.apache.commons commons-lang3 + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + ${loadbalancer.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 a3ccec6..0d43410 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 @@ -10,6 +10,8 @@ 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; @@ -59,4 +61,9 @@ public class SecurityConfig { } }; } + + @Bean + public PasswordEncoder passwordEncoder() { + return new AesPasswordEncoder(); + } } diff --git a/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java b/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java index ff6e913..cb80600 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java +++ b/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java @@ -7,6 +7,7 @@ import com.tacit.admin.service.UserService; import com.tacit.common.entity.ResponseResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.*; @Tag(name = "认证管理", description = "登录注册相关接口") public class AuthController { - @Autowired + @Resource private UserService userService; @Operation(summary = "用户登录", description = "用户登录获取JWT令牌") diff --git a/tacit-admin/src/main/java/com/tacit/admin/controller/UserController.java b/tacit-admin/src/main/java/com/tacit/admin/controller/UserController.java index c6ff8c1..1580293 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/controller/UserController.java +++ b/tacit-admin/src/main/java/com/tacit/admin/controller/UserController.java @@ -5,7 +5,7 @@ import com.tacit.admin.service.UserService; import com.tacit.common.entity.ResponseResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -16,7 +16,7 @@ import java.util.List; @Tag(name = "用户管理", description = "用户管理相关接口") public class UserController { - @Autowired + @Resource private UserService userService; @Operation(summary = "获取所有用户", description = "获取系统中所有用户列表") diff --git a/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java b/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java index bce336b..faeb9fb 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java +++ b/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java @@ -9,7 +9,7 @@ import com.tacit.admin.entity.dto.RegisterRequest; import com.tacit.admin.mapper.UserMapper; import com.tacit.admin.service.UserService; import com.tacit.common.utils.JwtUtils; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.annotation.Resource; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -20,10 +20,10 @@ import java.util.Map; @Service public class UserServiceImpl extends ServiceImpl implements UserService { - @Autowired + @Resource private UserMapper userMapper; - @Autowired + @Resource private PasswordEncoder passwordEncoder; @Override @@ -76,7 +76,7 @@ public class UserServiceImpl extends ServiceImpl implements Us if (user == null) { throw new RuntimeException("用户名或密码错误"); } - + System.out.println(passwordEncoder.encode("admin123")); // 验证密码 if (!passwordEncoder.matches(loginRequest.getPassword(), user.getPassword())) { throw new RuntimeException("用户名或密码错误"); diff --git a/tacit-app-api/src/main/java/com/tacit/app/controller/AuthController.java b/tacit-app-api/src/main/java/com/tacit/app/controller/AuthController.java index 7a24f29..bec6dcd 100644 --- a/tacit-app-api/src/main/java/com/tacit/app/controller/AuthController.java +++ b/tacit-app-api/src/main/java/com/tacit/app/controller/AuthController.java @@ -8,7 +8,7 @@ import com.tacit.common.entity.ResponseResult; import com.tacit.common.feign.AdminFeignClient; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RestController; @Tag(name = "认证管理", description = "用户认证相关接口") public class AuthController { - @Autowired + @Resource private UserService userService; - @Autowired + @Resource private AdminFeignClient adminFeignClient; @Operation(summary = "用户登录", description = "用户登录接口") diff --git a/tacit-app-api/src/main/java/com/tacit/app/controller/UserController.java b/tacit-app-api/src/main/java/com/tacit/app/controller/UserController.java index 532564b..270660c 100644 --- a/tacit-app-api/src/main/java/com/tacit/app/controller/UserController.java +++ b/tacit-app-api/src/main/java/com/tacit/app/controller/UserController.java @@ -5,7 +5,7 @@ import com.tacit.app.service.UserService; import com.tacit.common.entity.ResponseResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.annotation.Resource; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @Tag(name = "用户管理", description = "用户相关接口") public class UserController { - @Autowired + @Resource private UserService userService; @Operation(summary = "获取用户信息", description = "根据用户ID获取用户信息") diff --git a/tacit-app-api/src/main/java/com/tacit/app/service/impl/UserServiceImpl.java b/tacit-app-api/src/main/java/com/tacit/app/service/impl/UserServiceImpl.java index f3b7e9d..4723129 100644 --- a/tacit-app-api/src/main/java/com/tacit/app/service/impl/UserServiceImpl.java +++ b/tacit-app-api/src/main/java/com/tacit/app/service/impl/UserServiceImpl.java @@ -10,8 +10,8 @@ import com.tacit.app.service.UserService; import com.tacit.common.constant.CommonConstant; import com.tacit.common.exception.BusinessException; import com.tacit.common.utils.JwtUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import jakarta.annotation.Resource; + import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -21,10 +21,10 @@ import java.util.Map; @Service public class UserServiceImpl extends ServiceImpl implements UserService { - @Autowired + @Resource private UserMapper userMapper; - @Autowired + @Resource private PasswordEncoder passwordEncoder; @Override diff --git a/tacit-gateway/pom.xml b/tacit-gateway/pom.xml index 0903283..11a7631 100644 --- a/tacit-gateway/pom.xml +++ b/tacit-gateway/pom.xml @@ -63,12 +63,6 @@ spring-cloud-starter-alibaba-nacos-discovery - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - diff --git a/tacit-gateway/src/main/java/com/tacit/gateway/config/SecurityConfig.java b/tacit-gateway/src/main/java/com/tacit/gateway/config/SecurityConfig.java index 0a41566..bc16547 100644 --- a/tacit-gateway/src/main/java/com/tacit/gateway/config/SecurityConfig.java +++ b/tacit-gateway/src/main/java/com/tacit/gateway/config/SecurityConfig.java @@ -29,3 +29,4 @@ public class SecurityConfig { } +