From 6f3c7d86d27dadcc5c2621120023ed65c6ccea3e Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期五, 22 三月 2019 18:00:41 +0800
Subject: [PATCH] 组件重新构建
---
WebService/src/main/java/com/java110/web/smo/impl/LoginServiceSMOImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/LoginServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/LoginServiceSMOImpl.java
index 439f4c4..c7e8a45 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/LoginServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/LoginServiceSMOImpl.java
@@ -2,23 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.cache.CommonCache;
-import com.java110.common.constant.CommonConstant;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.util.Assert;
-import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.ValidateCodeFactory;
+import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.ILoginServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import java.awt.*;
-import java.awt.image.BufferedImage;
import java.util.Random;
/**
@@ -27,7 +26,7 @@
*/
@Service("loginServiceSMOImpl")
-public class LoginServiceSMOImpl extends BaseServiceSMO implements ILoginServiceSMO {
+public class LoginServiceSMOImpl extends BaseComponentSMO implements ILoginServiceSMO {
private final static Logger logger = LoggerFactory.getLogger(LoginServiceSMOImpl.class);
@@ -52,6 +51,13 @@
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(),ServiceConstant.SERVICE_API_URL+"/api/user.service.login",HttpMethod.POST);
if(responseEntity.getStatusCode() == HttpStatus.OK){
@@ -93,11 +99,11 @@
logger.debug("鏍￠獙楠岃瘉鐮佸弬鏁�:{}",pd.toString());
ResponseEntity<String> verifyResult = null;
- Assert.jsonObjectHaveKey(pd.getReqData(),"code","璇锋眰鎶ユ枃涓湭鍖呭惈 code鑺傜偣"+pd.toString());
+ Assert.jsonObjectHaveKey(pd.getReqData(),"validateCode","璇锋眰鎶ユ枃涓湭鍖呭惈 validateCode鑺傜偣"+pd.toString());
String code = CommonCache.getValue(pd.getSessionId()+"_validateCode");
- if(JSONObject.parseObject(pd.getReqData()).getString("code").equals(code)){
+ if(JSONObject.parseObject(pd.getReqData()).getString("validateCode").equals(code)){
verifyResult = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
}else{
verifyResult = new ResponseEntity<>("楠岃瘉鐮侀敊璇�", HttpStatus.INTERNAL_SERVER_ERROR);
--
Gitblit v1.8.0