From cb38789006b411b29fba27a6a60493dc78946e17 Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期六, 22 六月 2024 09:49:27 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
src/main/java/com/hx/util/DateUtil.java | 21 ++++++++++
src/main/java/com/hx/util/HttpMethodUtil.java | 72 ++++++++++++++++++++++++++++++++++++
src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java | 4 ++
3 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java b/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java
index 69e0c4a..90fe3d4 100644
--- a/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java
+++ b/src/main/java/com/hx/mp/util/MPWeixinBaseUtil.java
@@ -747,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杩炴帴
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 33b8d66..1ae3c6b 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -1,5 +1,7 @@
package com.hx.util;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -452,6 +454,25 @@
}
/**
+ * 鑾峰彇涓や釜鏃堕棿鐩稿樊鍒嗛挓鏁�
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @param remainder 浣欐暟杩�1
+ * @return 鍒嗛挓
+ */
+ public static int differMinute(Date startTime, Date endTime,boolean remainder) {
+ BigDecimal sTime = new BigDecimal(startTime.getTime());
+ BigDecimal eTime = new BigDecimal(endTime.getTime());
+ eTime = eTime.subtract(sTime).setScale(0,RoundingMode.HALF_UP);
+ if(remainder){
+ eTime = eTime.divide(BigDecimal.valueOf(60000.0)).setScale(0, RoundingMode.UP);
+ }else{
+ eTime = eTime.divide(BigDecimal.valueOf(60000.0)).setScale(0, RoundingMode.DOWN);
+ }
+ return eTime.intValue();
+ }
+
+ /**
* endTime姣攕tartTime澶氱殑澶╂暟
* @param startTime 鏈�灏忔椂闂�
* @param endTime 鏈�澶ф椂闂�
diff --git a/src/main/java/com/hx/util/HttpMethodUtil.java b/src/main/java/com/hx/util/HttpMethodUtil.java
index 553b5f7..8bdd6a3 100644
--- a/src/main/java/com/hx/util/HttpMethodUtil.java
+++ b/src/main/java/com/hx/util/HttpMethodUtil.java
@@ -1,10 +1,12 @@
package com.hx.util;
+import com.alibaba.fastjson.JSONObject;
import org.apache.commons.io.IOUtils;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -76,4 +78,74 @@
return wxMsgXml;
}
+ /**
+ * 璇锋眰http鍗忚 鑾峰彇淇℃伅宸ュ叿
+ * @param url 璇锋眰閾炬帴
+ * @param data 璇锋眰鏁版嵁(body)
+ * @param keyValues form琛ㄥ崟鏁版嵁 key鍙傛暟鍚嶇О锛寁alue鍙傛暟鍊�
+ * @param header 璇锋眰澶�
+ * @param requestMethod 璇锋眰澶存柟娉曪紝榛樿POST
+ * @return
+ */
+ public static String request(String url, String data,Map<String,Object> keyValues,Map<String,String> header,String requestMethod, String contentType) {
+ HttpURLConnection con = null;
+ URL u = null;
+ String wxMsgXml = null;
+ try {
+ StringBuilder dataP = new StringBuilder();
+ if (keyValues != null && !keyValues.isEmpty()) {
+ for (Map.Entry<String, Object> entry : keyValues.entrySet()) {
+ dataP.append((String)entry.getKey()).append("=");
+ dataP.append(entry.getValue());
+ dataP.append("&");
+ }
+ System.out.println("dataP:"+dataP.toString());
+ dataP.deleteCharAt(dataP.length() - 1);
+ url = url+"?"+dataP;
+ }
+
+ if(StringUtils.isEmpty(requestMethod)){
+ requestMethod = "POST";
+ }
+
+ if(StringUtils.isEmpty(contentType)){
+ contentType = "application/json";
+ }
+
+ u = new URL(url);
+ con = (HttpURLConnection) u.openConnection();
+ con.setRequestMethod(requestMethod);
+ con.setDoOutput(true);
+ con.setDoInput(true);
+ con.setUseCaches(false);
+ con.setReadTimeout(300000);
+ con.setRequestProperty("Charset", "UTF-8");
+ con.setRequestProperty("Content-Type", contentType);
+ if(header != null){
+ for (Map.Entry<String, String> entry : header.entrySet()) {
+ con.setRequestProperty(entry.getKey(),entry.getValue());
+ }
+ }
+
+ if (data != null) {
+ OutputStream os = con.getOutputStream();
+ os.write(data.getBytes("utf-8"));
+ }
+
+ if(HttpURLConnection.HTTP_OK != con.getResponseCode() && HttpURLConnection.HTTP_CREATED != con.getResponseCode()){
+ throw new RuntimeException("璇锋眰url澶辫触:"+con.getResponseCode());
+ }
+ // 璇诲彇杩斿洖鍐呭
+ wxMsgXml = IOUtils.toString(con.getInputStream(), "utf-8");
+ // //System.out.println("HttpURLUtil:"+wxMsgXml);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (con != null) {
+ con.disconnect();
+ }
+ }
+ return wxMsgXml;
+ }
+
}
--
Gitblit v1.8.0