Skip to content

M
MiYaFastCashier
Commit 59ea0474 authored by 赵鹏翔's avatar 赵鹏翔
Browse files
Options

网络层修改，基于kotlin版本的okhttp3进行优化

parent 2328fa41
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 4 deletions
lib_common/src/main/java/com/fastcashier/lib_common/net/ApiClient.kt
View file @ 59ea0474
......@@ -27,13 +27,26 @@ class ApiClient private constructor() {
}
private fun generateClient(): Retrofit {
val httpLoggingInterceptor =
MiyaHttpLoggingInterceptor {
Log.e("####", it)
val httpLoggingInterceptor = MiyaHttpLoggingInterceptor(logger = object :MiyaHttpLoggingInterceptor.Logger{
override fun log(it: String?) {
Log.e("####", it!!)
if (!LogFileUtils.isProhibitWrite) {
LogFileUtils.writeLog(BaseApplication.getApplication(), it)
}
}.apply { level = MiyaHttpLoggingInterceptor.Level.BODY }
}
}).apply {
level = MiyaHttpLoggingInterceptor.Level.BODY
}
// val httpLoggingInterceptor =
// MiyaHttpLoggingInterceptor {
// Log.e("####", it)
// if (!LogFileUtils.isProhibitWrite) {
// LogFileUtils.writeLog(BaseApplication.getApplication(), it)
// }
// }
// .apply { level = MiyaHttpLoggingInterceptor.Level.BODY }
val socketFactory = arrayOfNulls<SSLSocketFactory>(1)
......
lib_common/src/main/java/com/fastcashier/lib_common/net/MiyaHttpLoggingInterceptor.java → lib_common/src/main/java/com/fastcashier/lib_common/net/MiyaHttpLoggingInterceptor.kt
View file @ 59ea0474
package com.fastcashier.lib_common.net;
import java.io.EOFException;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.util.concurrent.TimeUnit;
import okhttp3.Connection;
import okhttp3.Headers;
import okhttp3.Interceptor;
import okhttp3.MediaType;
import okhttp3.Protocol;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;
import okhttp3.internal.http.HttpHeaders;
import okhttp3.internal.platform.Platform;
import okio.Buffer;
import okio.BufferedSource;
package com.fastcashier.lib_common.net
import okhttp3.*
import okhttp3.internal.http.promisesBody
import okhttp3.internal.platform.Platform
import okhttp3.internal.platform.Platform.Companion.INFO
import okio.Buffer
import java.io.EOFException
import java.io.IOException
import java.nio.charset.Charset
import java.nio.charset.UnsupportedCharsetException
import java.util.concurrent.TimeUnit
/**
* 基于原本的MiyaHttpLoggingInterceptor,本类做了如下改动：
* 1. 请求整体写入，响应整体写入。但是请求和响应本身并不同时整体写入
*/
public final class MiyaHttpLoggingInterceptor implements Interceptor {
private static final Charset UTF8 = Charset.forName("UTF-8");
public enum Level {
class MiyaHttpLoggingInterceptor @JvmOverloads constructor(private val logger: Logger = Logger.DEFAULT) :
Interceptor {
enum class Level {
/**
* No logs.
*/
NONE,
/**
* Logs request and response lines.
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1 (3-byte body)
*
* Example:
* <pre>`--> POST /greeting http/1.1 (3-byte body)
*
* <-- 200 OK (22ms, 6-byte body)
* }</pre>
`</pre> *
*/
BASIC,
/**
* Logs request and response lines and their respective headers.
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1
*
* Example:
* <pre>`--> POST /greeting http/1.1
* Host: example.com
* Content-Type: plain/text
* Content-Length: 3
......@@ -59,15 +50,16 @@ public final class MiyaHttpLoggingInterceptor implements Interceptor {
* Content-Type: plain/text
* Content-Length: 6
* <-- END HTTP
* }</pre>
`</pre> *
*/
HEADERS,
/**
* Logs request and response lines and their respective headers and bodies (if present).
*
* <p>Example:
* <pre>{@code
* --> POST /greeting http/1.1
*
* Example:
* <pre>`--> POST /greeting http/1.1
* Host: example.com
* Content-Type: plain/text
* Content-Length: 3
......@@ -81,219 +73,216 @@ public final class MiyaHttpLoggingInterceptor implements Interceptor {
*
* Hello!
* <-- END HTTP
* }</pre>
`</pre> *
*/
BODY
}
public interface Logger {
void log(String message);
interface Logger {
fun log(message: String?)
/**
* A {@link Logger} defaults output appropriate for the current platform.
*/
Logger DEFAULT = new Logger() {
@Override
public void log(String message) {
Platform.get().log( message, Platform.INFO,null);
companion object {
/**
* A [Logger] defaults output appropriate for the current platform.
*/
val DEFAULT: Logger = object : Logger {
override fun log(message: String?) {
Platform.get().log(message!!, INFO, null)
}
}
};
}
public MiyaHttpLoggingInterceptor() {
this(Logger.DEFAULT);
}
public MiyaHttpLoggingInterceptor(Logger logger) {
this.logger = logger;
}
}
private final Logger logger;
private volatile Level level = Level.NONE;
@Volatile
var level = Level.NONE
/**
* Change the level at which this interceptor logs.
*/
public MiyaHttpLoggingInterceptor setLevel(Level level) {
if (level == null) throw new NullPointerException("level == null. Use Level.NONE instead.");
this.level = level;
return this;
fun setLevel(level: Level?): MiyaHttpLoggingInterceptor {
if (level == null) throw NullPointerException("level == null. Use Level.NONE instead.")
this.level = level
return this
}
public Level getLevel() {
return level;
}
@Override
public Response intercept(Chain chain) throws IOException {
Level level = this.level;
Request request = chain.request();
@Throws(IOException::class)
override fun intercept(chain: Interceptor.Chain): Response {
val level = level
val request: Request = chain.request()
if (level == Level.NONE) {
return chain.proceed(request);
return chain.proceed(request)
}
boolean logBody = level == Level.BODY;
boolean logHeaders = logBody || level == Level.HEADERS;
RequestBody requestBody = request.body();
boolean hasRequestBody = requestBody != null;
Connection connection = chain.connection();
Protocol protocol = connection != null ? connection.protocol() : Protocol.HTTP_1_1;
String requestStartMessage = "--> " + request.method() + ' ' + request.url() + ' ' + protocol;
val logBody = level == Level.BODY
val logHeaders = logBody || level == Level.HEADERS
val requestBody = request.body
val hasRequestBody = requestBody != null
val connection: Connection? = chain.connection()
val protocol = (connection?.protocol() ?: Protocol.HTTP_1_1)
var requestStartMessage = "--> " + request.method + ' ' + request.url + ' ' + protocol
if (!logHeaders && hasRequestBody) {
requestStartMessage += " (" + requestBody.contentLength() + "-byte body)";
requestStartMessage += " (" + requestBody!!.contentLength() + "-byte body)"
}
StringBuilder sbRequest = new StringBuilder();
sbRequest.append(requestStartMessage);
sbRequest.append("\n");
val sbRequest = StringBuilder()
sbRequest.append(requestStartMessage)
sbRequest.append("\n")
if (logHeaders) {
if (hasRequestBody) {
// Request body headers are only present when installed as a network interceptor. Force
// them to be included (when available) so there values are known.
if (requestBody.contentType() != null) {
sbRequest.append("Content-Type: ").append(requestBody.contentType()).append("\n");
if (requestBody!!.contentType() != null) {
sbRequest.append("Content-Type: ").append(requestBody.contentType())
.append("\n")
}
if (requestBody.contentLength() != -1) {
sbRequest.append("Content-Length: ").append(requestBody.contentLength()).append("\n");
if (requestBody.contentLength() != -1L) {
sbRequest.append("Content-Length: ").append(requestBody.contentLength())
.append("\n")
}
}
Headers headers = request.headers();
for (int i = 0, count = headers.size(); i < count; i++) {
String name = headers.name(i);
val headers = request.headers
var i = 0
val count = headers.size
while (i < count) {
val name = headers.name(i)
// Skip headers from the request body as they are explicitly logged above.
if (!"Content-Type".equalsIgnoreCase(name) && !"Content-Length".equalsIgnoreCase(name)) {
sbRequest.append(name).append(": ").append(headers.value(i)).append("\n");
if (!"Content-Type".equals(
name,
ignoreCase = true
) && !"Content-Length".equals(name, ignoreCase = true)
) {
sbRequest.append(name).append(": ").append(headers.value(i)).append("\n")
}
i++
}
if (!logBody || !hasRequestBody) {
sbRequest.append("--> END ").append(request.method()).append("\n");
} else if (bodyEncoded(request.headers())) {
sbRequest.append("--> END ").append(request.method()).append(" (encoded body omitted)").append("\n");
sbRequest.append("--> END ").append(request.method).append("\n")
} else if (bodyEncoded(request.headers)) {
sbRequest.append("--> END ").append(request.method)
.append(" (encoded body omitted)").append("\n")
} else {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
Charset charset = UTF8;
MediaType contentType = requestBody.contentType();
val buffer = Buffer()
requestBody!!.writeTo(buffer)
var charset = UTF8
val contentType = requestBody.contentType()
if (contentType != null) {
charset = contentType.charset(UTF8);
charset = contentType.charset(UTF8)
}
if (isPlaintext(buffer)) {
sbRequest.append(buffer.readString(charset)).append("\n");
sbRequest.append("--> END ").append(request.method()).append(" (").append(requestBody.contentLength()).append("-byte body)").append("\n");
sbRequest.append(buffer.readString(charset!!)).append("\n")
sbRequest.append("--> END ").append(request.method).append(" (").append(
requestBody.contentLength()
).append("-byte body)").append("\n")
} else {
sbRequest.append("--> END ").append(request.method()).append(" (binary ").append(requestBody.contentLength()).append("-byte body omitted)").append("\n");
sbRequest.append("--> END ").append(request.method).append(" (binary ").append(
requestBody.contentLength()
).append("-byte body omitted)").append("\n")
}
}
}
logger.log(sbRequest.toString());//一次写入
StringBuilder sbResponse = new StringBuilder();
long startNs = System.nanoTime();
Response response;
try {
response = chain.proceed(request);
} catch (Exception e) {
sbResponse.append("<-- HTTP FAILED: ").append(e).append("\n");
logger.log(sbResponse.toString());
throw e;
logger.log(sbRequest.toString()) //一次写入
val sbResponse = StringBuilder()
val startNs = System.nanoTime()
val response: Response
response = try {
chain.proceed(request)
} catch (e: Exception) {
sbResponse.append("<-- HTTP FAILED: ").append(e).append("\n")
logger.log(sbResponse.toString())
throw e
}
long tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
ResponseBody responseBody = response.body();
long contentLength = responseBody.contentLength();
String bodySize = contentLength != -1 ? contentLength + "-byte" : "unknown-length";
val tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs)
val responseBody = response.body
val contentLength = responseBody!!.contentLength()
val bodySize = if (contentLength != -1L) "$contentLength-byte" else "unknown-length"
sbResponse.append("<-- ")
.append(response.code())
.append(' ')
.append(response.message())
.append(' ')
.append(response.request().url())
.append(" (")
.append(tookMs)
.append("ms")
.append(!logHeaders ? ", " + bodySize + " body" : "")
.append(')')
.append("\n");
.append(response.code)
.append(' ')
.append(response.message)
.append(' ')
.append(response.request.url)
.append(" (")
.append(tookMs)
.append("ms")
.append(if (!logHeaders) ", $bodySize body" else "")
.append(')')
.append("\n")
if (logHeaders) {
Headers headers = response.headers();
for (int i = 0, count = headers.size(); i < count; i++) {
sbResponse.append(headers.name(i)).append(": ").append(headers.value(i)).append("\n");
val headers = response.headers
var i = 0
val count = headers.size
while (i < count) {
sbResponse.append(headers.name(i)).append(": ").append(headers.value(i))
.append("\n")
i++
}
if (!logBody || !HttpHeaders.hasBody(response)) {
sbResponse.append("<-- END HTTP").append("\n");
} else if (bodyEncoded(response.headers())) {
sbResponse.append("<-- END HTTP (encoded body omitted)").append("\n");
if (!logBody || !response.promisesBody()) {
sbResponse.append("<-- END HTTP").append("\n")
} else if (bodyEncoded(response.headers)) {
sbResponse.append("<-- END HTTP (encoded body omitted)").append("\n")
} else {
BufferedSource source = responseBody.source();
source.request(Long.MAX_VALUE); // Buffer the entire body.
Buffer buffer = source.buffer();
Charset charset = UTF8;
MediaType contentType = responseBody.contentType();
val source = responseBody.source()
source.request(Long.MAX_VALUE) // Buffer the entire body.
val buffer = source.buffer()
var charset = UTF8
val contentType = responseBody.contentType()
if (contentType != null) {
try {
charset = contentType.charset(UTF8);
} catch (UnsupportedCharsetException e) {
sbResponse.append("Couldn't decode the response body; charset is likely malformed.").append("\n");
sbResponse.append("<-- END HTTP").append("\n");
logger.log(sbResponse.toString());
return response;
charset = try {
contentType.charset(UTF8)
} catch (e: UnsupportedCharsetException) {
sbResponse.append("Couldn't decode the response body; charset is likely malformed.")
.append("\n")
sbResponse.append("<-- END HTTP").append("\n")
logger.log(sbResponse.toString())
return response
}
}
if (!isPlaintext(buffer)) {
sbResponse.append("<-- END HTTP (binary ").append(buffer.size()).append("-byte body omitted)").append("\n");
logger.log(sbResponse.toString());
return response;
sbResponse.append("<-- END HTTP (binary ").append(buffer.size)
.append("-byte body omitted)").append("\n")
logger.log(sbResponse.toString())
return response
}
if (contentLength != 0) {
sbResponse.append(buffer.clone().readString(charset)).append("\n");
if (contentLength != 0L) {
sbResponse.append(buffer.clone().readString(charset!!)).append("\n")
}
sbResponse.append("<-- END HTTP (").append(buffer.size()).append("-byte body)").append("\n");
sbResponse.append("<-- END HTTP (").append(buffer.size).append("-byte body)")
.append("\n")
}
}
logger.log(sbResponse.toString());
return response;
logger.log(sbResponse.toString())
return response
}
/**
* 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;
private fun bodyEncoded(headers: Headers): Boolean {
val contentEncoding = headers["Content-Encoding"]
return contentEncoding != null && !contentEncoding.equals("identity", ignoreCase = true)
}
companion object {
private val UTF8 = Charset.forName("UTF-8")
/**
* 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.
*/
fun isPlaintext(buffer: Buffer): Boolean {
return try {
val prefix = Buffer()
val byteCount = if (buffer.size < 64) buffer.size else 64
buffer.copyTo(prefix, 0, byteCount)
for (i in 0..15) {
if (prefix.exhausted()) {
break
}
val codePoint = prefix.readUtf8CodePoint()
if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
return false
}
}
true
} catch (e: EOFException) {
false // Truncated UTF-8 sequence.
}
return true;
} catch (EOFException e) {
return false; // Truncated UTF-8 sequence.
}
}
private boolean bodyEncoded(Headers headers) {
String contentEncoding = headers.get("Content-Encoding");
return contentEncoding != null && !contentEncoding.equalsIgnoreCase("identity");
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment