Merge remote-tracking branch 'origin/dev-fr-20211122' into dev-merge-1119

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

server/src/main/java/com/pica/cloud/account/account/server/entity/AccountInfoEntity.java

@@ -25,6 +25,8 @@ public class AccountInfoEntity {
 
     private Date regTime;
 
+    private String regVersion;
+
     private Integer deleteFlag;
 
     private Integer createdId;
@@ -35,6 +37,14 @@ public class AccountInfoEntity {
 
     private Date modifiedTime;
 
+    public String getRegVersion() {
+        return regVersion;
+    }
+
+    public void setRegVersion(String regVersion) {
+        this.regVersion = regVersion;
+    }
+
     public Integer getId() {
         return id;
     }

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.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.constants.Constants;
@@ -10,7 +11,10 @@ import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
-import com.pica.cloud.account.account.server.mapper.*;
+import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
+import com.pica.cloud.account.account.server.mapper.AccountMapper;
+import com.pica.cloud.account.account.server.mapper.AgreementLogEntityMapper;
+import com.pica.cloud.account.account.server.mapper.PUserRoleMapper;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.*;
@@ -18,6 +22,7 @@ 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.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;
@@ -129,6 +134,15 @@ public class RegisterServiceImpl implements RegisterService {
                     accountInfo.setSex(0);
                     accountInfo.setRegisterProduct(productType);
                     accountInfo.setRegisterSource(sourceType);
+
+                    /*注册app版本*/
+                    try {
+                        JSONObject jsonObject = JSONObject.parseObject(RequestUtils.getRequest().getHeader("deviceInfo"));
+                        accountInfo.setRegVersion(jsonObject.getString("app_version"));
+                    } catch (Exception ex) {
+                        logger.error("从header中获取app版本异常", ex);
+                    }
+
                     accountInfoDetailMapper.insertSelective(accountInfo);
                     Integer acctId = accountInfo.getId();
                     accountInfoDetailMapper.updateCreateInfo(acctId);

server/src/main/resources/mybatis/AccountInfoEntityMapper.xml

@@ -144,6 +144,9 @@
             <if test="regTime != null">
                 reg_time,
             </if>
+            <if test="regVersion != null">
+                reg_version,
+            </if>
             <if test="deleteFlag != null">
                 delete_flag,
             </if>
@@ -194,6 +197,9 @@
             <if test="regTime != null">
                 #{regTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="regVersion != null">
+                #{regVersion,jdbcType=VARCHAR},
+            </if>
             <if test="deleteFlag != null">
                 #{deleteFlag,jdbcType=INTEGER},
             </if>