From 9e29441646434d9f54a2c3e855a724633885d8a4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 13 八月 2019 19:43:49 +0800
Subject: [PATCH] 缓存开发测试完成
---
WebService/src/main/java/com/java110/web/smo/impl/LoginServiceSMOImpl.java | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 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 07ad536..a9037e6 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
@@ -1,23 +1,22 @@
package com.java110.web.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.CommonConstant;
+import com.java110.common.cache.CommonCache;
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;
/**
* 鐧诲綍淇℃伅瀹炵幇绫�
@@ -25,15 +24,9 @@
*/
@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);
-
- private static char[] chs = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".toCharArray();
- private static final int NUMBER_OF_CHS = 4;
- private static final int IMG_WIDTH = 65;
- private static final int IMG_HEIGHT = 25;
- private static Random r = new Random();
@Autowired
private RestTemplate restTemplate;
@@ -50,6 +43,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){
@@ -66,29 +66,47 @@
*/
@Override
public ResponseEntity<String> generateValidateCode(IPageData pd) {
+ int w = 200, h = 80;
+ String verifyCode = ValidateCodeFactory.generateVerifyCode(4);
+ ResponseEntity<String> verifyCodeImage = null;
+ try {
+ verifyCodeImage = new ResponseEntity<>(ValidateCodeFactory.outputImage(200, 80, verifyCode), HttpStatus.OK);
+ //灏嗛獙璇佺爜瀛樺叆Redis涓�
+ CommonCache.setValue(pd.getSessionId()+"_validateCode",verifyCode.toLowerCase(),CommonCache.defaultExpireTime);
-
- BufferedImage image = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_INT_RGB); // 瀹炰緥鍖朆ufferedImage
- Graphics g = image.getGraphics();
- Color c = new Color(200, 200, 255); // 楠岃瘉鐮佸浘鐗囩殑鑳屾櫙棰滆壊
- g.setColor(c);
- g.fillRect(0, 0, IMG_WIDTH, IMG_HEIGHT); // 鍥剧墖鐨勮竟妗�
-
- StringBuffer sb = new StringBuffer(); // 鐢ㄤ簬淇濆瓨楠岃瘉鐮佸瓧绗︿覆
- int index; // 鏁扮粍鐨勪笅鏍�
- for (int i = 0; i < NUMBER_OF_CHS; i++) {
- index = r.nextInt(chs.length); // 闅忔満涓�涓笅鏍�
- g.setColor(new Color(r.nextInt(88), r.nextInt(210), r.nextInt(150))); // 闅忔満涓�涓鑹�
- g.drawString(chs[index] + "", 15 * i + 3, 18); // 鐢诲嚭瀛楃
- sb.append(chs[index]); // 楠岃瘉鐮佸瓧绗︿覆
- }
-
- /*request.getSession().setAttribute("piccode", sb.toString()); // 灏嗛獙璇佺爜瀛楃涓蹭繚瀛樺埌session涓�
- ImageIO.write(image, "jpg", response.getOutputStream());*/
- return null;
+ }catch (Exception e){
+ logger.error("鐢熸垚楠岃瘉鐮佸け璐ワ紝",e);
+ verifyCodeImage = new ResponseEntity<>("", HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ return verifyCodeImage;
}
+ /**
+ * 鏍￠獙楠岃瘉鐮�
+ * @param pd 椤甸潰璇锋眰瀵硅薄
+ * @return
+ */
+ public ResponseEntity<String> validate(IPageData pd){
+
+ logger.debug("鏍￠獙楠岃瘉鐮佸弬鏁�:{}",pd.toString());
+ ResponseEntity<String> verifyResult = null;
+ Assert.jsonObjectHaveKey(pd.getReqData(),"validateCode","璇锋眰鎶ユ枃涓湭鍖呭惈 validateCode鑺傜偣"+pd.toString());
+
+ String code = CommonCache.getValue(pd.getSessionId()+"_validateCode");
+
+ if(JSONObject.parseObject(pd.getReqData()).getString("validateCode").toLowerCase().equals(code)){
+ verifyResult = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
+ }else{
+ pd.setToken("");
+ verifyResult = new ResponseEntity<>("楠岃瘉鐮侀敊璇�", HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+
+ return verifyResult;
+ }
+
+
public RestTemplate getRestTemplate() {
return restTemplate;
}
--
Gitblit v1.8.0