增加验证码新接口

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

@@ -49,7 +49,7 @@ public class UserController extends BaseController {
 
     @RequestMapping(value = UrlConstants.API + "userByEmail/{email:.+}", method = RequestMethod.GET)
     public UserDTO getUserByEmail(@PathVariable("email") String email) {
-        log.info("Email: "+email);
+        log.info("Email: " + email);
         UserDTO userByEmail = userLogic.getUserByEmail(email);
         return userByEmail;
     }
@@ -61,115 +61,118 @@ public class UserController extends BaseController {
 
 
     @RequestMapping(value = UrlConstants.API + "login", method = RequestMethod.POST)
-    public ResponseResult<UserDTO> checkLogin(@RequestBody UserDTO user, HttpServletRequest request, HttpServletResponse response){
+    public ResponseResult<UserDTO> checkLogin(@RequestBody UserDTO user, HttpServletRequest request, HttpServletResponse response) {
         String password = EncryptionUtil.encryptMD5(user.getPassword());
         user.setPassword(password);
         ResponseResult<UserDTO> result = userLogic.checkPWD(user);
         if (result.getStatus() == ResponseStatus.SUCCESS) {
             HttpSession session = request.getSession();
-            session.setAttribute("userId", ((UserDTO)result.getData()).getId()+"");
+            session.setAttribute("userId", ((UserDTO) result.getData()).getId() + "");
             // return "redirect:http://www.mooctest.net/api/test/login";
         }
         return result;
     }
 
     @RequestMapping(value = UrlConstants.API + "logout", method = RequestMethod.GET)
-    public ResponseResult<Object> logout(HttpServletRequest request){
+    public ResponseResult<Object> logout(HttpServletRequest request) {
         ResponseResult<Object> result = new ResponseResult<Object>();
         Object userId = request.getSession().getAttribute("userId");
-        if(userId!=null){
+        if (userId != null) {
             request.getSession().removeAttribute("userId");
             request.getSession().invalidate();
             result.init(ResponseStatus.SUCCESS, "用户成功退出", userId);
-            LOG.info("用户成功退出--userId--"+(String)userId);
-        } else{
+            LOG.info("用户成功退出--userId--" + (String) userId);
+        } else {
             result.init(ResponseStatus.FAILED, "用户未登录", null);
             LOG.info(result.getMsg());
         }
         return result;
     }
 
-    @RequestMapping(value = UrlConstants.API + "mobile/login", method =  RequestMethod.GET)
-    public ResponseResult<Object> mobileLogin(UserVO userVO, HttpServletRequest request){
+    @RequestMapping(value = UrlConstants.API + "mobile/login", method = RequestMethod.GET)
+    public ResponseResult<Object> mobileLogin(UserVO userVO, HttpServletRequest request) {
         return null;
     }
 
     @RequestMapping(value = UrlConstants.API + "verify/mail", method = RequestMethod.PUT)
-    public ResponseResult<String> sendVerifyEmail(UserDTO userDTO){
+    public ResponseResult<String> sendVerifyEmail(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(UserDTO userDTO) {
         return userLogic.sendMobileVerfication(userDTO);
     }
 
     /**
      * 非本项目的登录注册界面中的邮箱验证码获取，此时需要传值为json格式
+     *
      * @param userDTO
      * @return
      */
     @RequestMapping(value = UrlConstants.API + "verify/mail/new", method = RequestMethod.PUT)
-    public ResponseResult<String> sendVerifyEmailNew(@RequestBody UserDTO userDTO){
+    public ResponseResult<String> sendVerifyEmailNew(@RequestBody UserDTO userDTO) {
         return userLogic.sendVerifyEmail(userDTO);
     }
 
     /**
      * 非本项目的登录注册界面中的手机验证码获取，此时需要传值为json格式
+     *
      * @param userDTO
      * @return
      */
     @RequestMapping(value = UrlConstants.API + "verify/mobile/new", method = RequestMethod.PUT)
-    public ResponseResult<String> sendVerifyMobileMessageNew(@RequestBody UserDTO userDTO){
+    public ResponseResult<String> sendVerifyMobileMessageNew(@RequestBody UserDTO userDTO) {
         return userLogic.sendMobileVerfication(userDTO);
     }
 
     @RequestMapping(value = UrlConstants.API + "password/reset", method = RequestMethod.PUT)
-    public ResponseResult<UserVO> resetPassword(@RequestBody UserVO userVO){
+    public ResponseResult<UserVO> resetPassword(@RequestBody UserVO userVO) {
         return userLogic.resetPassword(userVO);
     }
 
     @RequestMapping(value = UrlConstants.API + "user/password", method = RequestMethod.PUT)
-    public ResponseResult<UserVO> updatePassword(@RequestBody UserVO userVO, HttpServletRequest request){
+    public ResponseResult<UserVO> updatePassword(@RequestBody UserVO userVO, HttpServletRequest request) {
         return userLogic.updateUserPassword(userVO, request);
     }
 
     @RequestMapping(value = UrlConstants.API + "user/password/new", method = RequestMethod.PUT)
-    public ResponseResult<UserVO> updatePasswordNew(@RequestBody UserVO userVO, HttpServletRequest request){
+    public ResponseResult<UserVO> updatePasswordNew(@RequestBody UserVO userVO, HttpServletRequest request) {
         return userLogic.updateUserPasswordNew(userVO, request);
     }
 
     @RequestMapping(value = UrlConstants.API + "user/email", method = RequestMethod.PUT)
-    public ResponseResult<UserVO> updateEmail(@RequestBody UserVO userVO, HttpServletRequest request){
+    public ResponseResult<UserVO> updateEmail(@RequestBody UserVO userVO, HttpServletRequest request) {
         ResponseResult<UserVO> responseResult = userLogic.updateUserEmail(userVO, request);
         return responseResult;
     }
 
     @RequestMapping(value = UrlConstants.API + "user/mobile", method = RequestMethod.PUT)
-    public ResponseResult<UserVO> updateMobile(@RequestBody UserVO userVO, HttpServletRequest request){
+    public ResponseResult<UserVO> updateMobile(@RequestBody UserVO userVO, HttpServletRequest request) {
         return userLogic.updateUserMobile(userVO, request);
     }
 
     /**
      * 验证旧手机号和验证码
+     *
      * @param userVO
      * @param request
      * @return
      */
     @RequestMapping(value = UrlConstants.API + "user/old/mobile", method = RequestMethod.PUT)
-    public ResponseResult<UserVO> verifyOldMobile(@RequestBody UserVO userVO, HttpServletRequest request){
+    public ResponseResult<UserVO> verifyOldMobile(@RequestBody UserVO userVO, HttpServletRequest request) {
         return userLogic.verifyOldMobile(userVO, request);
     }
 
     @RequestMapping(value = UrlConstants.API + "bankInfo", method = RequestMethod.POST)
-    public ModelAndView setBankInfo(BankAccountInfoVO infoVO, HttpServletRequest request){
+    public ModelAndView setBankInfo(BankAccountInfoVO infoVO, HttpServletRequest request) {
         ResponseResult<Object> result = userLogic.setBankInfo(infoVO, request);
-        if (result.getStatus()==ResponseStatus.SUCCESS){
+        if (result.getStatus() == ResponseStatus.SUCCESS) {
             // return new ModelAndView("redirect:"+(String) request.getSession().getAttribute("redirectURL"));
             userLogic.recordUserOperation(request, Long.parseLong((String) request.getSession().getAttribute("userId")), "Upload Bank Info", "user center");
-            return new ModelAndView("success_page").addObject("message","银行账户信息上传成功！");
+            return new ModelAndView("success_page").addObject("message", "银行账户信息上传成功！");
         }
         ModelAndView modelAndView = new ModelAndView("error_page");
         modelAndView.addObject("message", result.getMsg());
@@ -177,7 +180,7 @@ public class UserController extends BaseController {
     }
 
     @RequestMapping(value = UrlConstants.API + "operation_record", method = RequestMethod.POST)
-    public void recordUserOperation(@RequestBody OperationRecordVO recordVO){
+    public void recordUserOperation(@RequestBody OperationRecordVO recordVO) {
         userLogic.recordUserOperation(recordVO.toOperationRecord());
     }
 }

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

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

mooctest-user-server/src/main/resources/templates/register.html

@@ -101,9 +101,6 @@ function sendEmail(obj) {
         url:"/api/verify/mail",
         type:"PUT",
         data:data,
-        // data:JSON.stringify(data),
-        // contentType: 'application/json; charset=utf-8',
-        // dataType:"json",
         timeout: 3000,
         success:function (result) {
             console.log(result);