From 75fd8a02c058f6a51e3c5ea36d997c157c070793 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 24 十一月 2021 16:02:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pamapi/src/main/java/com/pollex/pam/web/rest/AccountResource.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AccountResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AccountResource.java
index fbb1b24..a4a87ae 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AccountResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AccountResource.java
@@ -3,10 +3,15 @@
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.SecurityUtils;
+import com.pollex.pam.security.jwt.JWTFilter;
+import com.pollex.pam.service.CustomerAuthService;
+import com.pollex.pam.service.CustomerService;
import com.pollex.pam.service.MailService;
import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.AdminUserDTO;
+import com.pollex.pam.service.dto.CustomerRegisterDTO;
import com.pollex.pam.service.dto.PasswordChangeDTO;
+import com.pollex.pam.web.rest.UserJWTController.JWTToken;
import com.pollex.pam.web.rest.errors.*;
import com.pollex.pam.web.rest.vm.KeyAndPasswordVM;
import com.pollex.pam.web.rest.vm.ManagedUserVM;
@@ -16,7 +21,10 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
/**
@@ -40,6 +48,9 @@
private final UserService userService;
private final MailService mailService;
+
+ @Autowired
+ CustomerService customerService;
public AccountResource(UserRepository userRepository, UserService userService, MailService mailService) {
this.userRepository = userRepository;
@@ -47,23 +58,25 @@
this.mailService = mailService;
}
- /**
- * {@code POST /register} : register the user.
- *
- * @param managedUserVM the managed user View Model.
- * @throws InvalidPasswordException {@code 400 (Bad Request)} if the password is incorrect.
- * @throws EmailAlreadyUsedException {@code 400 (Bad Request)} if the email is already used.
- * @throws LoginAlreadyUsedException {@code 400 (Bad Request)} if the login is already used.
- */
- @PostMapping("/register")
- @ResponseStatus(HttpStatus.CREATED)
- public void registerAccount(@Valid @RequestBody ManagedUserVM managedUserVM) {
- if (isPasswordLengthInvalid(managedUserVM.getPassword())) {
- throw new InvalidPasswordException();
- }
- User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
- mailService.sendActivationEmail(user);
- }
+// /**
+// * {@code POST /register} : register the user.
+// *
+// * @param managedUserVM the managed user View Model.
+// * @throws InvalidPasswordException {@code 400 (Bad Request)} if the password is incorrect.
+// * @throws EmailAlreadyUsedException {@code 400 (Bad Request)} if the email is already used.
+// * @throws LoginAlreadyUsedException {@code 400 (Bad Request)} if the login is already used.
+// */
+// @PostMapping("/register")
+// @ResponseStatus(HttpStatus.CREATED)
+// public void registerAccount(@Valid @RequestBody ManagedUserVM managedUserVM) {
+// if (isPasswordLengthInvalid(managedUserVM.getPassword())) {
+// throw new InvalidPasswordException();
+// }
+// User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
+// mailService.sendActivationEmail(user);
+// }
+
+
/**
* {@code GET /activate} : activate the registered user.
--
Gitblit v1.8.0