From 83b8db7d50d0fd8e7f4f4ac1070c28b827190e56 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 十二月 2020 10:32:19 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/impl/LoginServiceSMOImpl.java | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/impl/LoginServiceSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/impl/LoginServiceSMOImpl.java
index 2f00fcd..0bb6f0f 100644
--- a/service-front/src/main/java/com/java110/front/smo/impl/LoginServiceSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/impl/LoginServiceSMOImpl.java
@@ -1,14 +1,15 @@
package com.java110.front.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.cache.CommonCache;
-import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.Assert;
+import com.java110.core.cache.Java110RedisConfig;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.ValidateCodeFactory;
-import com.java110.core.component.BaseComponentSMO;
import com.java110.front.smo.ILoginServiceSMO;
+import com.java110.utils.cache.CommonCache;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import org.thymeleaf.util.StringUtils;
/**
* 鐧诲綍淇℃伅瀹炵幇绫�
@@ -33,6 +35,7 @@
/**
* 鐧诲綍澶勭悊
+ *
* @param pd 椤甸潰璇锋眰瀵硅薄
* @return
*/
@@ -41,26 +44,52 @@
ResponseEntity<String> responseEntity = null;
- Assert.jsonObjectHaveKey(pd.getReqData(),"username","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈username淇℃伅");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "username", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈username淇℃伅");
JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
//璋冪敤 楠岃瘉鐮佺粍浠堕獙璇佺爜鏄惁姝ｇ‘
- responseEntity = this.invokeComponent("validate-code","validate",pd);
- if(responseEntity.getStatusCode() != HttpStatus.OK){
+ 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){
- pd.setToken(JSONObject.parseObject(responseEntity.getBody()).getString("token"));
+ responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), ServiceConstant.SERVICE_API_URL + "/api/user.service.login", HttpMethod.POST);
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
+ pd.setToken(userInfo.getString("token"));
+
+ //娓呯悊缂撳瓨
+
+ clearUserCache(userInfo);
}
return responseEntity;
}
/**
+ * 娓呯悊鐢ㄦ埛缂撳瓨
+ *
+ * @param userInfo
+ */
+ private void clearUserCache(JSONObject userInfo) {
+ //鍛樺伐鍟嗘埛缂撳瓨 getStoreInfo
+ String storeId = "";
+
+ String storeInfo = CommonCache.getValue("getStoreInfo" + Java110RedisConfig.GET_STORE_INFO_EXPIRE_TIME_KEY + "::" + userInfo.getString("userId"));
+ if(!StringUtils.isEmpty(storeInfo)){
+ CommonCache.removeValue("getStoreInfo" + Java110RedisConfig.GET_STORE_INFO_EXPIRE_TIME_KEY + "::" + userInfo.getString("userId"));
+ JSONObject storeObj = JSONObject.parseObject(storeInfo);
+ storeId = storeObj.getJSONObject("msg").getString("storeId");
+ CommonCache.removeValue("getStoreEnterCommunitys" + Java110RedisConfig.GET_STORE_ENTER_COMMUNITYS_EXPIRE_TIME_KEY + "::" + storeId);
+ }
+ //鍛樺伐鏉冮檺
+ CommonCache.removeValue("getUserPrivileges" + Java110RedisConfig.DEFAULT_EXPIRE_TIME_KEY + "::" + userInfo.getString("userId"));
+ }
+
+ /**
* 鐢熸垚楠岃瘉鐮�
* 鍙傝�冨湴鍧�锛歨ttps://www.cnblogs.com/happyfans/p/4486010.html
+ *
* @param pd 椤甸潰璇锋眰瀵硅薄
* @return
*/
@@ -73,10 +102,10 @@
verifyCodeImage = new ResponseEntity<>(ValidateCodeFactory.outputImage(200, 80, verifyCode), HttpStatus.OK);
//灏嗛獙璇佺爜瀛樺叆Redis涓�
- CommonCache.setValue(pd.getSessionId()+"_validateCode",verifyCode.toLowerCase(),CommonCache.defaultExpireTime);
+ CommonCache.setValue(pd.getSessionId() + "_validateCode", verifyCode.toLowerCase(), CommonCache.defaultExpireTime);
- }catch (Exception e){
- logger.error("鐢熸垚楠岃瘉鐮佸け璐ワ紝",e);
+ } catch (Exception e) {
+ logger.error("鐢熸垚楠岃瘉鐮佸け璐ワ紝", e);
verifyCodeImage = new ResponseEntity<>("", HttpStatus.INTERNAL_SERVER_ERROR);
}
return verifyCodeImage;
@@ -84,22 +113,23 @@
/**
* 鏍￠獙楠岃瘉鐮�
+ *
* @param pd 椤甸潰璇锋眰瀵硅薄
* @return
*/
- public ResponseEntity<String> validate(IPageData pd){
+ public ResponseEntity<String> validate(IPageData pd) {
- logger.debug("鏍￠獙楠岃瘉鐮佸弬鏁�:{}",pd.toString());
+ logger.debug("鏍￠獙楠岃瘉鐮佸弬鏁�:{}", pd.toString());
ResponseEntity<String> verifyResult = null;
- Assert.jsonObjectHaveKey(pd.getReqData(),"validateCode","璇锋眰鎶ユ枃涓湭鍖呭惈 validateCode鑺傜偣"+pd.toString());
+ Assert.jsonObjectHaveKey(pd.getReqData(), "validateCode", "璇锋眰鎶ユ枃涓湭鍖呭惈 validateCode鑺傜偣" + pd.toString());
- String code = CommonCache.getValue(pd.getSessionId()+"_validateCode");
+ String code = CommonCache.getValue(pd.getSessionId() + "_validateCode");
- if(JSONObject.parseObject(pd.getReqData()).getString("validateCode").toLowerCase().equals(code)){
+ if (JSONObject.parseObject(pd.getReqData()).getString("validateCode").toLowerCase().equals(code)) {
verifyResult = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
- }else{
+ } else {
pd.setToken("");
- verifyResult = new ResponseEntity<>("楠岃瘉鐮侀敊璇�", HttpStatus.INTERNAL_SERVER_ERROR);
+ verifyResult = new ResponseEntity<>("楠岃瘉鐮侀敊璇垨宸插け鏁�", HttpStatus.INTERNAL_SERVER_ERROR);
}
--
Gitblit v1.8.0