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

jiangchengyong
2 parents 44139aeb f84e1db2
Showing 8 changed files with 97 additions and 52 deletions
mobsite-getway-dao/pom.xml
mobsite-getway-domain/pom.xml
mobsite-getway-manager/pom.xml
mobsite-getway-rpc/pom.xml
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.java
mobsite-getway-service/pom.xml
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
@@ -11,7 +11,7 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>com.diligrp.mobsite</groupId>
+			<groupId>com.b2c.mobsite</groupId>
 			<artifactId>mobsite-getway-domain</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
@@ -2,12 +2,14 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.diligrp.mobsite</groupId>
-    <artifactId>mobsite-getway</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <groupId>com.diligrp.mobsite</groupId>
+  <!--<parent>-->
+    <!--<groupId>com.diligrp.mobsite</groupId>-->
+    <!--<artifactId>mobsite-getway</artifactId>-->
+    <!--<version>0.0.1-SNAPSHOT</version>-->
+  <!--</parent>-->
+
+
+  <groupId>com.b2c.mobsite</groupId>
   <artifactId>mobsite-getway-domain</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <name>mobsite-getway-domain</name>
@@ -15,12 +17,5 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
 </project>
@@ -25,7 +25,7 @@
   		<version>0.0.1-SNAPSHOT</version>
   	</dependency>
   	<dependency>
-		<groupId>com.diligrp.mobsite</groupId>
+		<groupId>com.b2c.mobsite</groupId>
 		<artifactId>mobsite-getway-domain</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</dependency>
@@ -17,7 +17,7 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>com.diligrp.mobsite</groupId>
+			<groupId>com.b2c.mobsite</groupId>
 			<artifactId>mobsite-getway-domain</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
@@ -106,6 +106,8 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
         redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getSellerId()), loginExpireTime);
+
+
         //缓存设备id,userId作为key
         if (!Validator.isNull(req.getDeviceId())) {
             String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
@@ -28,7 +28,7 @@
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>com.diligrp.mobsite</groupId>
+			<groupId>com.b2c.mobsite</groupId>
 			<artifactId>mobsite-getway-domain</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
@@ -72,7 +72,7 @@ public class UserServiceImpl implements UserService {
         if (!Validator.isEmpty(req.getRegisterNo())) {
             // 缓存
-            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_BUYER+
                     String.valueOf(resp.getAccountId()));
             GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
@@ -348,7 +348,31 @@ public class UserServiceImpl implements UserService {
     @Override
     public LogoutResp logout(LogoutReq req) {
-        return null;
+        LogoutResp resp = new LogoutResp();
+
+
+        // 解除绑定极光ID
+        if(!Validator.isEmpty(req.getRegisterNo())){
+
+            String userId = req.getUserId().toString();
+            //先清缓存再清数据库
+            String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_BUYER+userId);
+
+            RegisterNoMapper mapper = new RegisterNoMapper();
+            mapper.setRegisterNo(req.getRegisterNo());
+            mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+            mapper.setUserid(req.getUserId());
+            mapper.setDeviceType(req.getDeviceType());
+            try {
+                redisUtil.deleteByKey(reNOCache);
+                registerNoMapperManager.unBindRegisterNo(mapper);
+            }
+            catch(Exception e) {
+                logger.error("解除极光推送系统绑定的注册号失败",e);
+            }
+        }
+
+        return resp;
     }
     @Override
@@ -376,7 +400,7 @@ public class UserServiceImpl implements UserService {
             return resp;
         }else {
             //修改成功，退出所有账号信息
-            String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+            String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_BUYER+String.valueOf(userId));
             redisUtil.deleteByKey(cookieRedisKey);
         }
@@ -408,13 +432,13 @@ public class UserServiceImpl implements UserService {
     @Override
     public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
         GetRegisterNoResp resp = new GetRegisterNoResp();
-        if (Validator.isNull(req.getUserId())) {
+        if (Validator.isNull(req.getUserId())||Validator.isNull(req.getUserRole())) {
             resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
-            resp.setMsg("用户ID不能为空");
+            resp.setMsg("用户ID和用户角色不能为空");
             return resp;
         }
         //先从缓存取
-        String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, String.valueOf(req.getUserId()));
+        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());
@@ -74,7 +74,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 		if (!Validator.isEmpty(req.getRegisterNo())) {
 			// 缓存
-			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,req.getUserRole()+
+			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SELLER+
 					String.valueOf(resp.getSellerId()));
 			GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
@@ -239,7 +239,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 			return resp;
 		}else {
 			//修改成功，退出所有账号信息
-			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(userId));
 			redisUtil.deleteByKey(cookieRedisKey);
 		}
@@ -319,7 +319,31 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public LogoutResp logout(LogoutReq req) {
-		return null;
+		LogoutResp resp = new LogoutResp();
+
+
+		// 解除绑定极光ID
+		if(!Validator.isEmpty(req.getRegisterNo())){
+
+			String userId = req.getUserId().toString();
+			//先清缓存再清数据库
+			String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SELLER+userId);
+
+			RegisterNoMapper mapper = new RegisterNoMapper();
+			mapper.setRegisterNo(req.getRegisterNo());
+			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+			mapper.setUserid(req.getUserId());
+			mapper.setDeviceType(req.getDeviceType());
+			try {
+				redisUtil.deleteByKey(reNOCache);
+				registerNoMapperManager.unBindRegisterNo(mapper);
+			}
+			catch(Exception e) {
+				logger.error("解除极光推送系统绑定的注册号失败",e);
+			}
+		}
+
+		return resp;
 	}
 	@Override
@@ -334,29 +358,29 @@ public class SellerUserServiceImpl implements SellerUserService {
-	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;
-	}
+	//public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
+	//	GetRegisterNoResp resp = new GetRegisterNoResp();
+	//	if (Validator.isNull(req.getUserId())||Validator.isNull(req.getUserRole())) {
+	//		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;
+	//}
 }