From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/util/charge/FuLuChargeApiUtil.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/charge/FuLuChargeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/charge/FuLuChargeApiUtil.java
index 8a16bf9..e59bfbe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/charge/FuLuChargeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/charge/FuLuChargeApiUtil.java
@@ -22,19 +22,18 @@
*
*/
public class FuLuChargeApiUtil {
- // 娴嬭瘯
- private final static String APP_KEY = "i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB";
- private final static String APP_SECRET = "0a091b3aa4324435aab703142518a8f7";
- // 姝ｅ紡
+ // 娌欑
// private final static String APP_KEY =
- // "CrtDnTh1E5eYY5D42T8uArVrl4GWq9AWR9ZrNC2qvXYIBMwOTuiJQy7YYaJSYlb6";
+ // "i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB";
// private final static String APP_SECRET =
- // "a5f6c827903e4b1eac6eb2ba2cf715be";
+ // "0a091b3aa4324435aab703142518a8f7";
+ // 姝ｅ紡
+ private final static String APP_KEY = "CrtDnTh1E5eYY5D42T8uArVrl4GWq9AWR9ZrNC2qvXYIBMwOTuiJQy7YYaJSYlb6";
+ private final static String APP_SECRET = "a5f6c827903e4b1eac6eb2ba2cf715be";
@SuppressWarnings("deprecation")
private static String post(String url, String body) {
HttpClient client = new HttpClient();
- // client.getHostConfiguration().setProxy("192.168.1.122", 8888);
PostMethod method = new PostMethod(url);
method.addRequestHeader("Content-Type", "application/json;charset=UTF-8");
method.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
@@ -51,8 +50,8 @@
}
private static void baseRequest(String method, JSONObject bizContent) throws FuLuChargeException {
- String url = "http://pre.openapi.fulu.com/api/getway";
-// String url = "http://openapi.fulu.com/api/getway";
+ // String url = "http://pre.openapi.fulu.com/api/getway";
+ String url = "http://openapi.fulu.com/api/getway";
Map<String, String> params = new HashMap<>();
params.put("app_key", APP_KEY);
params.put("method", method);
@@ -90,7 +89,6 @@
*/
public static void charge(String goodsNo, String orderId, String account) throws FuLuChargeException {
JSONObject json = new JSONObject();
- json.put("charge_type", "鐖卞鑹轰細鍛�");
json.put("customer_order_no", orderId);
json.put("product_id", goodsNo);
json.put("charge_account", account);
@@ -105,7 +103,7 @@
JSONObject json = new JSONObject();
json.put("charge_type", "鐖卞鑹轰細鍛�");
json.put("customer_order_no", orderId);
- json.put("product_id", "10000586 ");
+ json.put("product_id", "10000586");
json.put("charge_account", account);
json.put("buy_num", "1");
baseRequest("fulu.order.direct.add", json);
--
Gitblit v1.8.0