卖家登录功能开发

weiliwhereareyou@163.com
1 parent 7cd7c324
Showing 10 changed files with 200 additions and 117 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/Constant.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/RedisKey.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Token.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/LoginResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/register/SellerRegisterReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/GetShopInfoResp.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PassportRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.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
@@ -121,6 +121,8 @@ public class Constant {
     /**
      * 用户
      */
+    public static final long USER_ROLE_BUYER = 10L;//买家
+    public static final long USER_ROLE_SELLER = 20L;//卖家
     public static final int USER_TYPE_PERSONAL = 1;
     public static final int USER_TYPE_COMPANY = 2;
     public static final int USER_AUTH_RESULT_NOTAUTH = 100;//未认证
@@ -15,20 +15,20 @@ public final class RedisKey {
 	public static final int USER_SEND_VERICODE_EXPIRE_TIME = 10*60;//发送验证码失效时间，10分钟
-    public static final String PNR_GETWAY = "PNR_GETWAY";
+    public static final String ZDAPP_GETWAY = "ZDAPP_GETWAY";
     //登录信息
-    public static final String USER_LOGININFO = PNR_GETWAY+":USER:LOGININFO";
-    public static final String USER_DEVICEID = PNR_GETWAY+":USER:DEVICEID";
-    public static final String USER_REGISTERNO = PNR_GETWAY+":USER:REGISTERNO";
+    public static final String USER_LOGININFO = ZDAPP_GETWAY+":USER:LOGININFO";
+    public static final String USER_DEVICEID = ZDAPP_GETWAY+":USER:DEVICEID";
+    public static final String USER_REGISTERNO = ZDAPP_GETWAY+":USER:REGISTERNO";
     //门卫登录信息
-    public static final String GUARD_LOGININFO = PNR_GETWAY+":GUARD:LOGININFO";
+    public static final String GUARD_LOGININFO = ZDAPP_GETWAY+":GUARD:LOGININFO";
     //门卫登录session
-    public static final String GUARD_SESSSION = PNR_GETWAY+":GUARD:SESSSION";
+    public static final String GUARD_SESSSION = ZDAPP_GETWAY+":GUARD:SESSSION";
-    public static final String USER = PNR_GETWAY+":USER";
+    public static final String USER = ZDAPP_GETWAY+":USER";
     public static final String USER_AUTH_CODE_REGISTER = USER+":AUTH_CODE_REGISTER";//注册验证码
     public static final String USER_AUTH_CODE_MODIFY_PWD_AND_PHONE = USER+":USER_AUTH_CODE_MODIFY_PWD_AND_PHONE";//修改密码
@@ -39,21 +39,21 @@ public final class RedisKey {
     public static final String USER_AUTH_CODE = USER+":AUTH_CODE";
     //延迟退出 暂时未调用
-    public static final String LOGOUT = PNR_GETWAY+":LOGOUT";
+    public static final String LOGOUT = ZDAPP_GETWAY+":LOGOUT";
     //订单cookieValue
-    public static final String COOKIE_VALUE = PNR_GETWAY+":COOKIE_VALUE";
+    public static final String COOKIE_VALUE = ZDAPP_GETWAY+":COOKIE_VALUE";
     //根据城市ID获取提货点
     public static final int GETPICKUPLISTBYCITYID_TIME = 10*60;
     //专题标题
     public static final int TOPIC_EXPIRE_TIME = 10;
-    public static final String TOPIC_BAR = PNR_GETWAY+":TOPIC:BAR";
-    public static final String TOPIC_CATEGORY = PNR_GETWAY+":TOPIC:CATEGORY";//专题标题
+    public static final String TOPIC_BAR = ZDAPP_GETWAY+":TOPIC:BAR";
+    public static final String TOPIC_CATEGORY = ZDAPP_GETWAY+":TOPIC:CATEGORY";//专题标题
     //商品缓存
     public static final int PRODUCT_EXPIRE_TIME = 3*60;
-    public static final String PRODUCT = PNR_GETWAY+":PRODUCT";
+    public static final String PRODUCT = ZDAPP_GETWAY+":PRODUCT";
     public static final String PRODUCT_PRODUCTDETAIL = PRODUCT+":PRODUCT_DETAIL";
     public static final String PRODUCT_CATEGORY = PRODUCT+":PRODUCT_CATEGORY";
@@ -61,7 +61,7 @@ public final class RedisKey {
      * 订单缓存
      */
     public static final int ORDER_EXPIRE_TIME = 10;
-    public static final String ORDER = PNR_GETWAY + ":ORDER";
+    public static final String ORDER = ZDAPP_GETWAY + ":ORDER";
     public static final String ORDER_SUM_INFO = ORDER + ":SUM_INFO";
     public static final String ORDER_AGREEMENT = ORDER + ":AGREEMENT";
@@ -69,7 +69,7 @@ public final class RedisKey {
      * 配置缓存，config
      */
     public static final int CONFIG_EXPIRE_TIME = 3*60*60;
-    public static final String CONFIG = PNR_GETWAY+":CONFIG";
+    public static final String CONFIG = ZDAPP_GETWAY+":CONFIG";
     public static final String CONFIG_PROVINCE_CITY_ADDRESS = CONFIG+":PROVINCE_CITY_ADDRESS";
     public static final String CONFIG_SYSTEM_CONFIG = CONFIG + ":SYSTEM_CONFIG";
     public static final String CONFIG_SMS_CONTENT = CONFIG + ":SMS_CONTENT";
@@ -94,7 +94,7 @@ public final class RedisKey {
      * 店铺信息
      */
     public static final int SHOP_EXPIRE_TIME = 3*60;
-    public static final String SHOP = PNR_GETWAY+":SHOP";
+    public static final String SHOP = ZDAPP_GETWAY+":SHOP";
     public static final String SHOP_INFO = SHOP+"INFO";
 	public static final String SHOP_SEND_ADDRESS = SHOP+"SEND_ADDRESS";
 package com.diligrp.mobsite.getway.domain.protocol;
 import com.diligrp.mobsite.getway.domain.common.enums.DeviceTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -17,6 +18,7 @@ public class Token {
     /**
      * 用户ID
      */
+	@ApiModelProperty("用户ID")
     private Long userId;
     /**
      * 当前终端所在市场ID
@@ -25,18 +27,22 @@ public class Token {
     /**
      * 终端与服务端协定的密文
      */
+	@ApiModelProperty("终端与服务端协定的密文")
     private String secretkey;
     /**
      * 设备ID
      */
+	@ApiModelProperty("设备ID")
     private String deviceId;
     /**
      * app版本编号
      */
+
     private String version;
     /**
      * 设备类型
      */
+	@ApiModelProperty("设备ID:1-安卓,2-ios")
     private Integer deviceType = DeviceTypeEnum.ANDROID_MOBILE.getType();
     /**
      * 手机系统版本
@@ -46,12 +52,28 @@ public class Token {
 	/**
 	 * 经度
 	 */
+	@ApiModelProperty("经度")
 	private Double longitude;
 	/**
 	 * 纬度
 	 */
+	@ApiModelProperty("纬度")
 	private Double latitude;
+	/**
+	 * 用户角色
+	 */
+	@ApiModelProperty("用户角色:10-买家，20-卖家")
+	private Integer userRole;
+
+
+	public Integer getUserRole() {
+		return userRole;
+	}
+
+	public void setUserRole(Integer userRole) {
+		this.userRole = userRole;
+	}
 	public Long getUserId() {
         return userId;
@@ -69,42 +69,27 @@ public class LoginResp extends BaseResp {
      */
     @ApiModelProperty(value = "手机号码")
     private String mobile;
-    ///**
-    // * 邮箱地址
-    // */
-    //@ApiModelProperty(value = "邮箱")
-    //private String email;
-    ///**
-    // * 1:个人用户, 2:企业用户
-    // */
-    //@ApiModelProperty(value = "用户类型：个人用户,2:企业用户")
-    //private Integer userType;
-    ///**
-    // * 1 登入  -1 登出 （出场验货专用）
-    // */
-    //private Integer accountState;
-    ///**
-    // * 真实姓名
-    // */
-    //@ApiModelProperty(value = "真实姓名")
-    //private String realName;
-    /**
-     * 登录之后，passport返回
-     * 用于支付鉴权
-     */
-    @ApiModelProperty(value = "token")
-    private String token;
+
+
     /**
      * 头像图片
      */
     @ApiModelProperty(value = "头像")
     private String headImg;
-    /**
-     * 用户信息是否完善:1-完善  0-不完善
-     */
-    @ApiModelProperty(value = "用户信息是否完善:1-完善  0-不完善")
-    private Integer infoCompleteFlag;
+
+    ///**
+    // * 登录之后，passport返回
+    // * 用于支付鉴权
+    // */
+    //@ApiModelProperty(value = "token")
+    //private String token;
+
+    ///**
+    // * 用户信息是否完善:1-完善  0-不完善
+    // */
+    //@ApiModelProperty(value = "用户信息是否完善:1-完善  0-不完善")
+    //private Integer infoCompleteFlag;
     /**
      * get value of LoginResp.accountId
      * @return the accountId
@@ -167,30 +152,15 @@ public class LoginResp extends BaseResp {
-     public String getToken() {
-        return token;
-    }
-
-    
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-
     public String getHeadImg() {
         return headImg;
     }
-    
+
     public void setHeadImg(String headImg) {
         this.headImg = headImg;
     }
-    public Integer getInfoCompleteFlag() {
-        return infoCompleteFlag;
-    }
-    public void setInfoCompleteFlag(Integer infoCompleteFlag) {
-        this.infoCompleteFlag = infoCompleteFlag;
-    }
-}
+
+   }
@@ -15,13 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value = "请求参数")
 public class SellerRegisterReq extends BaseReq {
-	public static final int USER_TYPE_BUSINESS = 1;//市场商户,企业单位,个体经营,个人
-	
-	public static final int USER_TYPE_COMPANY = 2;
-    public static final int USER_TYPE_PERSONMANAGE = 3;
-
-    public static final int USER_TYPE_PERSON = 4;
     public static final int APPTYPE_SHEQU = 1;
@@ -48,7 +42,7 @@ public class SellerRegisterReq extends BaseReq {
     /**
      * 手机验证码
      */
-    @ApiModelProperty(value = "app类型（1:社区店版,2:连锁店 ,默认传1）")
+    @ApiModelProperty(value = "app类型（1:社区店版,2:连锁店 ,默认1）")
     private Integer appType = APPTYPE_SHEQU;
@@ -10,6 +10,8 @@ import java.util.List;
  * Created by xxxzzz on 2016/12/27.
  */
 public class GetShopInfoResp extends BaseResp {
+    @ApiModelProperty(value = "店铺id")
+    private Long shopId;
     @ApiModelProperty(value = "城市code")
     private Long cityCode;
@@ -51,6 +53,13 @@ public class GetShopInfoResp extends BaseResp {
     private List<String> deliveryTime;
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
     public Long getCityCode() {
         return cityCode;
 package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
@@ -24,5 +26,6 @@ public interface PassportRPC extends BaseService {
     UserRegisterResp register(UserRegisterReq req);
 	String modifyPwd(Map<String, String> params);
-    
+
+    SellerRegisterResp sellerRegister(SellerRegisterReq req);
 }
 package com.diligrp.mobsite.getway.rpc.impl;
 import com.alibaba.fastjson.JSONObject;
+import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
@@ -60,7 +62,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         Map<String,String> params = new HashMap<String, String>();
         params.put("userName", req.getAccountName());
         params.put("password", req.getPassword());
-        params.put("src", "1n4j");
+        params.put("src", "zadeapp");
         BaseOutput<String> output = null;
         try {
             output = super.httpPost("/api/login/login.html", params, null,passportSign);
@@ -88,40 +90,25 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             throw new ServiceException(ResultCode.BUSINESS_FAILED,msg);
         }
-        resp.setToken(jsonBody.getString("token"));
+        //resp.setToken(jsonBody.getString("token"));
         JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
         resp.setAccountId(jsonUser.getLong("accountId"));
         resp.setMobile(jsonUser.getString("mobile"));
         resp.setAccountName(jsonUser.getString("accountName"));
         resp.setMsg(msg);
         resp.setHeadImg(jsonUser.getString("face"));
-        if (Validator.isNull(jsonUser.getString("city"))){
-            resp.setInfoCompleteFlag(LoginResp.USER_INFOCOMPLETEFLAG_NO);
-        }else {
-            resp.setInfoCompleteFlag(LoginResp.USER_INFOCOMPLETEFLAG_YES);
-        }
+        resp.setShopId(jsonUser.getLong("shopId"));
-        //if (Constant.USER_STATE_LOCKED ==  jsonUser.getInteger("accountState")) {
-        	//resp.setMsg(ErrorMessage.USER_STATE_LOCKED);
-        	//resp.setCode(PASSPORT_LOGIN_CODE_LOCKED);
-		//}
-        
-        //if (Validator.isNull(resp.getAccountState())
-        //        || resp.getAccountState()!= LoginResp.ACCOUNT_STATE_NORMAL) {
-        //    throw new ServiceException(ResultCode.BUSINESS_FAILED,resp.getMsg());
-        //}
-        
-        //登录redisKey=userId-deviceId
-        //String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, resp.getAccountId()+Constant.COMMON_DASH+req.getDeviceId());
-        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(resp.getAccountId()));
+        //缓存userId
+        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(resp.getAccountId()));
         redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getAccountId()), loginExpireTime);
-        // 去掉登录设备排斥验证
-        //if (!Validator.isNull(req.getDeviceId())) {
-        //    String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, String.valueOf(resp.getAccountId()));
-        //    redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
-        //}
+        //缓存设备id,userId作为key
+        if (!Validator.isNull(req.getDeviceId())) {
+            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SELLER+String.valueOf(resp.getAccountId()));
+            redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
+        }
         return resp;
     }
@@ -175,4 +162,34 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         return output.getData();
     }
+    @Override
+    public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
+        Map<String,String> params = new HashMap<String, String>();
+        params.put("mobile", req.getMobile());
+        params.put("password", req.getPassword());
+        //BaseOutput<String> output = null;
+        //try {
+        //    output = super.httpPost("/api/register/buyerRegister.html", params,null, passportSign);
+        //
+        //} catch (Exception e) {
+        //    log.error("调用passport注册接口失败",e);
+        //    throw new ServiceException();
+        //}
+        //
+        SellerRegisterResp resp = new SellerRegisterResp();
+        //JSONObject jsonBody = JSONObject.parseObject(output.getData());
+        //int code = jsonBody.getIntValue("code");
+        ////成功
+        //if(code == ResultCode.SUCCESS){
+        //    resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
+        //}else{
+        //    resp.setResultFlag(UserRegisterResp.RESULT_FLAG_FAILED);
+        //}
+        //resp.setMsg(jsonBody.getString("msg"));
+        //
+        //log.info("注册用户信息:msg={}"+jsonBody.getString("msg"));
+
+        return resp;
+    }
+
 }
@@ -67,7 +67,11 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public SellerLoginResp login(SellerLoginReq req) throws RuntimeException {
-		return null;
+		SellerLoginResp resp =  passportRPC.login(req);
+
+		//判断卖家是否创建店铺
+
+		return resp;
 	}
 	@Override
@@ -188,9 +192,73 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
-		return null;
+		SellerRegisterResp resp = new SellerRegisterResp();
+
+		//手机号码和账号验证、验证码
+		if (!checkRegisterInfo( req)) {
+		   return resp;
+		}
+
+		resp = passportRPC.sellerRegister(req);
+
+		return resp;
 	}
+	/**
+	 * 检测注册信息是否正确
+	 * 1.电话号码
+	 * 2.账号，会员名
+	 * 3.验证码
+	 * @createTime 2014年10月31日 下午2:37:16
+	 * @author weili
+	 */
+	private boolean checkRegisterInfo(  SellerRegisterReq req){
+		if(!sellerRPC.checkMobile(req.getMobile())){
+			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
+		}
+		//验证万能验证码
+		String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
+		if (req.getVeriCode().equals(passkey)) {
+			return true;
+		}
+
+		checkVeriCode(req.getVeriCode(), req.getMobile(),SendVeriCodeReq.MSG_TYPE_REGISTER);
+
+		return true;
+	}
+
+	/**
+	 * 根据验证码和电话号码，验证收到的验证码
+	 *
+	 * @param code
+	 * @param mobile
+	 * @return
+	 * @createTime 2014年8月28日 下午5:44:48
+	 * @author weili
+	 */
+	private void checkVeriCode(String code, String mobile,Integer msgType) {
+
+		String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
+
+		String redisCode = redisUtil.getString(redisKey);
+
+		if(Validator.isEmpty(code)){
+			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_EMPTY);
+		}
+
+		//验证码为空
+		if (Validator.isEmpty(redisCode)) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_OVERTIME);
+		}
+
+		//验证码不为空，并且和redis中的验证码相同
+		if (!code.equals(redisCode)) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_WRONG);
+		}
+
+	}
+
+
 	@Override
 	public LogoutResp logout(LogoutReq req) {
 		return null;
@@ -85,28 +85,28 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
         //登录redisKey=userId-deviceId
 //        String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, userId + Constant.COMMON_DASH + baseReq.getDeviceId());
-
-        String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+        //登录排斥验证
+        String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, token.getUserRole()+String.valueOf(userId));
         String loginValue = redisUtil.getString(loginKey);
-        //String loginDevicedKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, String.valueOf(userId));
-        //String loginDevicedValue = redisUtil.getString(loginDevicedKey);
-
         if(Validator.isEmpty(loginValue) || !loginValue.equals(String.valueOf(userId))) {
             log.error("用户没有登录请重新登录[userId={}]",userId);
             WebContent.sendErrorInfo(ResultCode.LOGIN_FAILED, ErrorMessage.USER_NOT_LOGIN);
             return false;
         }
-        //TODO 去掉了登录排斥验证
-        //if (!Validator.isNull(baseReq.getDeviceId())) {
-        //    if(Validator.isEmpty(loginDevicedValue) || !loginDevicedValue.equals(baseReq.getDeviceId())) {
-        //        log.error("用户使用其他设备重新登录[userId={}]",userId);
-        //        WebContent.sendErrorInfo(ResultCode.LOGIN_MULTI, ErrorMessage.USER_LOGIN_MULTI);
-        //        return false;
-        //    }
-        //}
+
+        //登录设备排斥验证
+        String loginDevicedKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, token.getUserRole()+String.valueOf(userId));
+        String loginDevicedValue = redisUtil.getString(loginDevicedKey);
+        if (!Validator.isNull(baseReq.getDeviceId())) {
+            if(Validator.isEmpty(loginDevicedValue) || !loginDevicedValue.equals(baseReq.getDeviceId())) {
+                log.error("用户使用其他设备重新登录[userId={}]",userId);
+                WebContent.sendErrorInfo(ResultCode.LOGIN_MULTI, ErrorMessage.USER_LOGIN_MULTI);
+                return false;
+            }
+        }
         //登录延时
-        logoutDelay(userId,baseReq.getDeviceId());
+        logoutDelay(userId,baseReq.getDeviceId(),token.getUserRole());
         return true;
     }
@@ -115,12 +115,10 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
      * 延迟登录超时时间
      * @param userId 用户ID
      */
-    private void logoutDelay(long userId,String deviceId) {
+    private void logoutDelay(long userId,String deviceId,Integer userRole) {
         try {
             //cookievalue的rediskey
-//            String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, userId + Constant.COMMON_DASH + deviceId);
-        	//TODO 2.5之后版本需要加上
-        	String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+        	String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, userRole+String.valueOf(userId));
             //缓存cookievalue
             redisUtil.setStringByExpire(loginKey, String.valueOf(userId), loginExpireTime);