Merge branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform

 Conflicts:

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

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/epmet-auth:0.3.100
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/epmet-auth:version_placeholder
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

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

@@ -130,6 +130,8 @@ public class GovWebServiceImpl implements GovWebService {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode());
             }
             String orgIdPath = thirdLoginService.getOrgIdPath(userId);
+            log.info("【SSO登录gov web端】orgIdPath:{}", orgIdPath);
+
             int expire = jwtTokenProperties.getExpire();
             GovTokenDto tokenDto = new GovTokenDto();
             tokenDto.setCustomerId(customerId);