Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

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.62
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.64
     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.62</version>
+    <version>0.3.64</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

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

@@ -507,6 +507,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     public PaCustomerDTO getCustomerInfo(String appId){
         JSONObject jsonObject = new JSONObject();
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData();
+        logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!mapToResult.success()) {
@@ -515,8 +516,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         }
         Object PublicCustomerResultDTO = mapToResult.getData();
         JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
-        PublicCustomerResultDTO publicCustomerResultDTO = ConvertUtils.mapToEntity(json, PublicCustomerResultDTO.class);
+        Map<String,Object> map = (Map)jsonObject.get("customer");
-        PaCustomerDTO customer  = publicCustomerResultDTO.getCustomer();
+        PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
+        logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer);
         return customer;
     }
 
@@ -527,6 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
      */
     public UserWechatDTO getUserWeChat(WxLoginFormDTO resiLoginFormDTO){
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL, JSON.toJSONString(resiLoginFormDTO)).getData();
+        logger.info("ThirdLoginServiceImpl.getUserWeChat：httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+"，结果->"+data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!mapToResult.success()) {
@@ -536,6 +539,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         Object UserWeChatDTO = mapToResult.getData();
         JSONObject json = JSON.parseObject(UserWeChatDTO.toString());
         UserWechatDTO userWechatDTO = ConvertUtils.mapToEntity(json, UserWechatDTO.class);
+        logger.info("小程序登陆third服务获取微信用户信息userWechatDTO->"+userWechatDTO);
         return userWechatDTO;
     }
 

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.24
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/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.0.23</version>
+    <version>0.0.24</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>