shikeying
2024-04-08 8c3f7605718d7b5b3f3fa6de8922c5ee132b0890
提供ip转地区离线查询(未完成)
3个文件已修改
20 ■■■■■ 已修改文件
walker-ml-openocr/src/test/java/com/walker/openocr/BaiduOcrTest.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
walker-pay-support-payunk/src/test/java/com/walker/pay/payunk/TestPayUnkEngine.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
walker-web/src/main/java/com/walker/web/agent/BrowserCapWebAgentService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
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));
        // 支付宝A版代付到户编号: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);
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 {