From d61408eeb76dfb8b643fda9817e35084e26fad22 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 六月 2024 14:14:40 +0800
Subject: [PATCH] 依赖循环bug
---
src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java | 3 ---
src/main/java/com/ycl/jxkg/controller/RegisterController.java | 4 ++++
src/main/java/com/ycl/jxkg/config/spring/exception/ExceptionHandle.java | 5 ++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/config/spring/exception/ExceptionHandle.java b/src/main/java/com/ycl/jxkg/config/spring/exception/ExceptionHandle.java
index cc0c2c8..3a96ded 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/exception/ExceptionHandle.java
+++ b/src/main/java/com/ycl/jxkg/config/spring/exception/ExceptionHandle.java
@@ -30,7 +30,9 @@
public class ExceptionHandle {
private final static Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
- /** 鍏徃椤圭洰鐨勫寘缁撴瀯锛岀敤浜庣缉鐭敊璇棩蹇楃殑闀垮害 */
+ /**
+ * 鍏徃椤圭洰鐨勫寘缁撴瀯锛岀敤浜庣缉鐭敊璇棩蹇楃殑闀垮害
+ */
private final static String COMPANY_PACKAGE = "com.ycl.jxkg.";
/**
@@ -98,6 +100,7 @@
/**
* 鎵撳嵃寮傚父鍑虹幇浣嶇疆
+ *
* @param e
*/
private void printExceptionLocation(Throwable e, HttpServletRequest request, String errMsg) {
diff --git a/src/main/java/com/ycl/jxkg/controller/RegisterController.java b/src/main/java/com/ycl/jxkg/controller/RegisterController.java
index dafb2d3..5e32121 100644
--- a/src/main/java/com/ycl/jxkg/controller/RegisterController.java
+++ b/src/main/java/com/ycl/jxkg/controller/RegisterController.java
@@ -2,6 +2,7 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.form.RegisterForm;
+import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -22,15 +23,18 @@
public class RegisterController {
private final UserService userService;
+ private final AuthenticationService authenticationService;
@PostMapping("/teacher")
public Result teacherRegister(@RequestBody @Validated RegisterForm form) {
+ form.setPassword(authenticationService.pwdEncode(form.getPassword()));
userService.teacherRegister(form);
return Result.ok("娉ㄥ唽鎴愬姛");
}
@PostMapping("/student")
public Result studentRegister(@RequestBody @Validated RegisterForm form) {
+ form.setPassword(authenticationService.pwdEncode(form.getPassword()));
userService.studentRegister(form);
return Result.ok("娉ㄥ唽鎴愬姛");
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
index 23f0be5..65cc9c8 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
@@ -31,7 +31,6 @@
private final UserMapper userMapper;
private final ApplicationEventPublisher eventPublisher;
- private final AuthenticationService authenticationService;
public List<User> getUsers() {
@@ -146,7 +145,6 @@
User teacher = new User();
BeanUtils.copyProperties(form, teacher);
teacher.setRole(RoleEnum.ADMIN.getCode());
- teacher.setPassword(authenticationService.pwdEncode(form.getPassword()));
teacher.setUserUuid(UUID.randomUUID().toString());
teacher.setLastActiveTime(new Date());
teacher.setStatus(UserStatusEnum.Enable.getCode());
@@ -163,7 +161,6 @@
User student = new User();
BeanUtils.copyProperties(form, student);
student.setRole(RoleEnum.ADMIN.getCode());
- student.setPassword(authenticationService.pwdEncode(form.getPassword()));
student.setUserUuid(UUID.randomUUID().toString());
student.setLastActiveTime(new Date());
student.setStatus(UserStatusEnum.Enable.getCode());
--
Gitblit v1.8.0