From 690a3e8ea2fff645889531a06e05649c886a2cd1 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Mon, 20 Apr 2020 13:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/login/controller/LoginController.java  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/login/controller/LoginController.java b/src/main/java/com/kiisoo/ic/login/controller/LoginController.java
index abb3bff..29f296d 100644
--- a/src/main/java/com/kiisoo/ic/login/controller/LoginController.java
+++ b/src/main/java/com/kiisoo/ic/login/controller/LoginController.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.kiisoo.ic.constants.Constants.ERROR_ACCOUNT_NOT_BIND;
+import static com.kiisoo.ic.constants.Constants.ERROR_SYSTEM;
 
 /**
  * @Description: 用户登入
@@ -73,7 +74,7 @@ public class LoginController extends BaseController {
      * @param password 密码
      * @return 成功/失败
      */
-    @RequestMapping(value = "/mini/login",method = RequestMethod.GET)
+    @RequestMapping(value = "/mini/login",method = RequestMethod.POST)
     @ResponseBody
     public Map<String, Object> miniLoginAccount(@RequestParam(value = "login")String login,
                                             @RequestParam(value = "password")String password,
@@ -100,26 +101,22 @@ public class LoginController extends BaseController {
     @ResponseBody
     public Map<String, Object> qyMiniAutoLogin(@RequestParam(value = "code")String code){
         try{
-            Map<String, Object> resultMap = new HashMap<>();
             Map<String, String> accountInfo = loginService.qyMiniAutoLogin(code);
+            LoginBean loginBean = null;
             if (accountInfo!=null){
                 if (StringUtils.isNotBlank(accountInfo.get("login")) && StringUtils.isNotBlank(accountInfo.get("password"))){
-                    LoginBean loginBean = loginService.miniLogin(accountInfo.get("login"), accountInfo.get("password"), false);
-                    resultMap.put("code", loginBean.getLoginInfo().get("code"));
-                    resultMap.put("results", loginBean);
+                    loginBean = loginService.miniLogin(accountInfo.get("login"), accountInfo.get("password"), false);
                 }else{
                     if (StringUtils.isNotBlank(accountInfo.get("cpUserId"))){
                         String cpUserId = accountInfo.get("cpUserId");
-                        resultMap.put("code", ERROR_ACCOUNT_NOT_BIND);
-                        LoginBean loginBean = new LoginBean(ERROR_ACCOUNT_NOT_BIND);
+                        loginBean = new LoginBean(ERROR_ACCOUNT_NOT_BIND);
                         loginBean.setLogin(cpUserId);
-                        resultMap.put("results", loginBean);
                     }
                 }
+            }else{
+                loginBean = new LoginBean(ERROR_SYSTEM);
             }
-
-            resultMap.put("success", Boolean.TRUE);
-            return resultMap;
+            return data(loginBean);
         }catch (Exception e){
             log.error("登录失败", e);
             return fail();
@@ -133,7 +130,7 @@ public class LoginController extends BaseController {
      * @param qywxUserId 企业微信账号
      * @return 成功/失败
      */
-    @RequestMapping(value = "/login/bind",method = RequestMethod.GET)
+    @RequestMapping(value = "/login/bind",method = RequestMethod.POST)
     @ResponseBody
     public Map<String, Object> loginAccountBind(@RequestParam("login")String login, @RequestParam("password")String password,
                                                 @RequestParam("cpUserId")String qywxUserId){