修改密码

src/main/java/com/edgec/browserbackend/auth/controller/UserController.java

 package com.edgec.browserbackend.auth.controller;
 
+import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.auth.domain.User;
 import com.edgec.browserbackend.auth.domain.UserPasswordReset;
 import com.edgec.browserbackend.auth.service.UserAuthService;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/auth")
@@ -95,8 +98,18 @@ public class UserController {
     }
 
     @RequestMapping(path = "/changepass", method = RequestMethod.PUT)
-    public void changePassword(@Valid @RequestBody UserPasswordReset userPasswordReset) {
-        userAuthService.changePassword(userPasswordReset);
+    public ResultDto changePassword(@Valid @RequestBody UserPasswordReset userPasswordReset) {
+        ResultDto resultDto = new ResultDto();
+        try {
+            resultDto.setData(userAuthService.changePassword(userPasswordReset));
+            resultDto.setStatus(0);
+        } catch (Exception e) {
+            resultDto.setStatus(-1);
+            Map<String, Object> statusInfo = new HashMap<>();
+            statusInfo.put("message", e.getMessage());
+            resultDto.setStatusInfo(statusInfo);
+        }
+        return resultDto;
     }
 
 

src/main/java/com/edgec/browserbackend/auth/service/Impl/UserAuthServiceImpl.java

@@ -121,7 +121,7 @@ public class UserAuthServiceImpl implements UserAuthService {
     }
 
     @Override
-    public void changePassword(UserPasswordReset userPasswordReset) {
+    public boolean changePassword(UserPasswordReset userPasswordReset) {
         User existing = repository.findById(userPasswordReset.getUsername()).orElseThrow(() -> new ClientRequestException(AuthErrorCode.NAMENOTEXIST, "user does not exist: " + userPasswordReset.getUsername()));
         if (!StringUtils.isEmpty(userPasswordReset.getPassword())) {
             //change password with old password
@@ -131,7 +131,7 @@ public class UserAuthServiceImpl implements UserAuthService {
                 String newhash = encoder.encode(userPasswordReset.getNewPassword());
                 existing.setPassword(newhash);
                 repository.save(existing);
-                return;
+                return true;
             } else {
                 throw new ClientRequestException(AuthErrorCode.AUTHENTICATION_ERROR, "Wrong password used.");
             }
@@ -143,12 +143,12 @@ public class UserAuthServiceImpl implements UserAuthService {
                 existing.setPassword(newhash);
                 existing.setVerificationCode("");
                 repository.save(existing);
-                return;
+                return true;
             } else {
                 throw new ClientRequestException(AuthErrorCode.AUTHENTICATION_ERROR, "Wrong verification code.");
             }
         }
-        throw new ClientRequestException(AuthErrorCode.OTHERS, "Wrong password change request.");
+        return false;
     }
 
 

src/main/java/com/edgec/browserbackend/auth/service/UserAuthService.java

@@ -16,7 +16,7 @@ public interface UserAuthService {
 
     void unlock(User user, String unlock);
 
-    void changePassword(UserPasswordReset userPasswordReset);
+    boolean changePassword(UserPasswordReset userPasswordReset);
 
     void deleteUser(String name);
 

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -210,6 +210,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
                 else
                     ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                ipResource.setPort(port);
             } else if (ipResourceRequestDto.getVendor().equals("own")) {
                 if (ipResourceRequestDto.getAddr() == null || ipResourceRequestDto.getAddr().size() == 0)
                     throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
@@ -220,6 +221,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipResource.setStatus(4);
                 ipResource.setUsername(ipResourceRequestDto.getUsername());
                 ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli());
+                ipResource.setPort(ipResourceRequestDto.getPorts());
             } else {
                 ipResource.setAddr("");
                 ipResource.setIpType(IpType.VENDOR);
@@ -238,9 +240,10 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipResource.setStatus(6);
                 ipResource.setValidTime(Instant.now().plusSeconds(3600*24*30).toEpochMilli());
                 ipResource.setUsername(USERNAME);
+                ipResource.setPort(port);
             }
             ipResource.setPurchasedTime(Instant.now().toEpochMilli());
-            ipResource.setPort(port);
+
             if (account.getParent() != null)
                 ipResource.setUserParent(account.getParent());
             ipResource.setRegion(ipResourceRequestDto.getRegion());