Skip to content

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

关闭代理、更新正式环境地址

parent 3e99e4ed
Showing with 21 additions and 16 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -477,17 +477,18 @@ public class DankuanController { ...@@ -477,17 +477,18 @@ public class DankuanController {
map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证 map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证
if (Constant.Payment1.equals(ipay)) { // if (Constant.Payment1.equals(ipay)) {
//支付成功回调的页面 //支付成功回调的页面
// String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id; // String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id;
String MERCHANTURL = "http://3715zj2369.qicp.vip/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id; // 正式地址
String MERCHANTURL = "https://dx.dianyuanjiangli.com/#/mobile/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
map.put("MERCHANTURL", MERCHANTURL); map.put("MERCHANTURL", MERCHANTURL);
} // }
//单宽回调后端接口地址 //单宽回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
//测试地址 //正式地址
map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/dankuan/toSubmisOrderPreser"); map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/dankuan/toSubmisOrderPreser");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识 String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -466,13 +466,16 @@ public class RongHeController { ...@@ -466,13 +466,16 @@ public class RongHeController {
//支付成功回调的页面 //支付成功回调的页面
/* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/ /* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
/* String MERCHANTURL = "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/ /* String MERCHANTURL = "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id; // 正式地址
String MERCHANTURL = "https://dx.dianyuanjiangli.com/#/mobile/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
// String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
map.put("MERCHANTURL", MERCHANTURL); map.put("MERCHANTURL", MERCHANTURL);
// } // }
// 融合回调后端接口地址 // 融合回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser");
// map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser"); // map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
map.put("BACKDROPURL", "http://chengfengluo.ngrok2.xiaomiqiu.cn/ciop/rongHe/toSubmisOrderPreser"); //正式地址
map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/rongHe/toSubmisOrderPreser");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识 String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
//* 将值转换为大写 *//* //* 将值转换为大写 *//*
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
...@@ -353,13 +353,13 @@ public class IntelligenceSendOrder { ...@@ -353,13 +353,13 @@ public class IntelligenceSendOrder {
int count) int count)
throws Exception { throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); 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 defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(50000) .setSocketTimeout(50000)
.setConnectTimeout(50000) .setConnectTimeout(50000)
.setConnectionRequestTimeout(50000) .setConnectionRequestTimeout(50000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -796,7 +796,7 @@ public class IntelligenceSendOrder { ...@@ -796,7 +796,7 @@ public class IntelligenceSendOrder {
throws Exception { throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数 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 defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
...@@ -1041,13 +1041,13 @@ public class IntelligenceSendOrder { ...@@ -1041,13 +1041,13 @@ public class IntelligenceSendOrder {
} }
} }
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); 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 defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
.setConnectTimeout(500000) .setConnectTimeout(500000)
.setConnectionRequestTimeout(500000) .setConnectionRequestTimeout(500000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -1572,13 +1572,13 @@ public class IntelligenceSendOrder { ...@@ -1572,13 +1572,13 @@ public class IntelligenceSendOrder {
} }
// 3、提交订单到智能平台 // 3、提交订单到智能平台
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); 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 defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
.setConnectTimeout(500000) .setConnectTimeout(500000)
.setConnectionRequestTimeout(500000) .setConnectionRequestTimeout(500000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......
migration/src/main/java/com/winsun/migration/service/impl/MigrationServiceImpl.java
...@@ -183,7 +183,8 @@ public class MigrationServiceImpl implements IMigrationService { ...@@ -183,7 +183,8 @@ public class MigrationServiceImpl implements IMigrationService {
this.insertYRYMUser(); this.insertYRYMUser();
this.migrationSchoolPackage(); // 此为新增（只要运行一次）
// this.migrationSchoolPackage();
} }
/** /**
......
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
...@@ -58,7 +58,7 @@ public class RhZhiNenTask { ...@@ -58,7 +58,7 @@ public class RhZhiNenTask {
* 下发智能平台订单 * 下发智能平台订单
* *
*/ */
@Scheduled(cron = "0 0/5 0 * * ? ") @Scheduled(cron = "0 0/6 * * * ? ")
// @Scheduled(fixedRate=2800000) // @Scheduled(fixedRate=2800000)
public void sendZhiNengOrder() { public void sendZhiNengOrder() {
log.info("智能平台定时器下单启动"); log.info("智能平台定时器下单启动");
......
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