From 55334da20cff4dac840c320eda1d0ca53ba27eda Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 23 九月 2024 14:26:36 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-xlk
---
src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java b/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java
index bdc522e..90fe3d4 100644
--- a/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java
+++ b/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java
@@ -3,6 +3,8 @@
import com.hx.util.OSSUtil;
import com.hx.util.SimpleTool;
import com.hx.util.StringUtils;
+import com.hz.util.http.HttpHzUtil;
+import com.hz.util.http.dto.HttpHzResponse;
import net.sf.json.JSONException;
import net.sf.json.JSONObject;
import org.apache.commons.codec.binary.Base64;
@@ -745,6 +747,10 @@
obj.put("line_color", lineColor);
obj.put("is_hyaline", isHyaline);
obj.put("env_version", env_version);
+ //浣撻獙鐗堟椂锛屽彲涓嶆鏌ラ〉闈㈡槸鍚﹀瓨鍦�
+ if("trial".equals(env_version)){
+ obj.put("check_path", false);
+ }
// 鍒涘缓url璧勬簮
URL url = new URL(StringUtils.format(URL_UNLIMIT_SQUARE, at));
// 寤虹珛http杩炴帴
@@ -821,16 +827,16 @@
* 鑾峰彇灏忕▼搴忚闃呮ā鏉�
* @param accessToken token
* **/
- public static JSONObject appTemplateList(String accessToken) {
- return HttpURLUtil(GET_APP_TEMPLATE+accessToken,"");
+ public static HttpHzResponse appTemplateList(String accessToken) {
+ return HttpHzUtil.HttpURLUtilJson(GET_APP_TEMPLATE + accessToken, null,null,null,"GET",null);
}
/**
* 鍏紬鍙疯闃呮ā鏉�
* @param accessToken token
* **/
- public static JSONObject gzhTemplateList(String accessToken) {
- return HttpURLUtil(GET_GZH_TEMPLATE+accessToken,"");
+ public static HttpHzResponse gzhTemplateList(String accessToken) {
+ return HttpHzUtil.HttpURLUtilJson(GET_GZH_TEMPLATE+accessToken, null,null,null,"GET",null);
}
}
--
Gitblit v1.8.0