重置密码接口细节调整

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

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -108,7 +107,7 @@ public class ResetPasswordController extends BaseController {
      * @param type 修改密码类型（update or reset）
      * @return
      */
-    @RequestMapping(value = "/CheckType/{type}", method = RequestMethod.GET)
+    @RequestMapping(value = "/checkType/{type}", method = RequestMethod.GET)
     public ModelMap getCheckType(@PathVariable String type) {
         // 找到用户信息
         User user = null;
@@ -198,7 +197,7 @@ public class ResetPasswordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/check/mobile", method = RequestMethod.POST)
-    public ModelMap checkByMobile(String code, String token) {
+    public ModelMap checkByMobile(String code, @RequestParam String token) {
         // 从session中获取用户信息
         User user = (User) request.getSession().getAttribute("user");
         if (StringUtils.isEmpty(user)) {
@@ -262,7 +261,7 @@ public class ResetPasswordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/check/question", method = RequestMethod.GET)
-    public ModelMap checkByQuestion(String token) {
+    public ModelMap checkByQuestion(@RequestParam String token) {
         // 校验token
         if (StringUtils.isEmpty(token)) {
             return error("请刷新重试");
@@ -284,7 +283,7 @@ public class ResetPasswordController extends BaseController {
         existToken = new Token(user, EXPIRES);
         ModelMap data = new ModelMap();
         data.put("token",existToken.getId());
-        data.put("question", user.getQuestions());
+        data.put("questions", user.getQuestions());
         return success(data);
     }
 
@@ -294,7 +293,7 @@ public class ResetPasswordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/check/question", method = RequestMethod.POST)
-    public ModelMap checkByQuestion(String token, List<Map<String, Object>> answers) {
+    public ModelMap checkByQuestion(@RequestParam String token, List<Map<String, Object>> answers) {
         // 校验token是否正确
         if (StringUtils.isEmpty(token)) {
             return error("请刷新重试");
@@ -333,7 +332,7 @@ public class ResetPasswordController extends BaseController {
      * @return
      */
     @RequestMapping(method = RequestMethod.POST)
-    public ModelMap resetPassword(String password, String token) {
+    public ModelMap resetPassword(String password, @RequestParam String token) {
         // 校验token是否正确
         if (StringUtils.isEmpty(token)) {
             return error("请刷新重试");