Эх сурвалжийг харах

Merge branch 'hotfix/1.1.0-alpha.03'

cc12458 3 долоо хоног өмнө
parent
commit
f0175470e4

+ 8 - 3
TYUsbSDK/src/main/java/com/taiyi/tyusbsdk/OssFileUtil.java

@@ -17,7 +17,7 @@ import com.alibaba.sdk.android.oss.model.PutObjectRequest;
 import com.alibaba.sdk.android.oss.model.PutObjectResult;
 
 import io.reactivex.annotations.Nullable;
-
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
@@ -55,8 +55,13 @@ public class OssFileUtil {
         if (requestUrl.startsWith(prefix)) {
           String proxyUrl = requestUrl.replaceFirst(prefix, proxy);
           android.util.Log.d("log:proxy", "[oss] OkHttp URL: " + proxyUrl + " (" + prefix + ")");
-          Request proxyRequest = originalRequest.newBuilder().url(proxyUrl).build();
-          return chain.proceed(proxyRequest);
+          Request.Builder proxyRequest = originalRequest.newBuilder().url(proxyUrl);
+
+          // 同步修改 Host 头
+          HttpUrl url = HttpUrl.parse(proxy);
+          if (url != null && url.host() != null) proxyRequest.header("host", url.host());
+
+          return chain.proceed(proxyRequest.build());
         } else {
           android.util.Log.d("log:proxy", "[oss] OkHttp URL: " + requestUrl);
           return chain.proceed(originalRequest);

+ 1 - 1
ble/gradle.properties

@@ -1,3 +1,3 @@
 MAVEN_LIB_ARTIFACTID=ble
-MAVEN_LIB_VERSION=1.1.0-alpha.02
+MAVEN_LIB_VERSION=1.1.0-alpha.03
 MAVEN_LIB_DESCRIPTION=six.pulse:packag