Merge remote-tracking branch 'origin/dev' into dev

sso-server/src/main/java/com/uas/sso/controller/ChangeAdminController.java

@@ -1,5 +1,6 @@
 package com.uas.sso.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.sso.core.Const;
 import com.uas.sso.core.Status;
 import com.uas.sso.entity.*;
@@ -11,10 +12,7 @@ import com.uas.sso.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -70,6 +68,13 @@ public class ChangeAdminController extends BaseController {
         data.put("mobile", Status.AUTHENTICATED.getCode() == user.getMobileValidCode() ? user.getMobile() : null);
         data.put("email", Status.AUTHENTICATED.getCode() == user.getEmailValidCode() ? user.getEmail() : null);
         data.put("questions", !CollectionUtils.isEmpty(user.getQuestions()) ? user.getQuestions() : null);
+        if (!CollectionUtils.isEmpty(user.getQuestions())) {
+            Map<Long, String> userAnswer = new HashMap<>(user.getQuestions().size());
+            for (UserQuestion question : user.getQuestions()) {
+                userAnswer.put(question.getId(), question.getAnswer());
+            }
+            request.getSession().setAttribute("answers", userAnswer);
+        }
         request.getSession().setAttribute("user", user);
         return success(data);
     }
@@ -135,7 +140,7 @@ public class ChangeAdminController extends BaseController {
         data.put("vipName", userAccount.getVipName());
         data.put("type", "更换管理员");
         // TODO 邮件认证地址
-        data.put("url", getFrontUrl() + "/sso/resetPwd/check/question?token="+existToken.getId());
+        data.put("url", getFrontUrl() + "/change/changeManagerSecondStep?token="+existToken.getId());
 
         // 发送邮件
         String email = userAccount.getEmail();
@@ -186,13 +191,14 @@ public class ChangeAdminController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/check/question", method = RequestMethod.POST)
-    public ModelMap checkByQuestion(List<Map<String, Object>> answers) {
+    public ModelMap checkByQuestion(String answers) {
         UserAccount userAccount = SystemSession.getUserAccount();
+        List<Map> jsonAnswer = JSON.parseArray(answers, Map.class);
 
         // 校验密保答案
         Map<Long, String> userAnswer = (Map<Long, String>) request.getSession().getAttribute("answers");
-        for (Map<String, Object> answer : answers) {
-            if (!answer.get("answer").equals(userAnswer.get(answer.get("id")))){
+        for (Map<String, Object> answer : jsonAnswer) {
+            if (!answer.get("answer").equals(userAnswer.get(Long.valueOf(answer.get("id").toString())))){
                 return error("答案错误");
             }
         }

sso-server/src/main/java/com/uas/sso/controller/UpdateUserController.java

@@ -164,7 +164,28 @@ public class UpdateUserController extends BaseController {
     }
 
     /**
-     * 重置密码第二步，认证密保
+     * 修改用户信息，获取密保
+     *
+     * @author wangmh
+     * @date 2018/1/15 16:19
+     * @return
+     */
+    @RequestMapping(value = "/check/question", method = RequestMethod.GET)
+    public ModelMap checkByQuestion() {
+        UserAccount userAccount = SystemSession.getUserAccount();
+
+        // 查询密保
+        User user = userService.findOne(userAccount.getUserUU());
+        List<UserQuestion> questions = user.getQuestions();
+
+        // 将问题返回用户，答案放入session
+        ModelMap data = new ModelMap();
+        data.put("questions", questions);
+        return success(data);
+    }
+
+    /**
+     * 修改用户信息，认证密保
      * @param answers 密保答案
      * @return
      */

sso-server/src/main/java/com/uas/sso/controller/ValidController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
@@ -92,7 +93,7 @@ public class ValidController extends BaseController {
      * @return
      * @throws Exception
      */
-    @RequestMapping(value = "/user/identity/submit")
+    @RequestMapping(value = "/user/identity/submit", method = RequestMethod.POST)
     public ModelMap submitUserIdentityInfo(String realName, String idCard) throws Exception {
         // 获取认证的企业和申请者
         UserAccount loginUser = SystemSession.getUserAccount();

sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -47,7 +47,7 @@ public class User implements Serializable {
     /**
      * 手机号
      */
-    @Column(name = "mobile", unique = true, nullable = false, length = 11)
+    @Column(name = "mobile", unique = true, nullable = false, length = 30)
     private String mobile;
 
     /**