From 7fa84cbdd2a4621fab799ce52d5bb883fd1069f5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 27 十二月 2019 11:58:05 +0800
Subject: [PATCH] 加入代码
---
AppFrontService/src/main/java/com/java110/app/smo/wxLogin/impl/WxLoginSMOImpl.java | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 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 e98afb9..e760e32 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.app.properties.WechatAuthProperties;
+import com.java110.app.smo.AppAbstractComponentSMO;
import com.java110.app.smo.wxLogin.IWxLoginSMO;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
@@ -27,7 +28,7 @@
* wx鐧诲綍
*/
@Service("wxLoginSMOImpl")
-public class WxLoginSMOImpl extends AbstractComponentSMO implements IWxLoginSMO {
+public class WxLoginSMOImpl extends AppAbstractComponentSMO implements IWxLoginSMO {
private final static Logger logger = LoggerFactory.getLogger(WxLoginSMOImpl.class);
@@ -89,36 +90,17 @@
JSONObject userResult = JSONObject.parseObject(responseEntity.getBody());
int total = userResult.getIntValue("total");
+ JSONObject userInfo = paramIn.getJSONObject("userInfo");
+
if (total == 0) {
//淇濆瓨鐢ㄦ埛淇℃伅
JSONObject registerInfo = new JSONObject();
-
- JSONObject userInfo = paramIn.getJSONObject("userInfo");
//璁剧疆榛樿瀵嗙爜
String userDefaultPassword = MappingCache.getValue(MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
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"));
@@ -149,12 +131,18 @@
userResult = JSONObject.parseObject(responseEntity.getBody());
}
+ JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
+ userInfo.putAll(realUserInfo);
+ userInfo.put("password", "");
+
try {
Map userMap = new HashMap();
- userMap.put(CommonConstant.LOGIN_USER_ID, userResult.getString("userId"));
+ 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.putAll(userResult);
+ paramOut.put("result", 0);
+ paramOut.put("userInfo", userInfo);
paramOut.put("token", token);
paramOut.put("sessionKey", sessionKey);
pd.setToken(token);
--
Gitblit v1.8.0