update: 修改邮箱

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/UserController.java

@@ -95,14 +95,14 @@ public class UserController extends BaseController {
     }
 
     @RequestMapping(value = UrlConstants.API + "verify/mail", method = RequestMethod.PUT)
-    public ResponseResult<String> sendVerifyEmail(UserDTO userDTO){
+    public ResponseResult<String> sendVerifyEmail(@RequestBody UserDTO userDTO){
         ResponseResult<String> result = new ResponseResult<>();
         result = userLogic.sendVerifyEmail(userDTO);
         return result;
     }
 
     @RequestMapping(value = UrlConstants.API + "verify/mobile", method = RequestMethod.PUT)
-    public ResponseResult<String> sendVerifyMobileMessage(UserDTO userDTO){
+    public ResponseResult<String> sendVerifyMobileMessage(@RequestBody UserDTO userDTO){
         return userLogic.sendMobileVerfication(userDTO);
     }
 
@@ -118,7 +118,8 @@ public class UserController extends BaseController {
 
     @RequestMapping(value = UrlConstants.API + "user/email", method = RequestMethod.PUT)
     public ResponseResult<UserVO> updateEmail(@RequestBody UserVO userVO, HttpServletRequest request){
-        return userLogic.updateUserEmail(userVO, request);
+        ResponseResult<UserVO> responseResult = userLogic.updateUserEmail(userVO, request);
+        return responseResult;
     }
 
     @RequestMapping(value = UrlConstants.API + "user/mobile", method = RequestMethod.PUT)

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/UserLogic.java

@@ -8,6 +8,7 @@ import cn.iselab.mooctest.user.web.data.BankAccountInfoVO;
 import cn.iselab.mooctest.user.web.data.UserVO;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.List;
 
 /**

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/UserLogicImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -328,6 +329,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
 //            LOG.error(result.getMsg());
 //            return result;
 //        }
+        System.out.println(userDTO.getEmail());
         if (!EmailValidator.getInstance().isValid(userDTO.getEmail())){
             result.init(ResponseStatus.FAILED, "邮箱输入非法", receiver);
             LOG.error(result.getMsg());
@@ -585,14 +587,14 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Override
     public ResponseResult<UserVO> updateUserEmail(UserVO userVO, HttpServletRequest request) {
         ResponseResult<UserVO> result = new ResponseResult<>();
-        Long userId = Long.parseLong((String) request.getSession().getAttribute("userId"));
+        Long userId = userVO.getId();
+        User user = userService.findById(userId);
         try {
-            if (userId == null)
+            if(userId == null || !user.getPassword().equals(userVO.getPassword()))
                 throw new Exception("用户未登录");
             if (!verifyCodeService.validateVerifyCode("email", userVO.getEmail(), userVO.getVerifyCode()))
                 throw new Exception("验证码或邮箱填写错误");
-            User user = userService.findById(userId);
-            if (!userVO.getEmail().equals(user.getEmail()) && userService.findByEmail(userVO.getEmail()) != null)
+            if (userVO.getEmail().equals(user.getEmail()) || userService.findByEmail(userVO.getEmail()) != null)
                 throw new Exception("该邮箱已被注册");
             user.setEmail(userVO.getEmail());
             userVO = userVOWrapper.wrap(userService.update(user));

mooctest-user-server/src/main/resources/bootstrap.yaml

@@ -1,4 +1,4 @@
-spring.profiles.active: crowd
+spring.profiles.active: localhost
 spring:
   application:
     name: mooctest-user-server