Merge remote-tracking branch 'origin/dev' into dev

alexyang
2 parents c9be7ef5 64d35ddf
Showing 4 changed files with 27 additions and 4 deletions
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerUserServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/filter/LoginTimeoutInterceptor.java
mobsite-getway-web/src/main/resources/spring-web.xml
@@ -68,7 +68,7 @@ public class UserServiceImpl implements UserService {
     public LoginResp buyerlogin(LoginReq req) {
         BuyerInfoOutput userInfo =  passportRPC.buyerLogin(req);
-        //缓存用户信息
+        //缓存用户登录信息
         cacheUserInfo(userInfo.getId(),req.getDeviceId());
         if (Validator.isEmpty(req.getRegisterNo())){
@@ -246,6 +246,18 @@ public class UserServiceImpl implements UserService {
         LogoutResp resp = new LogoutResp();
+        //解除登录缓存信息
+        //userId
+        String cookieUserIdKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(req.getUserId()));
+        //设备id
+        String cookieDeviceIdKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_BUYER+String.valueOf(req.getUserId()));
+        try {
+            redisUtil.deleteByKey(cookieUserIdKey);
+            redisUtil.deleteByKey(cookieDeviceIdKey);
+        }
+        catch(Exception e) {
+            logger.error("买家退出登录异常:清除登录缓存信息失败",e);
+        }
         // 解除绑定极光ID
         if(!Validator.isEmpty(req.getRegisterNo())){
@@ -256,6 +256,19 @@ public class SellerUserServiceImpl implements SellerUserService {
 		LogoutResp resp = new LogoutResp();
+		//解除登录缓存信息
+		//userId
+		String cookieUserIdKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(req.getUserId()));
+		//设备id
+		String cookieDeviceIdKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_SELLER+String.valueOf(req.getUserId()));
+		try {
+			redisUtil.deleteByKey(cookieUserIdKey);
+			redisUtil.deleteByKey(cookieDeviceIdKey);
+		}
+		catch(Exception e) {
+			logger.error("卖家退出登录异常:清除登录缓存信息失败",e);
+		}
+
 		// 解除绑定极光ID
 		if(!Validator.isEmpty(req.getRegisterNo())){
@@ -135,7 +135,7 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
         	String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, regularStr+String.valueOf(userId));
             //缓存cookievalue
             redisUtil.setStringByExpire(loginKey, String.valueOf(userId), loginExpireTime);
-            
+
         } catch (Exception e) {
             log.error("用户登录延迟失败[userId={},msg={}]", userId, e);
         }
@@ -84,7 +84,6 @@
             <mvc:exclude-mapping path="/mobsiteApp/user/buyerRegister"/>
             <mvc:exclude-mapping path="/mobsiteApp/user/buyerRegisters"/>
 			<mvc:exclude-mapping path="/mobsiteApp/user/loginForAuth"/>
-            <mvc:exclude-mapping path="/mobsiteApp/user/logout"/>
             <mvc:exclude-mapping path="/mobsiteApp/user/modifyPwd"/>
 			<mvc:exclude-mapping path="/mobsiteApp/goods/getProductByCid"/>
@@ -111,7 +110,6 @@
 			<mvc:exclude-mapping path="/mobsiteApp/seller/user/checkMobile"/>
 			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sellerRegister"/>
 			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sellerRegisters"/>
-			<mvc:exclude-mapping path="/mobsiteApp/seller/user/logout"/>
 			<mvc:exclude-mapping path="/mobsiteApp/seller/user/modifyPwd"/>
              <bean class="com.diligrp.mobsite.getway.web.filter.LoginTimeoutInterceptor"/>
         </mvc:interceptor>