Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/UserTypeEnum.java

@@ -10,8 +10,8 @@ import lombok.Getter;
 @Getter
 public enum UserTypeEnum {
 
-    ZZD("1", "浙政钉用户"),
-    SH("2", "诗画"),
+    ZZD("1", "浙政钉用户登录失败"),
+    SH("2", "诗画用户登录失败"),
     ;
     private final String type;
     private final String description;

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java

@@ -410,10 +410,12 @@ public class ThirdPartyOAuth2Service {
             ResponseEntity<ApiResponse<ZZDUserDTO>> response = restTemplate.exchange(
                     url, HttpMethod.GET, requestEntity, responseType
             );
+//            if (true){
 
             if (response.getBody().getCode().equals("-1")){
                 log.error("获取浙政钉/诗画用户信息失败");
                 log.error("token",zzdToken);
+                log.error("response",JSON.toJSONString(response.getBody()));
                 ThirdPartyLogEntity thirdPartyLogEntity = new ThirdPartyLogEntity();
                 if (type.equals(UserTypeEnum.ZZD.getType())){
                     thirdPartyLogEntity.setApiName(UserTypeEnum.ZZD.getDescription());
@@ -421,7 +423,7 @@ public class ThirdPartyOAuth2Service {
                     thirdPartyLogEntity.setApiName(UserTypeEnum.SH.getDescription());
                 }
 //                thirdPartyLogEntity.setApiName("获取浙政钉/诗画用户信息失败");
-                thirdPartyLogEntity.setRequestUrl(url);
+                thirdPartyLogEntity.setRequestUrl( baseUrl + config.getZzdShUserInfoUrl());
                 thirdPartyLogEntity.setRequestParameter(zzdToken);
                 thirdPartyLogEntity.setResponseBody(JSON.toJSONString(response.getBody()));
                 thirdPartyLogEntity.setErrorCode(response.getBody().getCode());