Commit 59ea0474 authored by 赵鹏翔's avatar 赵鹏翔

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

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