diff --git a/src/main/java/quant/rich/emoney/client/EmoneyClient.java b/src/main/java/quant/rich/emoney/client/EmoneyClient.java index b2e3ba3..fda2c12 100644 --- a/src/main/java/quant/rich/emoney/client/EmoneyClient.java +++ b/src/main/java/quant/rich/emoney/client/EmoneyClient.java @@ -1,15 +1,6 @@ package quant.rich.emoney.client; import java.io.Serializable; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.Proxy.Type; -import java.net.SocketAddress; -import java.nio.charset.StandardCharsets; -import java.util.Map; - import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -23,18 +14,14 @@ import lombok.extern.slf4j.Slf4j; import nano.BaseResponse; import okhttp3.Call; import okhttp3.MediaType; -import okhttp3.OkHttp; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; import quant.rich.emoney.entity.config.EmoneyRequestConfig; -import quant.rich.emoney.entity.config.IndexInfoConfig; import quant.rich.emoney.exception.EmoneyDecodeException; import quant.rich.emoney.exception.EmoneyIllegalRequestParamException; import quant.rich.emoney.exception.EmoneyRequestException; import quant.rich.emoney.exception.EmoneyResponseException; -import quant.rich.emoney.patch.okhttp.PatchOkHttp; -import quant.rich.emoney.patch.okhttp.PatchOkHttpRule; import quant.rich.emoney.util.EncryptUtils; import quant.rich.emoney.util.SpringContextHolder; import okhttp3.OkHttpClient; @@ -117,12 +104,7 @@ public class EmoneyClient implements Cloneable { try { //OkHttpClient okHttpClient = new OkHttpClient(); - OkHttpClient okHttpClient = - IndexInfoConfig.getInstance().newBuilder() - .proxy(new Proxy( - Type.HTTP, - new InetSocketAddress("127.0.0.1", 8888) - )).build(); + OkHttpClient okHttpClient = OkHttpClientProvider.getInstance(); MediaType type = MediaType.parse("application/json"); //type.charset(StandardCharsets.UTF_8); byte[] content = formObject.toString().getBytes("utf-8"); @@ -192,7 +174,7 @@ public class EmoneyClient implements Cloneable { } try { - OkHttpClient okHttpClient = new OkHttpClient(); + OkHttpClient okHttpClient = OkHttpClientProvider.getInstance(); byte[] content = MessageNano.toByteArray(nanoRequest); RequestBody body = RequestBody.create(