From 82213e51f923c464e0eea652ace934a0aa26fac9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 02 十二月 2025 10:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java
index deca264..ca4b1fe 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java
@@ -100,7 +100,7 @@
Map<String, String> parameterMap = parseParameter(request.getQueryString());
String nonce = parameterMap.get("nonce");
String timestamp = parameterMap.get("timestamp");
- String signature = getSignature(nonce, payload, LOCAl_SECRET, timestamp);
+ String signature = getSignature(nonce, payload, systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.SECRET).getCode(), timestamp);
log.error("銆愮畝閬撲簯銆� 鐢ㄨ溅鐢宠 =========nonce锛�"+nonce);
log.error("銆愮畝閬撲簯銆� 鐢ㄨ溅鐢宠 =========timestamp锛�"+timestamp);
log.error("銆愮畝閬撲簯銆� 鐢ㄨ溅鐢宠 =========payload锛�"+payload);
@@ -146,7 +146,10 @@
Map<String, String> parameterMap = parseParameter(request.getQueryString());
String nonce = parameterMap.get("nonce");
String timestamp = parameterMap.get("timestamp");
- String signature = getSignature(nonce, payload, LLCAL_CARINFO_SECRET, timestamp);
+ String signature = getSignature(nonce, payload,
+ //LOCAl_SECRET
+ systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.CAR_SECRET).getCode()
+ , timestamp);
log.error("銆愮畝閬撲簯銆� 杞﹁締淇℃伅=========nonce锛�"+nonce);
log.error("銆愮畝閬撲簯銆� 杞﹁締淇℃伅=========timestamp锛�"+timestamp);
log.error("銆愮畝閬撲簯銆� 杞﹁締淇℃伅=========payload锛�"+payload);
@@ -193,13 +196,17 @@
}
public static void main(String[] args) {
+/*
String url = "https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93690b128a0d56b068192dc4a9c9722dbac428";
+*/
+ String url = "https://lcdp.ahyc.com.cn:30443/api/v1/automation/tenant/6756636b8ff4da34799c9f92/hooks/69042b5d6d7269265c7732a41a461aec9135f0641f0156dc";
// String url = "https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93690af97e41d1b068192dc4a9705aca3321e2";
+ //https://lcdp.ahyc.com.cn:30443/api/v1/automation/tenant/6756636b8ff4da34799c9f92/hooks/69042b5d6d7269265c7732a41a461aec9135f0641f0156dc
JSONObject object = new JSONObject();
object.put("create_date","20251104160000");
- object.put("start_date",System.currentTimeMillis() );
- object.put("end_date", System.currentTimeMillis() + 24*3600*1000);
- object.put("id","10000020251105");//
+ object.put("start_date","20251104160000" );
+ object.put("end_date", "20251204160000");
+ object.put("id","202511260016");//
object.put("type",1);//0=棰嗙敤锛�1=褰掕繕
String result = HttpsUtil.postJson(url,JSONObject.toJSONString(object));
System.out.println(result);
--
Gitblit v1.9.3