Skip to content

G
gdtel-gztel-school-center
Commit a28cb087 by 罗承锋
Options

关闭所有http代理

parent b0b4850c
Showing with 54 additions and 37 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
......@@ -523,7 +523,7 @@ public class DankuanController {
// 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay
doc =
Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay")
.proxy("172.18.101.170", 3128)
// .proxy("172.18.101.170", 3128)
.data(map)
.timeout(20000)
.ignoreContentType(true)
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -417,7 +417,7 @@ public class RongHeController {
// 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay
doc =
Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay")
.proxy("172.18.101.170", 3128)
// .proxy("172.18.101.170", 3128)
.data(map)
.timeout(20000)
.ignoreContentType(true)
......
common/src/main/java/com/winsun/constant/Constant.java
......@@ -32,7 +32,7 @@ public class Constant {
public final static String USERNAME = "apitest"; //智能平台提供测试的账号
public final static String USERNAMEKEY = "46b97294d4dac3f62ee42f3ab2804f68"; //智能平台提供的测试key
public final static String ZHENGSHIAUCCON = "ruany"; //智能平台提供的正式账号
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
......@@ -250,13 +250,13 @@ public class IntelligenceSendOrder {
private JSONObject getQueryOrderInfo(
String orderNum, String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -344,13 +344,13 @@ public class IntelligenceSendOrder {
int count)
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -701,13 +701,13 @@ public class IntelligenceSendOrder {
private JSONObject getProductId(String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -786,13 +786,13 @@ public class IntelligenceSendOrder {
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -1018,13 +1018,13 @@ public class IntelligenceSendOrder {
}
}
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -1549,13 +1549,13 @@ public class IntelligenceSendOrder {
}
// 3、提交订单到智能平台
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
.setConnectTimeout(500000)
.setConnectionRequestTimeout(500000)
.setProxy(proxy)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
......@@ -79,9 +79,11 @@ public class HttpUtil {
}
request.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
/** 超时时间 5s 重试次数 3 */
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
.setProxy(proxy).build();
.build();
// RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
// .setProxy(proxy).build();
request.setConfig(requestConfig);
// 发�?�请�?
log.info(request.getMethod());
......
common/src/main/java/com/winsun/utils/HTTPSClient.java
......@@ -108,8 +108,12 @@ public class HTTPSClient {
HttpResponse res;
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(200000).setConnectTimeout(200000).setProxy(proxy).build();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().
setSocketTimeout(200000).
setConnectTimeout(200000)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost);
......@@ -155,8 +159,12 @@ public class HTTPSClient {
httpPost.setEntity(s);
HttpResponse res;
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(200000).setConnectTimeout(200000).setProxy(proxy).build();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000)
.setConnectTimeout(200000)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost);
......@@ -327,8 +335,12 @@ public class HTTPSClient {
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(url);
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(200000).setConnectTimeout(200000).setProxy(proxy).build();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000)
.setConnectTimeout(200000)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost);
string = EntityUtils.toString(result.getEntity(), "utf-8"); ;
......
common/src/main/java/com/winsun/utils/HttpHelper.java
......@@ -174,8 +174,12 @@ public class HttpHelper {
HttpPost httpPost = new HttpPost(url);
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(200000).setConnectTimeout(200000).setProxy(proxy).build();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000).
setConnectTimeout(200000)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost);
......@@ -214,8 +218,12 @@ public class HttpHelper {
HttpResponse res;
try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(200000).setConnectTimeout(200000).setProxy(proxy).build();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig
.custom().setSocketTimeout(200000)
.setConnectTimeout(200000)
// .setProxy(proxy)
.build();
httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost);
......
core-service/pom.xml
......@@ -115,12 +115,6 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
</build>
</project>
\ No newline at end of file
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
......@@ -95,7 +95,7 @@ public class GetPhoneCodeController extends BaseController {
}else {
if (user.getPhone().length() == 11){
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
sent.put("message", "发送成功");
sent.put("message", "发送成功");
sent.put("code", 200);
}else {
sent.put("message","当前用户手机号码不合法！");
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -1438,9 +1438,11 @@ public class OrderController extends BaseController {
// 保存卡品认证信息
public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException {
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
.setConnectionRequestTimeout(600000).setProxy(proxy).build();
.setConnectionRequestTimeout(600000)
// .setProxy(proxy)
.build();
CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......
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