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/smo/wxLogin/impl/WxLoginSMOImpl.java |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/AppFrontService/src/main/java/com/java110/app/smo/wxLogin/impl/WxLoginSMOImpl.java b/AppFrontService/src/main/java/com/java110/app/smo/wxLogin/impl/WxLoginSMOImpl.java
index cd4675e..1117bc2 100644
--- a/AppFrontService/src/main/java/com/java110/app/smo/wxLogin/impl/WxLoginSMOImpl.java
+++ b/AppFrontService/src/main/java/com/java110/app/smo/wxLogin/impl/WxLoginSMOImpl.java
@@ -74,7 +74,7 @@
         JSONObject responseObj = JSONObject.parseObject(response);
 
         if (responseObj.containsKey("errcode") && !"0".equals(responseObj.getString("errcode"))) {
-            throw new IllegalArgumentException("寰俊楠岃瘉澶辫触锛屽彲鑳芥槸code澶辨晥");
+            throw new IllegalArgumentException("寰俊楠岃瘉澶辫触锛屽彲鑳芥槸code澶辨晥" + responseObj);
         }
 
         String openId = responseObj.getString("openid");
@@ -101,25 +101,6 @@
             Assert.hasLength(userDefaultPassword, "鏄犲皠琛ㄤ腑鏈缃憳宸ラ粯璁ゅ瘑鐮侊紝璇锋鏌�" + MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
             userDefaultPassword = AuthenticationFactory.passwdMd5(userDefaultPassword);
 
-            /**
-             * {
-             *      "userId": "-1",
-             *      "name": "寮犱笁",
-             *      "email": "928255095@qq.com",
-             *      "address": "闈掓捣鐪佽タ瀹佸競鍩庝腑鍖�129鍙�",
-             *      "password": "ERCBHDUYFJDNDHDJDNDJDHDUDHDJDDKDK",
-             *      "locationCd": "001",
-             *      "age": 19,
-             *      "sex": "0",
-             *      "tel": "17797173943",
-             *      "level_cd": "1",
-             *      "businessUserAttr": [{
-             *      "attrId":"-1",
-             *      "specCd":"1001",
-             *      "value":"01"
-             *      }]
-             *      }
-             */
             registerInfo.put("userId", "-1");
             registerInfo.put("email", "");
             registerInfo.put("address", userInfo.getString("country") + userInfo.getString("province") + userInfo.getString("city"));
@@ -151,12 +132,13 @@
         }
 
         JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
-        userInfo.put("password", "");
         userInfo.putAll(realUserInfo);
+        userInfo.put("password", "");
 
         try {
             Map userMap = new HashMap();
             userMap.put(CommonConstant.LOGIN_USER_ID, userInfo.getString("userId"));
+            userMap.put(CommonConstant.LOGIN_USER_NAME, userInfo.getString("name"));
             String token = AuthenticationFactory.createAndSaveToken(userMap);
             JSONObject paramOut = new JSONObject();
             paramOut.put("result", 0);

--
Gitblit v1.8.0