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

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.66
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.66</version>
+    <version>0.3.67</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@@ -283,13 +283,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
     public UserTokenResultDTO register(RegisterFormDTO formDTO) {
         //1.调用epmet-third服务，完成信息注册
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
+        logger.info("data数据为："+data);
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        logger.info("转换的result结果为："+result);
         if (!result.success()) {
             logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
             throw new RenException(result.getCode());
         }
         Object RegisterResult = result.getData();
+        logger.info("getData()数据为："+RegisterResult);
         JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
         RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class);