修改siteUserId获取方式

DarLiner · Apr 14, 2018 · 080e2fe · 080e2fe
1 parent 5dfb6dc
commit 080e2fe
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java
@@ -121,21 +121,20 @@ public CommandResponse register(Command command) {
 		CommandResponse commandResponse = new CommandResponse().setAction(CommandConst.ACTION_RES);
 		ErrorCode2 errorCode = ErrorCode2.ERROR;
 		try {
-			ApiSiteRegisterProto.ApiSiteRegisterRequest registerRequest = ApiSiteRegisterProto.ApiSiteRegisterRequest
+			ApiSiteRegisterProto.ApiSiteRegisterRequest request = ApiSiteRegisterProto.ApiSiteRegisterRequest
 					.parseFrom(command.getParams());
-			// 这里需要验证邀请码，如果有需要
-			String userIdPubk = registerRequest.getUserIdPubk();
-			String userName = registerRequest.getUserName();
-			String userPhoto = registerRequest.getUserPhoto();
-			String userUic = registerRequest.getUserUic();
-			String applyInfo = registerRequest.getApplyInfo();
-			String phoneToken = registerRequest.getPhoneToken();
+			String userIdPubk = request.getUserIdPubk();
+			String userName = request.getUserName();
+			String userPhoto = request.getUserPhoto();
+			String userUic = request.getUserUic();
+			String applyInfo = request.getApplyInfo();
+			String phoneToken = request.getPhoneToken();
 			String phoneId = null;// 通过phoneCod
-			String siteUserId = UUID.randomUUID().toString();// siteUserId保证各站不同
-			if (registerRequest.getSiteUserId() != null) {
-				siteUserId = registerRequest.getSiteUserId();
+			String siteUserId = request.getSiteUserId();// siteUserId保证各站不同
+			if (StringUtils.isBlank(siteUserId)) {
+				siteUserId = UUID.randomUUID().toString();
 			}
-			LogUtils.requestDebugLog(logger, command, registerRequest.toString());
+			LogUtils.requestDebugLog(logger, command, request.toString());
 
 			if (StringUtils.isAnyEmpty(userIdPubk, userName)) {
 				errorCode = ErrorCode2.ERROR_PARAMETER;