From 8d0d2ac5db499a72cc029c6c5ced1d4f82c2c4d1 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期一, 06 九月 2021 16:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/controller/app/PaymentController.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java b/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java
index 55bfc7f..de97ad6 100755
--- a/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java
+++ b/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java
@@ -19,18 +19,11 @@
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
-import com.java110.front.smo.payment.IOweFeeToNotifySMO;
-import com.java110.front.smo.payment.IRentingToNotifySMO;
-import com.java110.front.smo.payment.IRentingToPaySMO;
-import com.java110.front.smo.payment.IToNotifySMO;
-import com.java110.front.smo.payment.IToPayBackCitySMO;
-import com.java110.front.smo.payment.IToPayInGoOutSMO;
-import com.java110.front.smo.payment.IToPayOweFeeSMO;
-import com.java110.front.smo.payment.IToPaySMO;
-import com.java110.front.smo.payment.IToPayTempCarInoutSMO;
-import com.java110.front.smo.payment.IToQrPayOweFeeSMO;
+import com.java110.front.smo.payment.*;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.StringUtil;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +34,11 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
/**
* 鏀粯 澶勭悊绫�
@@ -208,11 +206,25 @@
for (String key : request.getParameterMap().keySet()) {
paramIn.put(key, request.getParameter(key));
logger.debug("閾惰仈鍥炶皟鎶ユ枃form" + key + ":: " + request.getParameter(key));
-
}
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + paramIn.toJSONString());
+ /*鎺ユ敹鍙傛暟*/
+ Map<String, String> params = getRequestParams(request);
+ System.out.println("params:" + params);
+ String sign = params.get("sign");
+ System.out.println(sign);
+
+
+ String preStr = buildSignString(params);
+ paramIn.put("preSign",preStr);
+ paramIn.put("sign",sign);
+ //鍒ゆ柇绛惧悕鏄惁鐩哥瓑
+
+ // 鏀跺埌閫氱煡鍚庤寰楄繑鍥濻UCCESS
return toNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
+
+
}
@@ -249,6 +261,16 @@
paramIn.put(key, request.getParameter(key));
}
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + paramIn.toJSONString());
+ /*鎺ユ敹鍙傛暟*/
+ Map<String, String> params = getRequestParams(request);
+ System.out.println("params:" + params);
+ String sign = params.get("sign");
+ System.out.println(sign);
+
+
+ String preStr = buildSignString(params);
+ paramIn.put("preSign",preStr);
+ paramIn.put("sign",sign);
return oweFeeToNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
}
@@ -302,4 +324,45 @@
return toQrPayOweFeeSMOImpl.toPay(newPd);
}
+ // 鏋勫缓绛惧悕瀛楃涓�
+ public static String buildSignString(Map<String, String> params) {
+
+ // params.put("Zm","test_test");
+
+ if (params == null || params.size() == 0) {
+ return "";
+ }
+
+ List<String> keys = new ArrayList<>(params.size());
+
+ for (String key : params.keySet()) {
+ if ("sign".equals(key))
+ continue;
+ if ("wId".equals(key))
+ continue;
+ if (StringUtils.isEmpty(params.get(key)))
+ continue;
+ keys.add(key);
+ }
+ //System.out.println(listToString(keys));
+
+ Collections.sort(keys);
+
+ StringBuilder buf = new StringBuilder();
+
+ for (int i = 0; i < keys.size(); i++) {
+ String key = keys.get(i);
+ String value = params.get(key);
+
+ if (i == keys.size() - 1) {// 鎷兼帴鏃讹紝涓嶅寘鎷渶鍚庝竴涓�&瀛楃
+ buf.append(key + "=" + value);
+ } else {
+ buf.append(key + "=" + value + "&");
+ }
+ }
+
+ return buf.toString();
+ }
+
+
}
--
Gitblit v1.8.0