http相关优化

This commit is contained in:
huangjian
2022-11-14 14:52:23 +08:00
parent 612a0e7392
commit 6d4efc2a7d
4 changed files with 275 additions and 265 deletions

View File

@@ -150,8 +150,8 @@ android {
debug { debug {
buildConfigField "String", "BASE_URL", "\"http://api.uat.lecheng163.com/\"" buildConfigField "String", "BASE_URL", "\"http://api.uat.lecheng163.com/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "\"https://yinyou.api.shengxuanwangluo.com/\""
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL" buildConfigField "String", "BASE_URL_RELEASE", "\"https://yinyou.api.shengxuanwangluo.com/\""
minifyEnabled false minifyEnabled false
shrinkResources false shrinkResources false
signingConfig signingConfigs.v1 signingConfig signingConfigs.v1

View File

@@ -515,7 +515,6 @@ public class XChatApplication extends Application {
.setBaseUrl(url) .setBaseUrl(url)
.addInterceptors(new ParamsInterceptor(httpParams)) .addInterceptors(new ParamsInterceptor(httpParams))
.addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序 .addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序
.certificates()
.build(); .build();
//单例的model 初始化 //单例的model 初始化
initModel(); initModel();

View File

@@ -15,6 +15,10 @@
*/ */
package com.mango.xchat_android_library.net.rxnet.interceptor; package com.mango.xchat_android_library.net.rxnet.interceptor;
import static okhttp3.internal.platform.Platform.INFO;
import androidx.annotation.NonNull;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@@ -38,8 +42,6 @@ import okio.Buffer;
import okio.BufferedSource; import okio.BufferedSource;
import okio.GzipSource; import okio.GzipSource;
import static okhttp3.internal.platform.Platform.INFO;
/** /**
* An OkHttp interceptor which logs request and response information. Can be applied as an * An OkHttp interceptor which logs request and response information. Can be applied as an
* {@linkplain OkHttpClient#interceptors() application interceptor} or as a {@linkplain * {@linkplain OkHttpClient#interceptors() application interceptor} or as a {@linkplain
@@ -49,69 +51,9 @@ import static okhttp3.internal.platform.Platform.INFO;
*/ */
public final class HttpLoggingInterceptor implements Interceptor { public final class HttpLoggingInterceptor implements Interceptor {
private static final Charset UTF8 = Charset.forName("UTF-8"); private static final Charset UTF8 = Charset.forName("UTF-8");
private final Logger logger;
public enum Level { private volatile Set<String> headersToRedact = Collections.emptySet();
/** No logs. */ private volatile Level level = Level.NONE;
NONE,
/**
* Logs request and response lines.
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1 (3-byte body)
*
* <-- 200 OK (22ms, 6-byte body)
* }</pre>
*/
BASIC,
/**
* Logs request and response lines and their respective headers.
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1
* Host: example.com
* Content-Type: plain/text
* Content-Length: 3
* --> END POST
*
* <-- 200 OK (22ms)
* Content-Type: plain/text
* Content-Length: 6
* <-- END HTTP
* }</pre>
*/
HEADERS,
/**
* Logs request and response lines and their respective headers and bodies (if present).
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1
* Host: example.com
* Content-Type: plain/text
* Content-Length: 3
*
* Hi?
* --> END POST
*
* <-- 200 OK (22ms)
* Content-Type: plain/text
* Content-Length: 6
*
* Hello!
* <-- END HTTP
* }</pre>
*/
BODY
}
public interface Logger {
void log(String message);
/** A {@link Logger} defaults output appropriate for the current platform. */
Logger DEFAULT = message -> Platform.get().log(INFO, message, null);
}
public HttpLoggingInterceptor() { public HttpLoggingInterceptor() {
this(Logger.DEFAULT); this(Logger.DEFAULT);
@@ -121,9 +63,36 @@ public final class HttpLoggingInterceptor implements Interceptor {
this.logger = logger; this.logger = logger;
} }
private final Logger logger; /**
* Returns true if the body in question probably contains human readable text. Uses a small sample
* of code points to detect unicode control characters commonly used in binary file signatures.
*/
static boolean isPlaintext(Buffer buffer) {
try {
Buffer prefix = new Buffer();
long byteCount = buffer.size() < 64 ? buffer.size() : 64;
buffer.copyTo(prefix, 0, byteCount);
for (int i = 0; i < 16; i++) {
if (prefix.exhausted()) {
break;
}
int codePoint = prefix.readUtf8CodePoint();
if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
return false;
}
}
return true;
} catch (EOFException e) {
return false; // Truncated UTF-8 sequence.
}
}
private volatile Set<String> headersToRedact = Collections.emptySet(); private static boolean bodyHasUnknownEncoding(Headers headers) {
String contentEncoding = headers.get("Content-Encoding");
return contentEncoding != null
&& !contentEncoding.equalsIgnoreCase("identity")
&& !contentEncoding.equalsIgnoreCase("gzip");
}
public void redactHeader(String name) { public void redactHeader(String name) {
Set<String> newHeadersToRedact = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); Set<String> newHeadersToRedact = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
@@ -132,20 +101,22 @@ public final class HttpLoggingInterceptor implements Interceptor {
headersToRedact = newHeadersToRedact; headersToRedact = newHeadersToRedact;
} }
private volatile Level level = Level.NONE; public Level getLevel() {
return level;
}
/** Change the level at which this interceptor logs. */ /**
* Change the level at which this interceptor logs.
*/
public HttpLoggingInterceptor setLevel(Level level) { public HttpLoggingInterceptor setLevel(Level level) {
if (level == null) throw new NullPointerException("level == null. Use Level.NONE instead."); if (level == null) throw new NullPointerException("level == null. Use Level.NONE instead.");
this.level = level; this.level = level;
return this; return this;
} }
public Level getLevel() { @NonNull
return level; @Override
} public Response intercept(Chain chain) throws IOException {
@Override public synchronized Response intercept(Chain chain) throws IOException {
Level level = this.level; Level level = this.level;
Request request = chain.request(); Request request = chain.request();
@@ -156,6 +127,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
boolean logBody = level == Level.BODY; boolean logBody = level == Level.BODY;
boolean logHeaders = logBody || level == Level.HEADERS; boolean logHeaders = logBody || level == Level.HEADERS;
synchronized (this) {
RequestBody requestBody = request.body(); RequestBody requestBody = request.body();
boolean hasRequestBody = requestBody != null; boolean hasRequestBody = requestBody != null;
@@ -217,6 +189,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
} }
} }
} }
}
long startNs = System.nanoTime(); long startNs = System.nanoTime();
Response response; Response response;
@@ -226,6 +199,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
logger.log("<-- HTTP FAILED: " + e); logger.log("<-- HTTP FAILED: " + e);
throw e; throw e;
} }
synchronized (this) {
long tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs); long tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
ResponseBody responseBody = response.body(); ResponseBody responseBody = response.body();
@@ -286,7 +260,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
} }
} }
} }
}
return response; return response;
} }
@@ -295,34 +269,70 @@ public final class HttpLoggingInterceptor implements Interceptor {
logger.log(headers.name(i) + ": " + value); logger.log(headers.name(i) + ": " + value);
} }
public enum Level {
/** /**
* Returns true if the body in question probably contains human readable text. Uses a small sample * No logs.
* of code points to detect unicode control characters commonly used in binary file signatures.
*/ */
static boolean isPlaintext(Buffer buffer) { NONE,
try { /**
Buffer prefix = new Buffer(); * Logs request and response lines.
long byteCount = buffer.size() < 64 ? buffer.size() : 64; *
buffer.copyTo(prefix, 0, byteCount); * <p>Example:
for (int i = 0; i < 16; i++) { * <pre>{@code
if (prefix.exhausted()) { * --> POST /greeting http/1.1 (3-byte body)
break; *
} * <-- 200 OK (22ms, 6-byte body)
int codePoint = prefix.readUtf8CodePoint(); * }</pre>
if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) { */
return false; BASIC,
} /**
} * Logs request and response lines and their respective headers.
return true; *
} catch (EOFException e) { * <p>Example:
return false; // Truncated UTF-8 sequence. * <pre>{@code
} * --> POST /greeting http/1.1
* Host: example.com
* Content-Type: plain/text
* Content-Length: 3
* --> END POST
*
* <-- 200 OK (22ms)
* Content-Type: plain/text
* Content-Length: 6
* <-- END HTTP
* }</pre>
*/
HEADERS,
/**
* Logs request and response lines and their respective headers and bodies (if present).
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1
* Host: example.com
* Content-Type: plain/text
* Content-Length: 3
*
* Hi?
* --> END POST
*
* <-- 200 OK (22ms)
* Content-Type: plain/text
* Content-Length: 6
*
* Hello!
* <-- END HTTP
* }</pre>
*/
BODY
} }
private static boolean bodyHasUnknownEncoding(Headers headers) { public interface Logger {
String contentEncoding = headers.get("Content-Encoding"); /**
return contentEncoding != null * A {@link Logger} defaults output appropriate for the current platform.
&& !contentEncoding.equalsIgnoreCase("identity") */
&& !contentEncoding.equalsIgnoreCase("gzip"); Logger DEFAULT = message -> Platform.get().log(INFO, message, null);
void log(String message);
} }
} }

View File

@@ -55,4 +55,5 @@
<Littleredbook Enable="false" /> <Littleredbook Enable="false" />
<Watermelonvideo Enable="false" /> <Watermelonvideo Enable="false" />
<Tiktok Enable="false" /> <Tiktok Enable="false" />
<Taptap Enable="false" />
</DevInfor> </DevInfor>