From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 18 十月 2024 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
index c20f360..4904d6b 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
@@ -18,10 +18,6 @@
 
 	private final String url = "http://8.137.103.127/universal";
 	
-	private final String appkey = "886621e841fc44c1ad63a823d";
-	
-	private final String secretkey = "7d87c2c36bea4749b30f38f4d";
-	
 	
 	/**
 	 * 开关道闸
@@ -30,17 +26,17 @@
 	 */
 	public Boolean gateService(SwitchwayGateReq req){
 		SwitchwayGate switchwayGate = new SwitchwayGate()
-				.setAppkey(appkey)
+				.setAppkey(req.getAppkey())
 				.setAction(req.getAction())
 				.setChannel(req.getChannel())
 				.setTimestamp(System.currentTimeMillis() + "")
-				.build(secretkey);
+				.build(req.getSecretkey());
 		String body = JSON.toJSONString(switchwayGate);
 		String result = HttpUtil.post(url + "/gateService", body);
 		JSONObject jsonObject = JSON.parseObject(result);
 		Boolean success = jsonObject.getBoolean("success");
 		if(!success){
-			log.error("调用开关道闸失败:\n请求参数:{}\n返回结果:{}", body, result);
+			log.warn("调用开关道闸失败:\n请求参数:{}\n返回结果:{}", body, result);
 		}
 		return success;
 	}

--
Gitblit v1.7.1