From 219655836dce9581cc668c77950204ab283d8d45 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 23 二月 2020 16:24:05 +0800
Subject: [PATCH] 优化登录功能

---
 AppFrontService/src/main/java/com/java110/app/controller/PropertyAppLoginController.java |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/AppFrontService/src/main/java/com/java110/app/controller/PropertyAppLoginController.java b/AppFrontService/src/main/java/com/java110/app/controller/PropertyAppLoginController.java
index 077e02d..db7669c 100644
--- a/AppFrontService/src/main/java/com/java110/app/controller/PropertyAppLoginController.java
+++ b/AppFrontService/src/main/java/com/java110/app/controller/PropertyAppLoginController.java
@@ -6,6 +6,7 @@
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
+import com.java110.utils.constant.CommonConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,22 +39,15 @@
      */
     @RequestMapping(path = "/loginProperty", method = RequestMethod.POST)
     public ResponseEntity<String> loginProperty(@RequestBody String postInfo, HttpServletRequest request) {
-        ResponseEntity<String> responseEntity = null;
-        JSONObject postObj = JSONObject.parseObject(postInfo);
-        String code = JSONObject.parseObject(postInfo).getString("code");
-        JSONObject userInfo = postObj.getJSONObject("userInfo");
-        if (code == null || userInfo == null) {
-            logger.error("code is null");
-            responseEntity = new ResponseEntity<>("code is null", HttpStatus.BAD_REQUEST);
-            return responseEntity;
-        }
-
         /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
-        IPageData pd = PageData.newInstance().builder("", "","", postInfo,
+        IPageData pd = PageData.newInstance().builder("", "", "", postInfo,
                 "", "", "", "",
                 request.getHeader("APP_ID"));
-
-        return propertyAppLoginSMOImpl.doLogin(pd);
+        ResponseEntity<String> responseEntity = propertyAppLoginSMOImpl.doLogin(pd);
+        JSONObject outParam = JSONObject.parseObject(responseEntity.getBody());
+        pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+        pd.setToken(outParam.getString("token"));
+        return responseEntity;
     }
 
 }

--
Gitblit v1.8.0