From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/ChinaUmsFactory.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/ChinaUmsFactory.java b/java110-core/src/main/java/com/java110/core/factory/ChinaUmsFactory.java
index c43e3bb..f5949c6 100644
--- a/java110-core/src/main/java/com/java110/core/factory/ChinaUmsFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/ChinaUmsFactory.java
@@ -7,12 +7,16 @@
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.Hex;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
@@ -76,14 +80,22 @@
JSONObject paramMap = new JSONObject();
paramMap.put("appId", appId);
- paramMap.put("timestamp", PayUtil.getCurrentTimeStamp());
+ paramMap.put("timestamp", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
paramMap.put("nonce", PayUtil.makeUUID(32));
paramMap.put("signMethod", "SHA256");
paramMap.put("signature", getSignature(paramMap, appSecure));
RestTemplate outRestTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
- ResponseEntity<String> response = outRestTemplate.postForEntity(url, paramMap.toJSONString(), String.class);
+ logger.debug("鑾峰彇access_token 鍏ュ弬锛�" + url + " 璇锋眰鍙傛暟" + paramMap.toJSONString());
+
+ //ResponseEntity<String> response = outRestTemplate.postForEntity(url, paramMap.toJSONString(), String.class);
+
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ HttpEntity httpEntity = new HttpEntity(paramMap.toJSONString(), headers);
+ ResponseEntity<String> response = outRestTemplate.exchange(
+ url, HttpMethod.POST, httpEntity, String.class);
logger.debug("鑾峰彇access_token 鍏ュ弬锛�" + url + " 杩斿洖鍙傛暟" + response);
--
Gitblit v1.8.0