Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev

Jiang
2 parents 6d2bef7b 17bd13d8
Showing 18 changed files with 499 additions and 206 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/BaseReq.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/saler/user/SellerLoginResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/GetShopInfoResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNoReq.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/buyer/user/impl/UserServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerUserService.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/api/buyer/user/UserController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/user/SellerUserController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/filter/LoginTimeoutInterceptor.java
mobsite-getway-web/src/main/resources/spring-rpc.xml
@@ -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";
@@ -58,6 +58,11 @@ public class BaseReq implements java.io.Serializable {
         return token == null ? null:token.getUserId();
     }
+
+    public Integer getUserRole() {
+        return token == null ? null:token.getUserRole();
+    }
+
 	/**
 	 *获取经度
 	 * */
 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;
@@ -11,42 +11,13 @@ import io.swagger.annotations.ApiModelProperty;
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
  * @createTime Aug 12, 2014 7:57:28 PM
- * @author wujianjun
+ * @author weili
  */
 @SuppressWarnings("serial")
 @ApiModel("返回参数")
 public class LoginResp extends BaseResp {
-    /**
-     * 个人用户
-     */
-    public static final Integer USER_TYPE_PERSONAL = 1;
-    /**
-     * 企业用户
-     */
-    public static final Integer USER_TYPE_COMPANY = 2;
-    
-    
-    /**
-     * 账户状态-正常
-     */
-    public static final Integer ACCOUNT_STATE_NORMAL = 1;
-    /**
-     * 账户状态-锁定
-     */
-    public static final Integer ACCOUNT_STATE_LOCK = 2;
-    /**
-     * 账户状态-未激活
-     */
-    public static final Integer ACCOUNT_STATE_INACTIVE = 3;
-    /**
-     * 账户状态-用户名或密码错误
-     */
-    public static final Integer ACCOUNT_STATE_PWD_ERROR = 4;
-    /**
-     * 账户状态-卖家没有开通店铺
-     */
-    public static final Integer ACCOUNT_STATE_NO_SHOP = 11;
+
     /**
      * 用户信息是否完善：1-完善 0-不完善
      */
@@ -69,47 +40,21 @@ 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;
+
+    
     /**
      * get value of LoginResp.accountId
      * @return the accountId
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public Long getAccountId() {
         return accountId;
@@ -119,7 +64,7 @@ public class LoginResp extends BaseResp {
      * set value of LoginResp.accountId
      * @param accountId the accountId to set
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public void setAccountId(Long accountId) {
         this.accountId = accountId;
@@ -129,7 +74,7 @@ public class LoginResp extends BaseResp {
      * get value of LoginResp.accountName
      * @return the accountName
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public String getAccountName() {
         return accountName;
@@ -139,7 +84,7 @@ public class LoginResp extends BaseResp {
      * set value of LoginResp.accountName
      * @param accountName the accountName to set
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public void setAccountName(String accountName) {
         this.accountName = accountName;
@@ -149,7 +94,7 @@ public class LoginResp extends BaseResp {
      * get value of LoginResp.mobile
      * @return the mobile
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public String getMobile() {
         return mobile;
@@ -159,7 +104,7 @@ public class LoginResp extends BaseResp {
      * set value of LoginResp.mobile
      * @param mobile the mobile to set
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public void setMobile(String mobile) {
         this.mobile = mobile;
@@ -167,30 +112,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;
 package com.diligrp.mobsite.getway.domain.protocol.saler.user;
-import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -12,56 +13,83 @@ import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
  * @author zhangshirui
  */
 @SuppressWarnings("serial")
-public class SellerLoginResp extends LoginResp {
+public class SellerLoginResp extends BaseResp {
-    /**
-     * 店铺id
-     */
+
+
+    @ApiModelProperty(value = "卖家id" )
+    private Long sellerId;
+    @ApiModelProperty(value = "店铺id" )
     private Long shopId;
-    /**
-     * 店铺名称
-     */
+    @ApiModelProperty(value = "店铺名称")
     private String shopName;
-    /**
-     * 店铺状态
-     */
-    private Integer shopState;
+    @ApiModelProperty(value = "店铺logo")
+    private String shopLogo;
+
+    @ApiModelProperty(value = "店铺地址")
+    private String shopAddr;
-	/**
-	 * 店铺来源
-	 */
-	private Integer shopSourceId;
+    @ApiModelProperty(value = "客服电话")
+    private String phone;
+
+    @ApiModelProperty(value = "店铺分享码" )
+    private Integer shopAuthCode;
+
+
+    public Long getSellerId() {
+        return sellerId;
+    }
+
+    public void setSellerId(Long sellerId) {
+        this.sellerId = sellerId;
+    }
     public Long getShopId() {
         return shopId;
     }
-    
+
     public void setShopId(Long shopId) {
         this.shopId = shopId;
     }
-    
+
     public String getShopName() {
         return shopName;
     }
-    
+
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
-    public Integer getShopState() {
-        return shopState;
+    public String getShopLogo() {
+        return shopLogo;
+    }
+
+    public void setShopLogo(String shopLogo) {
+        this.shopLogo = shopLogo;
     }
-    public void setShopState(Integer shopState) {
-        this.shopState = shopState;
+    public String getShopAddr() {
+        return shopAddr;
     }
-	public Integer getShopSourceId() {
-		return shopSourceId;
-	}
+    public void setShopAddr(String shopAddr) {
+        this.shopAddr = shopAddr;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
-	public void setShopSourceId(Integer shopSourceId) {
-		this.shopSourceId = shopSourceId;
-	}
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getShopAuthCode() {
+        return shopAuthCode;
+    }
+
+    public void setShopAuthCode(Integer shopAuthCode) {
+        this.shopAuthCode = shopAuthCode;
+    }
 }
@@ -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;
@@ -17,6 +17,17 @@ public class GetRegisterNoReq {
 	 */
 	private Long userId;
+	private Long userRole;
+
+
+	public Long getUserRole() {
+		return userRole;
+	}
+
+	public void setUserRole(Long userRole) {
+		this.userRole = userRole;
+	}
+
 	public Long getUserId() {
 		return userId;
 	}
 package com.diligrp.mobsite.getway.rpc;
 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;
@@ -19,10 +22,13 @@ import java.util.Map;
  */
 public interface PassportRPC extends BaseService {
-    SellerLoginResp login(LoginReq req);
+    SellerLoginResp sellerLogin(LoginReq req);
     UserRegisterResp register(UserRegisterReq req);
 	String modifyPwd(Map<String, String> params);
-    
+
+    SellerRegisterResp sellerRegister(SellerRegisterReq req);
+
+    LoginResp buyerLogin(LoginReq 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;
@@ -56,11 +59,11 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     }
     @Override
-    public SellerLoginResp login(LoginReq req) {
+    public SellerLoginResp sellerLogin(LoginReq req) {
         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 +91,26 @@ 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.setSellerId(jsonUser.getLong("accountId"));
+        resp.setPhone(jsonUser.getString("mobile"));
+        resp.setShopId(jsonUser.getLong("shopId"));
+        resp.setShopLogo("sds.jpg");
+        resp.setShopName("张三的水果店铺");
+        resp.setShopAuthCode(457854);
+        resp.setCode(code);
         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);
-        }
-
-        //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()));
-        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getAccountId()), loginExpireTime);
+        //缓存userId
+        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
+        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getSellerId()), 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.getSellerId()));
+            redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
+        }
         return resp;
     }
@@ -175,4 +164,40 @@ 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;
+    }
+
+    @Override
+    public LoginResp buyerLogin(LoginReq req) {
+
+        return null;
+    }
+
 }
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.service.buyer.user.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.diligrp.mobsite.getway.domain.RegisterNoMapper;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
@@ -24,7 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -65,9 +68,70 @@ public class UserServiceImpl implements UserService {
     @Override
     public LoginResp login(LoginReq req) {
-        return null;
+        LoginResp resp = (LoginResp) passportRPC.buyerLogin(req);
+
+        if (!Validator.isEmpty(req.getRegisterNo())) {
+            // 缓存
+            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+                    String.valueOf(resp.getAccountId()));
+
+            GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
+                    GetRegisterNoResp.class);
+            // 绑定极光ID
+            RegisterNoMapper mapper = new RegisterNoMapper();
+            mapper.setRegisterNo(req.getRegisterNo());
+            mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+            mapper.setUserid(resp.getAccountId());
+            mapper.setDeviceType(req.getDeviceType());
+            try {
+                //清除当前极光号userid缓存
+                cleanOldredis(mapper);
+                //构建缓存信息
+                buildRedisInfo(mappers, mapper);
+                redisUtil.setObjectByExpire(redisKey, mappers,
+                        RedisKey.REGISTERNO_EXPIRE_TIME);
+            } catch (Exception e) {
+                throw new ServiceException(ResultCode.PUSH_MESSAGE_NO,
+                        "绑定极光推送系统注册号失败");
+            }
+        }
+        return resp;
     }
+
+    /**
+     * 清除当前极光号下userid缓存
+     * @param mapper
+     */
+    private void cleanOldredis(RegisterNoMapper mapper) {
+        RegisterNoMapper oldmapper = registerNoMapperManager
+                .bindRegisterNo(mapper);
+        if (!Validator.isNull(oldmapper)){
+            String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+                    String.valueOf(oldmapper.getUserid()));
+            redisUtil.deleteByKey(oldKey);
+        }
+    }
+
+    /**
+     * 建立缓存信息
+     * @param mappers
+     * @param mapper
+     */
+    private void buildRedisInfo(GetRegisterNoResp mappers,
+                                RegisterNoMapper mapper) {
+        // 如果缓存没有重新建
+        List<RegisterNoMapper> renolist = new ArrayList<RegisterNoMapper>();
+
+        if (Validator.isNull(mappers)) {
+            mappers = new GetRegisterNoResp();
+        }
+        renolist.add(mapper);
+        mappers.setRegisterNos(renolist);
+    }
+
+
+
     @Override
     public CheckUserInvalidResp checkUserInvalid(CheckUserInvalidReq req) {
         return null;
@@ -343,7 +407,29 @@ public class UserServiceImpl implements UserService {
     @Override
     public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
-        return null;
+        GetRegisterNoResp resp = new GetRegisterNoResp();
+        if (Validator.isNull(req.getUserId())) {
+            resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
+            resp.setMsg("用户ID不能为空");
+            return resp;
+        }
+        //先从缓存取
+        String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, String.valueOf(req.getUserId()));
+        GetRegisterNoResp recache = redisUtil.getObject(redisKey, GetRegisterNoResp.class);
+        if (!Validator.isNull(recache) && !Validator.isEmpty(recache.getRegisterNos())) {
+            resp.setRegisterNos(recache.getRegisterNos());
+        }else {
+            List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserId());
+            if (!Validator.isEmpty(mapppers)) {
+
+                resp.setRegisterNos(mapppers);
+                redisUtil.setObjectByExpire(redisKey, resp, RedisKey.REGISTERNO_EXPIRE_TIME);
+            }else {
+                resp.setCode(ResultCode.BUSINESS_FAILED);
+                resp.setMsg("该用户没有绑定极光号");
+            }
+        }
+        return resp;
     }
     @Override
@@ -24,7 +24,7 @@ public interface SellerUserService {
      * @createTime 2015年4月16日 下午4:33:09
      * @author duanyugen
      */
-    SellerLoginResp login(SellerLoginReq req) throws RuntimeException;
+    SellerLoginResp sellerLogin(SellerLoginReq req) throws RuntimeException;
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.service.seller.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.diligrp.mobsite.getway.domain.RegisterNoMapper;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
@@ -26,7 +27,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
@@ -66,10 +69,69 @@ public class SellerUserServiceImpl implements SellerUserService {
 	private static Logger logger = LoggerFactory.getLogger(SellerUserServiceImpl.class);
 	@Override
-	public SellerLoginResp login(SellerLoginReq req) throws RuntimeException {
-		return null;
+	public SellerLoginResp sellerLogin(SellerLoginReq req) throws RuntimeException {
+		SellerLoginResp resp =  passportRPC.sellerLogin(req);
+
+		if (!Validator.isEmpty(req.getRegisterNo())) {
+			// 缓存
+			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,req.getUserRole()+
+					String.valueOf(resp.getSellerId()));
+
+			GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
+					GetRegisterNoResp.class);
+			// 绑定极光ID
+			RegisterNoMapper mapper = new RegisterNoMapper();
+			mapper.setRegisterNo(req.getRegisterNo());
+			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+			mapper.setUserid(resp.getSellerId());
+			mapper.setDeviceType(req.getDeviceType());
+			try {
+				//清除当前极光号userid缓存
+				cleanOldredis(mapper);
+				//构建缓存信息
+				buildRedisInfo(mappers, mapper);
+				redisUtil.setObjectByExpire(redisKey, mappers,
+						RedisKey.REGISTERNO_EXPIRE_TIME);
+			} catch (Exception e) {
+				throw new ServiceException(ResultCode.PUSH_MESSAGE_NO,
+						"绑定极光推送系统注册号失败");
+			}
+		}
+		return resp;
+	}
+
+	/**
+	 * 清除当前极光号下userid缓存
+	 * @param mapper
+	 */
+	private void cleanOldredis(RegisterNoMapper mapper) {
+		RegisterNoMapper oldmapper = registerNoMapperManager
+				.bindRegisterNo(mapper);
+		if (!Validator.isNull(oldmapper)){
+			String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					String.valueOf(oldmapper.getUserid()));
+			redisUtil.deleteByKey(oldKey);
+		}
+	}
+
+	/**
+	 * 建立缓存信息
+	 * @param mappers
+	 * @param mapper
+	 */
+	private void buildRedisInfo(GetRegisterNoResp mappers,
+								RegisterNoMapper mapper) {
+		// 如果缓存没有重新建
+		List<RegisterNoMapper> renolist = new ArrayList<RegisterNoMapper>();
+
+		if (Validator.isNull(mappers)) {
+			mappers = new GetRegisterNoResp();
+		}
+		renolist.add(mapper);
+		mappers.setRegisterNos(renolist);
 	}
+
 	@Override
 	public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
 		SendVeriCodeResp resp = new SendVeriCodeResp();
@@ -188,9 +250,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;
@@ -205,4 +331,32 @@ public class SellerUserServiceImpl implements SellerUserService {
 	public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
 		return null;
 	}
+
+
+
+	public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
+		GetRegisterNoResp resp = new GetRegisterNoResp();
+		if (Validator.isNull(req.getUserId())) {
+			resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
+			resp.setMsg("用户ID不能为空");
+			return resp;
+		}
+		//先从缓存取
+		String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, req.getUserRole()+String.valueOf(req.getUserId()));
+		GetRegisterNoResp recache = redisUtil.getObject(redisKey, GetRegisterNoResp.class);
+		if (!Validator.isNull(recache) && !Validator.isEmpty(recache.getRegisterNos())) {
+			resp.setRegisterNos(recache.getRegisterNos());
+		}else {
+			List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserId());
+			if (!Validator.isEmpty(mapppers)) {
+
+				resp.setRegisterNos(mapppers);
+				redisUtil.setObjectByExpire(redisKey, resp, RedisKey.REGISTERNO_EXPIRE_TIME);
+			}else {
+				resp.setCode(ResultCode.BUSINESS_FAILED);
+				resp.setMsg("该用户没有绑定极光号");
+			}
+		}
+		return resp;
+	}
 }
@@ -388,6 +388,29 @@ public class UserController extends BaseApiController {
     ///**
+    // * 查询极光推送号
+    // *
+    // * getRegisterNo
+    // */
+    //@RequestMapping("/getRegisterNo")
+    //@ResponseBody
+    //public void getRegisterNo() {
+    //    GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
+    //    try {
+    //        GetRegisterNoResp resp = userService.getRegisterNo(req);
+    //        sendSuccessResp(resp);
+    //    } catch (ServiceException e){
+    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
+    //                e.getCode(), e.getMessage()), e);
+    //        sendError(e.getCode(), e.getMessage());
+    //    } catch (Exception e) {
+    //        LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+    //        sendError(e.getMessage());
+    //    }
+    //}
+
+
+    ///**
     // * 查看交易记录
     // * @createTime 2016年8月24日 下午10:55:03
     // * @author weili
@@ -55,7 +55,7 @@ public class SellerUserController extends BaseApiController {
     public void sellerLogin(@RequestBody SellerLoginReq temp){
         SellerLoginReq req = super.getRequest(SellerLoginReq.class);
         try {
-            SellerLoginResp resp = sellerUserService.login(req);
+            SellerLoginResp resp = sellerUserService.sellerLogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
@@ -81,7 +81,7 @@ public class SellerUserController extends BaseApiController {
         try {
             BeanValidator.validator(req);
             req.setPassword(decodeStr(req.getPassword()));
-            SellerLoginResp resp = sellerUserService.login(req);
+            SellerLoginResp resp = sellerUserService.sellerLogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
@@ -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);
@@ -56,16 +56,16 @@
         <!--<property name="DEFAULT_MAX_PER_ROUTE" value="20"></property>-->
         <!--<property name="MAX_TOTAL" value="100"></property>-->
     <!--</bean>-->
-    <bean id="dataStoredConfig" class="com.dili.dataStored.sdk.common.DataStoredConfig">
-        <property name="trackercount" value="${project.fastdfs.trackercount}"/>
-        <property name="connectTimeout" value="${project.fastdfs.connectTimeout}"/>
-        <property name="networkTimeout" value="${project.fastdfs.networkTimeout}"/>
-        <property name="charset" value="${project.fastdfs.charset}"/>
-        <property name="trackers" value="${project.fastdfs.trackers}"/>
-    </bean>
-    <bean id="dataStoredService" class="com.dili.dataStored.sdk.common.DataStoredServiceImpl">
-        <constructor-arg index="0" ref="dataStoredConfig"/>
-    </bean>
+    <!--<bean id="dataStoredConfig" class="com.dili.dataStored.sdk.common.DataStoredConfig">-->
+        <!--<property name="trackercount" value="${project.fastdfs.trackercount}"/>-->
+        <!--<property name="connectTimeout" value="${project.fastdfs.connectTimeout}"/>-->
+        <!--<property name="networkTimeout" value="${project.fastdfs.networkTimeout}"/>-->
+        <!--<property name="charset" value="${project.fastdfs.charset}"/>-->
+        <!--<property name="trackers" value="${project.fastdfs.trackers}"/>-->
+    <!--</bean>-->
+    <!--<bean id="dataStoredService" class="com.dili.dataStored.sdk.common.DataStoredServiceImpl">-->
+        <!--<constructor-arg index="0" ref="dataStoredConfig"/>-->
+    <!--</bean>-->
     <!-- ÉÏ´«Í¼Æ¬Â·¾¶ -->
     <bean id="imageStoreUpload" class="com.diligrp.store.api.upload.DiliStoreUpload">