Merge remote-tracking branch 'origin/release' into dev-group-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/controller/LoginController.java

@@ -26,6 +26,7 @@ import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
 import com.pica.cloud.foundation.utils.annotation.LoginPermission;
+import com.pica.cloud.foundation.utils.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.servlet4preview.http.HttpServletRequest;
@@ -249,15 +250,20 @@ public class LoginController extends AccountBaseController {
         if (StringUtils.isNotEmpty(token)) {
             Long doctorId = super.getDoctorIdByToken();
             Doctor doctorInfo = doctorService.getDoctorInfo(doctorId.intValue());
+            Map<String, Object> headersMap = super.getHeaders();
+            if (StringUtil.isNotNull(doctorInfo)) {
                 Integer acctId = doctorInfo.getAcctId();
                 redisClient.deleteToken(token);
-            Map<String, Object> headersMap = super.getHeaders();
                 String newToken = tokenService.getToken(headersMap);
                 LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, super.getProductType(), super.getSourceType(),
                         AccountTypeEnum.LOGIN_OUT.getCode(), super.getIpAddr(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode(),
                         newToken,0,super.getUserTokenTourist());
                 picaLogUtils.info(entity);
                 return PicaResponse.toResponse(newToken);
+            } else {
+                String newToken = tokenService.getToken(headersMap);
+                return PicaResponse.toResponse(newToken);
+            }
         } else {
             throw new AccountException(AccountExceptionEnum.PICA_LOGIN_AGAIN);
         }

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

@@ -2,6 +2,7 @@ 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;
 import com.pica.cloud.account.account.server.entity.*;
@@ -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.*;
@@ -19,6 +23,7 @@ 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;
@@ -126,6 +131,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>