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

# Conflicts: # mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java

Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev
# Conflicts: # mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
Jiang
2 parents 19469e37 9c1727e7
Showing 5 changed files with 128 additions and 36 deletions
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/login/LoginResp.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-web/src/main/java/com/diligrp/mobsite/getway/web/filter/LoginTimeoutInterceptor.java
@@ -22,7 +22,11 @@ public final class RedisKey {
     public static final String USER_DEVICEID = ZDAPP_GETWAY+":USER:DEVICEID";
     public static final String USER_REGISTERNO = ZDAPP_GETWAY+":USER:REGISTERNO";
-    public static final String USER_SHOPID = ZDAPP_GETWAY+":USER:SHOPID";
+    public static final String USER_SELLER_SHOPID = ZDAPP_GETWAY+":SELLER:SHOPID";
+
+    public static final String USER_BUYER_CURRENTSHOPID = ZDAPP_GETWAY+":BUYER:SHOPID";
+
+    public static final String USER_BUYER_SHOPUSERID = ZDAPP_GETWAY+":BUYER:SHOPUSERID";
     //门卫登录信息
     public static final String GUARD_LOGININFO = ZDAPP_GETWAY+":GUARD:LOGININFO";
@@ -29,7 +29,7 @@ public class LoginResp extends BaseResp {
      * 账户ID
      */
     @ApiModelProperty(value = "用户id")
-    private Long accountId;
+    private Long buyerId;
     /**
      * 账户名
      */
@@ -49,25 +49,36 @@ public class LoginResp extends BaseResp {
     private String headImg;
-    
-    /**
-     * get value of LoginResp.accountId
-     * @return the accountId
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author weili
-     */
-    public Long getAccountId() {
-        return accountId;
+    @ApiModelProperty(value = "当前绑定的店铺id")
+    private Long currentShopId;
+
+    @ApiModelProperty(value = "店铺购买者ID")
+    private Long shopBuyerId;
+
+
+    public Long getBuyerId() {
+        return buyerId;
     }
-    /**
-     * set value of LoginResp.accountId
-     * @param accountId the accountId to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author weili
-     */
-    public void setAccountId(Long accountId) {
-        this.accountId = accountId;
+    public void setBuyerId(Long buyerId) {
+        this.buyerId = buyerId;
+    }
+
+
+    public Long getCurrentShopId() {
+        return currentShopId;
+    }
+
+    public void setCurrentShopId(Long currentShopId) {
+        this.currentShopId = currentShopId;
+    }
+
+    public Long getShopBuyerId() {
+        return shopBuyerId;
+    }
+
+    public void setShopBuyerId(Long shopBuyerId) {
+        this.shopBuyerId = shopBuyerId;
     }
     /**
@@ -103,17 +103,17 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         resp.setMsg(msg);
         //缓存userId
-        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
+        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
         redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getSellerId()), loginExpireTime);
         //缓存shopId
-        String shopIdKey = redisUtil.makeKey(RedisKey.USER_SHOPID, Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
-        redisUtil.setStringByExpire(shopIdKey, String.valueOf(resp.getShopId()), loginExpireTime);
+        //String shopIdKey = redisUtil.makeKey(RedisKey.USER_SELLER_SHOPID, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
+        //redisUtil.setStringByExpire(shopIdKey, String.valueOf(resp.getShopId()), loginExpireTime);
         //缓存设备id,userId作为key
         if (!Validator.isNull(req.getDeviceId())) {
-            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
+            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
             redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
         }
         return resp;
@@ -202,7 +202,74 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     @Override
     public LoginResp buyerLogin(LoginReq req) {
-        return null;
+        Map<String,String> params = new HashMap<String, String>();
+        params.put("userName", req.getAccountName());
+        params.put("password", req.getPassword());
+        params.put("src", "zadeapp");
+        BaseOutput<String> output = null;
+        try {
+            output = super.httpPost("/api/login/login.html", params, null,passportSign);
+        } catch (Exception e) {
+            log.error("调用passport用户验证接口失败",e);
+            throw new ServiceException();
+        }
+
+       JSONObject jsonBody = JSONObject.parseObject(output.getData());
+        int code = 0;
+        try {
+            code = jsonBody.getIntValue("code");
+        } catch (Exception e) {
+            log.error("passport返回数据：msg={}",jsonBody);
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,"登录失败请重新登录");
+        }
+
+        String msg = jsonBody.getString("msg");
+
+        if (code == PASSPORT_LOGIN_CODE_LOCKED || code == PASSPORT_LOGIN_CODE_ACCOUNT_NOT_EXIST
+                || code == PASSPORT_LOGIN_CODE_PASSWORD_WRONG) {
+            throw new ServiceException(code,msg);
+        }else if (code != ResultCode.SUCCESS) {
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,msg);
+        }
+
+        //resp.setToken(jsonBody.getString("token"));
+        JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
+        LoginResp resp = new LoginResp();
+        resp.setBuyerId(jsonUser.getLong("accountId"));
+        resp.setHeadImg(jsonUser.getString("img"));
+        resp.setMobile("13985454555");
+        resp.setAccountName("");
+        resp.setCurrentShopId(123L);
+        resp.setShopBuyerId(122L);
+        resp.setCode(code);
+        resp.setMsg(msg);
+
+        //缓存userId
+        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getBuyerId()), loginExpireTime);
+
+        //缓存设备id,userId作为key
+        if (!Validator.isNull(req.getDeviceId())) {
+            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+            redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
+        }
+
+        //缓存currentShopId
+        //if (!Validator.isNull(resp.getCurrentShopId())){
+        //    String currentShopIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_CURRENTSHOPID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+        //    redisUtil.setStringByExpire(currentShopIdKey, String.valueOf(resp.getCurrentShopId()), loginExpireTime);
+        //}
+
+
+        //缓存shopBuyerId
+        //if (!Validator.isNull(resp.getShopBuyerId())){
+        //    String shopUserIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_SHOPUSERID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+        //    redisUtil.setStringByExpire(shopUserIdKey, String.valueOf(resp.getShopBuyerId()), loginExpireTime);
+        //}
+
+
+
+        return resp;
     }
 }
@@ -147,14 +147,15 @@ public class UserServiceImpl implements UserService {
 		if (!Validator.isEmpty(req.getRegisterNo())) {
 			// 缓存
 			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
-					Constant.USER_ROLE_BUYER + String.valueOf(resp.getAccountId()));
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(resp.getBuyerId()));
 			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.setUserid(resp.getBuyerId());
+			mapper.setUserType(Constant.USER_ROLE_BUYER);
 			mapper.setDeviceType(req.getDeviceType());
 			try {
 				// 清除当前极光号userid缓存
@@ -177,7 +178,8 @@ public class UserServiceImpl implements UserService {
 	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()));
+			String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(oldmapper.getUserid()));
 			redisUtil.deleteByKey(oldKey);
 		}
 	}
@@ -419,12 +421,13 @@ public class UserServiceImpl implements UserService {
 			String userId = req.getUserId().toString();
 			// 先清缓存再清数据库
-			String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_BUYER + userId);
+			String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_BUYER + userId);
 			RegisterNoMapper mapper = new RegisterNoMapper();
 			mapper.setRegisterNo(req.getRegisterNo());
 			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
 			mapper.setUserid(req.getUserId());
+			mapper.setUserType(Constant.USER_ROLE_BUYER);
 			mapper.setDeviceType(req.getDeviceType());
 			try {
 				redisUtil.deleteByKey(reNOCache);
@@ -493,19 +496,25 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
 		GetRegisterNoResp resp = new GetRegisterNoResp();
-		if (Validator.isNull(req.getUserId()) || Validator.isNull(req.getUserRole())) {
+		if (Validator.isNull(req.getUserId()) || Validator.isNull(req.getUserType())) {
 			resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
-			resp.setMsg("用户ID和用户角色不能为空");
+			resp.setMsg("用户ID和用户类型不能为空");
 			return resp;
 		}
 		// 先从缓存取
-		String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
-				req.getUserRole() + String.valueOf(req.getUserId()));
+		String redisKey = "";
+		if (req.getUserType() == Constant.USER_ROLE_BUYER) {
+			redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(req.getUserId()));
+		} else if (req.getUserType() == Constant.USER_ROLE_SELLER) {
+			redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					Constant.USER_ROLE_SIGN_SELLER + 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());
+			List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserType(), req.getUserId());
 			if (!Validator.isEmpty(mapppers)) {
 				resp.setRegisterNos(mapppers);
@@ -523,6 +532,7 @@ public class UserServiceImpl implements UserService {
 		GetRegisterNobyUidsResp resp = new GetRegisterNobyUidsResp();
 		Map<String, Object> param = new HashMap<String, Object>();
 		param.put("userids", req.getUserIds());
+		param.put("userType", req.getUserType());
 		if (!Validator.isNull(req.getPlatform())) {
 			param.put("device_type", req.getPlatform().toString());
 		}
@@ -49,9 +49,9 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
         }
         //检测token信息
-        //if (!checkTokenInfo(body,request)) {
-        //    return false;
-        //}
+        if (!checkTokenInfo(body,request)) {
+            return false;
+        }
         return super.preHandle(request, response, handler);
     }