From a0cf32bacfc5437e6057b059b5583703895e4360 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 23 二月 2020 00:52:27 +0800
Subject: [PATCH] 优化物业登录功能
---
AppFrontService/src/main/java/com/java110/app/smo/propertyLogin/impl/wxLogin/impl/PropertyAppLoginSMOImpl.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/AppFrontService/src/main/java/com/java110/app/smo/propertyLogin/impl/wxLogin/impl/PropertyAppLoginSMOImpl.java b/AppFrontService/src/main/java/com/java110/app/smo/propertyLogin/impl/wxLogin/impl/PropertyAppLoginSMOImpl.java
index eb39bcb..7c6fdf9 100644
--- a/AppFrontService/src/main/java/com/java110/app/smo/propertyLogin/impl/wxLogin/impl/PropertyAppLoginSMOImpl.java
+++ b/AppFrontService/src/main/java/com/java110/app/smo/propertyLogin/impl/wxLogin/impl/PropertyAppLoginSMOImpl.java
@@ -47,7 +47,8 @@
//super.validatePageInfo(pd);
- Assert.hasKeyAndValue(paramIn, "code", "璇锋眰鎶ユ枃涓湭鍖呭惈code淇℃伅");
+ Assert.hasKeyAndValue(paramIn, "username", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛鍚�");
+ Assert.hasKeyAndValue(paramIn, "password", "璇锋眰鎶ユ枃涓湭鍖呭惈瀵嗙爜");
//super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_ORG);
}
@@ -57,18 +58,11 @@
logger.debug("doLogin鍏ュ弬锛�" + paramIn.toJSONString());
ResponseEntity<String> responseEntity;
- Assert.jsonObjectHaveKey(pd.getReqData(),"username","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈username淇℃伅");
JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
- //璋冪敤 楠岃瘉鐮佺粍浠堕獙璇佺爜鏄惁姝ｇ‘
- responseEntity = this.invokeComponent("validate-code","validate",pd);
- if(responseEntity.getStatusCode() != HttpStatus.OK){
- return responseEntity;
- }
-
- loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("passwd")));
- responseEntity = this.callCenterService(restTemplate,pd,loginInfo.toJSONString(), "http://api.java110.com:8008/api/user.service.login",HttpMethod.POST);
- if(responseEntity.getStatusCode() != HttpStatus.OK){
+ loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("password")));
+ responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), "http://api.java110.com:8008/api/user.service.login", HttpMethod.POST);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
@@ -77,12 +71,12 @@
//鏍规嵁鐢ㄦ埛鏌ヨ鍟嗘埛淇℃伅
String userId = userInfo.getString("userId");
- pd = PageData.newInstance().builder(userId, "","", pd.getReqData(),
+ pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
"", "", "", "",
pd.getAppId());
responseEntity = super.getStoreInfo(pd, restTemplate);
- if(responseEntity.getStatusCode() != HttpStatus.OK){
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
@@ -90,15 +84,16 @@
Assert.jsonObjectHaveKey(storeInfo, "storeId", "鏍规嵁鍛樺伐鏈煡鍒板晢鎴蜂俊鎭�");
Assert.jsonObjectHaveKey(storeInfo, "storeTypeCd", "鏍规嵁鍛樺伐鏈煡鍒板晢鎴风被鍨嬩俊鎭�");
- userInfo.put("storeId",storeInfo.getString("storeId"));
- userInfo.put("storeTypeCd",storeInfo.getString("storeTypeCd"));
+ userInfo.put("storeId", storeInfo.getString("storeId"));
+ userInfo.put("storeName", storeInfo.getString("name"));
+ userInfo.put("storeTypeCd", storeInfo.getString("storeTypeCd"));
JSONObject paramOut = new JSONObject();
paramOut.put("result", 0);
paramOut.put("userInfo", userInfo);
paramOut.put("token", userInfo.getString("token"));
pd.setToken(JSONObject.parseObject(responseEntity.getBody()).getString("token"));
- return responseEntity;
+ return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
}
public RestTemplate getRestTemplate() {
--
Gitblit v1.8.0