From 295f86b52b7c4197650279f7d4c68dc04bdcbb35 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Jul 2020 14:43:56 +0800
Subject: [PATCH] ceshi

---
 epmet-auth/deploy/docker-compose-dev.yml                 | 2 +-
 epmet-auth/pom.xml                                       | 2 +-
 .../epmet/service/impl/PublicUserLoginServiceImpl.java   | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index ad3dd6d4aa..e8077fda32 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/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.38
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.39
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index a816d16575..e5b8e313fa 100644
--- a/epmet-auth/pom.xml
+++ b/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.38</version>
+    <version>0.3.39</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
index e6386e757b..b4c7092507 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
@@ -47,8 +47,13 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
             e.printStackTrace();
             throw new RenException("解析微信用户信息失败"+e.getMessage());
         }
-        if (null == wxMpUser || StringUtils.isBlank(wxMpUser.getUnionId())) {
-            throw new RenException("解析微信用户信息失败");
+        if (null == wxMpUser ) {
+            logger.error("wxMpUser is null");
+            throw new RenException("解析微信用户信息失败 wxMpUser is null");
+        }
+        if(StringUtils.isBlank(wxMpUser.getUnionId())){
+            logger.error("wxMpUser.getUnionId() is  null");
+//            throw new RenException("解析微信用户信息失败");
         }
         return wxMpUser;
     }