Merge branch 'dev-group-1119' into 'release'

Dev group 1119

See merge request !86

server/pom.xml

@@ -203,6 +203,11 @@
             <artifactId>pica-cloud-riskcontrol-client</artifactId>
             <version>1.0.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.pica.cloud.tag</groupId>
+            <artifactId>pica-cloud-transport-client</artifactId>
+            <version>1.0.5</version>
+        </dependency>
 
         <!-- apple identifyToken校验 -->
         <dependency>

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

 package com.pica.cloud.account.account.server.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.constants.Constants;
@@ -20,17 +21,23 @@ import com.pica.cloud.account.account.server.util.*;
 import com.pica.cloud.foundation.completeness.client.utils.IntactUtils;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
+import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.utils.RequestUtils;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
+import com.pica.cloud.tag.transport.client.ITransportDoctorClient;
+import com.pica.cloud.tag.transport.contract.req.StickerProfileDto;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
 @Service
@@ -81,6 +88,7 @@ public class RegisterServiceImpl implements RegisterService {
 
     @Override
     public LoginResult register(BaseRequest baseRequest,QueryMobileEntity queryMobileEntity) {
+        String requestId = UUID.randomUUID().toString();
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
         intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"baseRequest:"+ JSON.toJSONString(baseRequest)+",queryMobileEntity:"+JSON.toJSONString(queryMobileEntity));

server/src/main/resources/bootstrap-dev.properties

@@ -73,4 +73,4 @@ xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 xxl.job.executor.logretentiondays=-1
 
 
-pica.cloud.message.url=https://dev-sc.yunqueyi.com/message
+pica.cloud.message.url=https://dev-sc.yunqueyi.com/message
\ No newline at end of file

server/src/main/resources/bootstrap-prod.properties

@@ -37,24 +37,24 @@ spring.jackson.time-zone=GMT+8
 
 memcached.url=172.19.137.65:11211
 
-#微信登陆
+#\u5FAE\u4FE1\u767B\u9646
 weChatAppID=wx5103ed453ef2dbe8
 weChatAppSecret=6faa9bef3302786c08b2baf278613f38
 weChatAppIDH5=wx2c577552a2d28550
 weChatAppSecretH5=397a92bda46180efa2c2a235b74a409a
 weChatURL=https://api.weixin.qq.com/sns/userinfo?
 
-#是否开启双写模式，是否需要向p_doctor表写数据
+#\u662F\u5426\u5F00\u542F\u53CC\u5199\u6A21\u5F0F\uFF0C\u662F\u5426\u9700\u8981\u5411p_doctor\u8868\u5199\u6570\u636E
 doubleWritingMode=true
 
 management.security.enabled=false
 management.endpoint.health.show-details=always
 
 # Job config begin
-# 控制器地址：服务启动自动注册到控制器中
+# \u63A7\u5236\u5668\u5730\u5740\uFF1A\u670D\u52A1\u542F\u52A8\u81EA\u52A8\u6CE8\u518C\u5230\u63A7\u5236\u5668\u4E2D
 xxl.job.admin.addresses=http://172.19.137.74:7899/job,http://172.19.137.75:7899/job
 
-#执行器命名规则job-exec-<申请Port>
+#\u6267\u884C\u5668\u547D\u540D\u89C4\u5219job-exec-<\u7533\u8BF7Port>
 xxl.job.executor.appname=job-exec-7906
 xxl.job.executor.ip=
 xxl.job.executor.port=7906
@@ -62,7 +62,7 @@ xxl.job.executor.port=7906
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### 确保改目录可写/opt/xxl-job-logs/jobhandler
+### \u786E\u4FDD\u6539\u76EE\u5F55\u53EF\u5199/opt/xxl-job-logs/jobhandler
 xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 ### xxl-job log retention days
 xxl.job.executor.logretentiondays=-1

server/src/main/resources/bootstrap-test1.properties

@@ -36,14 +36,14 @@ spring.jackson.time-zone=GMT+8
 
 memcached.url=192.168.130.230:11211
 
-#微信登陆
+#\u5FAE\u4FE1\u767B\u9646
 weChatAppID=wx5103ed453ef2dbe8
 weChatAppSecret=6faa9bef3302786c08b2baf278613f38
 weChatAppIDH5=wxcaad75b7fff5659c
 weChatAppSecretH5=3d6eea715bc34489b49925b3dbde9c8b
 weChatURL=https://api.weixin.qq.com/sns/userinfo?
 
-#是否开启双写模式，是否需要向p_doctor表写数据
+#\u662F\u5426\u5F00\u542F\u53CC\u5199\u6A21\u5F0F\uFF0C\u662F\u5426\u9700\u8981\u5411p_doctor\u8868\u5199\u6570\u636E
 doubleWritingMode=true
 
 #rabbitmq settings
@@ -54,10 +54,10 @@ spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 spring.rabbitmq.virtual-host=account-register-vhost
 
 # Job config begin
-# 控制器地址：服务启动自动注册到控制器中
+# \u63A7\u5236\u5668\u5730\u5740\uFF1A\u670D\u52A1\u542F\u52A8\u81EA\u52A8\u6CE8\u518C\u5230\u63A7\u5236\u5668\u4E2D
 xxl.job.admin.addresses=http://192.168.110.133:7899/job
 
-#执行器命名规则job-exec-<申请Port>
+#\u6267\u884C\u5668\u547D\u540D\u89C4\u5219job-exec-<\u7533\u8BF7Port>
 xxl.job.executor.appname=job-exec-7906
 xxl.job.executor.ip=
 xxl.job.executor.port=7906
@@ -65,11 +65,10 @@ xxl.job.executor.port=7906
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### 确保改目录可写/opt/xxl-job-logs/jobhandler
+### \u786E\u4FDD\u6539\u76EE\u5F55\u53EF\u5199/opt/xxl-job-logs/jobhandler
 xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 ### xxl-job log retention days
 xxl.job.executor.logretentiondays=-1
 
 
 pica.cloud.message.url=https://test1-sc.yunqueyi.com/message
-

server/src/main/resources/bootstrap-uat.properties

@@ -36,14 +36,14 @@ spring.jackson.time-zone=GMT+8
 
 memcached.url=192.168.130.230:11211
 
-#微信登陆
+#\u5FAE\u4FE1\u767B\u9646
 weChatAppID=wx5103ed453ef2dbe8
 weChatAppSecret=6faa9bef3302786c08b2baf278613f38
 weChatAppIDH5=wx342ef0e5afee54a7
 weChatAppSecretH5=3859052f07d3f87cda644bf073927ef1
 weChatURL=https://api.weixin.qq.com/sns/userinfo?
 
-#是否开启双写模式，是否需要向p_doctor表写数据
+#\u662F\u5426\u5F00\u542F\u53CC\u5199\u6A21\u5F0F\uFF0C\u662F\u5426\u9700\u8981\u5411p_doctor\u8868\u5199\u6570\u636E
 doubleWritingMode=true
 
 #rabbitmq settings
@@ -54,10 +54,10 @@ spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 spring.rabbitmq.virtual-host=account-register-vhost
 
 # Job config begin
-# 控制器地址：服务启动自动注册到控制器中
+# \u63A7\u5236\u5668\u5730\u5740\uFF1A\u670D\u52A1\u542F\u52A8\u81EA\u52A8\u6CE8\u518C\u5230\u63A7\u5236\u5668\u4E2D
 xxl.job.admin.addresses=http://192.168.110.141:7899/job
 
-#执行器命名规则job-exec-<申请Port>
+#\u6267\u884C\u5668\u547D\u540D\u89C4\u5219job-exec-<\u7533\u8BF7Port>
 xxl.job.executor.appname=job-exec-7906
 xxl.job.executor.ip=
 xxl.job.executor.port=7906
@@ -65,11 +65,10 @@ xxl.job.executor.port=7906
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### 确保改目录可写/opt/xxl-job-logs/jobhandler
+### \u786E\u4FDD\u6539\u76EE\u5F55\u53EF\u5199/opt/xxl-job-logs/jobhandler
 xxl.job.executor.logpath=/opt/xxl-job-logs/jobhandler
 ### xxl-job log retention days
 xxl.job.executor.logretentiondays=-1
 
 
 pica.cloud.message.url=https://uat-sc.yunqueyi.com/message
-