Przeglądaj źródła

解决登录重新刷入 缓存问题

java110 5 lat temu
rodzic
commit
bf38bb7c19

+ 49 - 19
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.HttpStatus;
 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 @@ public class LoginServiceSMOImpl extends BaseComponentSMO implements ILoginServi
 
     /**
      * 登录处理
+     *
      * @param pd 页面请求对象
      * @return
      */
@@ -41,26 +44,52 @@ public class LoginServiceSMOImpl extends BaseComponentSMO implements ILoginServi
 
         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"));
+    }
+
     /**
      * 生成验证码
      * 参考地址:https://www.cnblogs.com/happyfans/p/4486010.html
+     *
      * @param pd 页面请求对象
      * @return
      */
@@ -73,10 +102,10 @@ public class LoginServiceSMOImpl extends BaseComponentSMO implements ILoginServi
             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,20 +113,21 @@ public class LoginServiceSMOImpl extends BaseComponentSMO implements ILoginServi
 
     /**
      * 校验验证码
+     *
      * @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);
         }

+ 4 - 4
service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java

@@ -344,11 +344,11 @@ public class PrivilegeServiceSMOImpl extends BaseComponentSMO implements IPrivil
         String storeId = storeInfoObj.getString("storeId");
         privilegeInfoObj.put("storeId", storeId);
 
-//        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
-//                ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
 
-        ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
-        ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
+//        ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
+//        ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
         if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
             return privilegeGroup;
         }