瀏覽代碼

修正Retrofit异常情况下body内容解析问题;增加core-sms启动日志输出

Signed-off-by: luoshi <luoshi@qmth.com.cn>
luoshi 2 年之前
父節點
當前提交
6866d3ad40

+ 6 - 8
core-retrofit/src/main/java/com/qmth/boot/core/retrofit/interceptor/ErrorDecodeInterceptor.java

@@ -5,6 +5,8 @@ import okhttp3.*;
 import okio.Buffer;
 import okio.BufferedSource;
 import okio.GzipSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -12,6 +14,8 @@ import java.nio.charset.StandardCharsets;
 
 public class ErrorDecodeInterceptor implements Interceptor {
 
+    public static final Logger log = LoggerFactory.getLogger(ErrorDecodeInterceptor.class);
+
     public static final String GZIP = "gzip";
 
     public static final String CONTENT_ENCODING = "Content-Encoding";
@@ -44,7 +48,6 @@ public class ErrorDecodeInterceptor implements Interceptor {
             if (responseBody == null) {
                 return null;
             }
-            long contentLength = responseBody.contentLength();
 
             BufferedSource source = responseBody.source();
             // Buffer the entire body.
@@ -62,14 +65,9 @@ public class ErrorDecodeInterceptor implements Interceptor {
             if (contentType != null) {
                 charset = contentType.charset(StandardCharsets.UTF_8);
             }
-
-            if (contentLength > 0) {
-                return buffer.clone().readString(charset);
-            } else {
-                return null;
-            }
+            return buffer.clone().readString(charset);
         } catch (Exception e) {
-            //throw new RuntimeException(e);
+            log.error("Retrofit response decode error", e);
             return null;
         }
     }

+ 5 - 0
core-sms/src/main/java/com/qmth/boot/core/sms/config/SmsApiConfiguration.java

@@ -4,9 +4,13 @@ import com.qmth.boot.core.retrofit.interfaces.CustomizeRetrofitConfiguration;
 import com.qmth.boot.core.retrofit.interfaces.SignatureProvider;
 import com.qmth.boot.core.solar.config.SolarProperties;
 import com.qmth.boot.tools.signature.SignatureType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SmsApiConfiguration implements CustomizeRetrofitConfiguration {
 
+    private static final Logger log = LoggerFactory.getLogger(SmsApiConfiguration.class);
+
     private SmsProperties smsProperties;
 
     private SolarProperties solarProperties;
@@ -14,6 +18,7 @@ public class SmsApiConfiguration implements CustomizeRetrofitConfiguration {
     public SmsApiConfiguration(SmsProperties smsProperties, SolarProperties solarProperties) {
         this.smsProperties = smsProperties;
         this.solarProperties = solarProperties;
+        log.info("Sms api client inited, server=" + smsProperties.getServer());
     }
 
     public String getBaseUrl() {