From 8c3f7605718d7b5b3f3fa6de8922c5ee132b0890 Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期一, 08 四月 2024 14:04:25 +0800
Subject: [PATCH] 提供ip转地区离线查询（未完成）
---
walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java | 14 ++++++++------
walker-web/src/main/java/com/walker/web/agent/BrowserCapWebAgentService.java | 3 +--
walker-ml-openocr/src/test/java/com/walker/openocr/BaiduOcrTest.java | 3 ++-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/walker-ml-openocr/src/test/java/com/walker/openocr/BaiduOcrTest.java b/walker-ml-openocr/src/test/java/com/walker/openocr/BaiduOcrTest.java
index 2caa2c4..63e1475 100644
--- a/walker-ml-openocr/src/test/java/com/walker/openocr/BaiduOcrTest.java
+++ b/walker-ml-openocr/src/test/java/com/walker/openocr/BaiduOcrTest.java
@@ -87,7 +87,8 @@
// String path = "F:/app_ocr_demo/ocr_oil_002.jpg";
// String path = "F:/app_ocr_demo/ocr_oil_010.jpg";
// String path = "F:/app_ocr_demo/ocr_oil_014.jpg";
- String path = "F:/app_ocr_demo/ocr_e_002.jpg";
+// String path = "F:/app_ocr_demo/ocr_e_002.jpg";
+ String path = "F:/app_ocr_demo/ocr_e_022.jpg";
// String path = "F:/app_ocr_demo/ocr_oil_017.jpg";
// String path = "F:/app_ocr_demo/ocr_oil_011.jpg";
// JSONObject res = client.basicGeneral(path, options);
diff --git a/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java b/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java
index 804dd28..c2d3606 100644
--- a/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java
+++ b/walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java
@@ -30,7 +30,7 @@
System.out.println(MoneyUtils.scaleYuan2Accuracy(1));
}
-// @Test
+ @Test
public void payAliAnDf(){
RestTemplate restTemplate = this.getRestTemplate();
PayEngineProvider payEngineProvider = new PayUnkEngineProvider(restTemplate);
@@ -42,11 +42,11 @@
order.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
order.setPayType(PayType.PayUnk_BEHALF_ALIPAY_ONE);
order.setPayDefinitionId("3");
- order.setTotalMoney(12);
+ order.setTotalMoney(10);
order.setNotifyUrl("http://47.99.216.98:8082/admin/front/kyzt/receipt/pay/notify");
// order.setNotifyUrl(Constants.CALL_BACK_SUCCESS);
order.setIp("127.0.0.1");
- order.setTitle("鍔犳补鍟嗗搧");
+ order.setTitle("娴嬭瘯鍟嗗搧");
String attach = "order," + 9987654321L;
order.setAttach(attach);
// 鏀粯瀹濅釜浜鸿处鍙�
@@ -70,8 +70,10 @@
configuration.put(Constants.CONFIG_KEY_APPID, new DefaultVariable(VariableType.String, "APP202310209174137956073295", null).setId(Constants.CONFIG_KEY_APPID));
// 鏀粯瀹滱鐗堜唬浠樺埌鎴风紪鍙凤細3635
configuration.put(Constants.CONFIG_KEY_USER_ACCOUNT_ID, new DefaultVariable(VariableType.String, "3635", null).setId(Constants.CONFIG_KEY_USER_ACCOUNT_ID));
- configuration.put(Constants.CONFIG_KEY_ALIPAY_IDENTITY, new DefaultVariable(VariableType.String, "2088820986081574", null).setId(Constants.CONFIG_KEY_ALIPAY_IDENTITY));
- configuration.put(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO, new DefaultVariable(VariableType.String, "20235824012463444332", null).setId(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO));
+// configuration.put(Constants.CONFIG_KEY_ALIPAY_IDENTITY, new DefaultVariable(VariableType.String, "2088820986081574", null).setId(Constants.CONFIG_KEY_ALIPAY_IDENTITY));
+// configuration.put(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO, new DefaultVariable(VariableType.String, "20235824012463444332", null).setId(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO));
+ configuration.put(Constants.CONFIG_KEY_ALIPAY_IDENTITY, new DefaultVariable(VariableType.String, "identity", null).setId(Constants.CONFIG_KEY_ALIPAY_IDENTITY));
+ configuration.put(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO, new DefaultVariable(VariableType.String, "agreement", null).setId(Constants.CONFIG_KEY_ALIPAY_AGREEMENT_NO));
return configuration;
}
@@ -79,7 +81,7 @@
RestTemplateConfig config = new RestTemplateConfig();
config.setKeepAliveDurationSeconds(300);
config.setMaxIdleConnections(20);
- config.setConnectTimeoutSeconds(2);
+ config.setConnectTimeoutSeconds(3);
config.setReadTimeoutSeconds(3);
config.setWriteTimeoutSeconds(3);
diff --git a/walker-web/src/main/java/com/walker/web/agent/BrowserCapWebAgentService.java b/walker-web/src/main/java/com/walker/web/agent/BrowserCapWebAgentService.java
index 2511915..11d8567 100644
--- a/walker-web/src/main/java/com/walker/web/agent/BrowserCapWebAgentService.java
+++ b/walker-web/src/main/java/com/walker/web/agent/BrowserCapWebAgentService.java
@@ -3,7 +3,6 @@
import com.walker.web.WebAgentService;
import com.walker.web.WebUserAgent;
import com.walker.web.util.IpUtils;
-import org.lionsoul.ip2region.xdb.Searcher;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
@@ -18,7 +17,7 @@
private UserAgentParser parser = null;
// 鎼滅储鍦板尯鐨勬湰鍦板璞★紙璇诲彇鏈湴xdb鏁版嵁搴擄級锛�2024-04-02
- private Searcher searcher = null;
+// private Searcher searcher = null;
public BrowserCapWebAgentService(){
try {
--
Gitblit v1.9.1