From 0b0b8419586505154a7e57e7c32c9a44329347ce Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 14:01:56 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_gybjyhglxt
---
src/main/java/com/ruoyi/tide/utils/TideUtils.java | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/tide/utils/TideUtils.java b/src/main/java/com/ruoyi/tide/utils/TideUtils.java
index 10f84ab..a1ce340 100644
--- a/src/main/java/com/ruoyi/tide/utils/TideUtils.java
+++ b/src/main/java/com/ruoyi/tide/utils/TideUtils.java
@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -22,26 +21,9 @@
@Component
@Slf4j
public class TideUtils {
+ private final static String appId = "1203028744864792576";
- public static String APP_ID;
- public static String APP_SECRET;
-
-
- @Value("${inspur.appId}")
- private String appId;
-
- @Value("${inspur.appSecret}")
- private String appSecret;
-
- @Value("${inspur.appId}")
- public void setAppId(String appId) {
- TideUtils.APP_ID = appId;
- }
-
- @Value("${inspur.appSecret}")
- public void setAppSecret(String appSecret) {
- TideUtils.APP_SECRET = appSecret;
- }
+ private final static String appSecret = "6zIfMjkxMjIwMjUxNDQ3NDk2MDEPZD";
// 鍐呯綉鍦板潃
private final static String ip = "http://10.136.0.8:8083";
@@ -80,14 +62,14 @@
xSignSplicingTogether = "x-random=" + xRandom + "&x-time=" + xTime;
}
// 閰嶇疆鍔犲瘑鏂瑰紡涓庡瘑閽�
- HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, APP_SECRET.getBytes());
+ HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, appSecret.getBytes());
// 寰楀嚭x-sign
String xSign = hMac.digestHex(xSignSplicingTogether);
HashMap<String, String> result = new HashMap<>();
result.put("x-time", xTime);
result.put("x-random", xRandom);
result.put("x-sign", xSign);
- result.put("appKey", APP_ID);
+ result.put("appKey", appId);
return result;
}
@@ -109,25 +91,25 @@
xSignSplicingTogether = "x-random=" + xRandom + "&x-time=" + xTime;
}
// x-sign 鍔犲瘑
- HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, APP_SECRET.getBytes());
+ HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, appSecret.getBytes());
String xSign = hMac.digestHex(xSignSplicingTogether);
HashMap<String, String> result = new HashMap<>();
result.put("x-time", xTime);
result.put("x-random", xRandom);
result.put("x-sign", xSign);
- result.put("appKey", APP_ID);
+ result.put("appKey", appId);
return result;
}
/**
* 浜斿垎閽熶竴娆＄殑蹇冭烦
*/
- @Scheduled(cron = "0 0/5 * * * ?")
+// @Scheduled(cron = "0 0/5 * * * ?")
public static void heartbeat(){
HashMap<String, String> header = getGetHeader(null);
String url = ip + "/cpn/api/extra/v1/application/heartbeat";
String body = HttpRequest.get(url).headerMap(header, false).execute().body();
- System.out.println(body + "搴旂敤蹇冭烦鎵ц鎴愬姛锛�");
+ log.info("搴旂敤蹇冭烦鎵ц鎴愬姛->{}",body);
}
// 鑾峰彇token
@@ -135,8 +117,8 @@
String url = ip + "/cpn/extral/applicationCode/appAuthCheck";
JSONObject json = new JSONObject();
json.put("code", code);
- json.put("appID", APP_ID);
- json.put("appSecret", APP_SECRET);
+ json.put("appID", appId);
+ json.put("appSecret", appSecret);
HashMap<String, String> header = getPostHeader(json.toString());
String body = HttpRequest.post(url)
.headerMap(header, false)
@@ -150,7 +132,7 @@
public static JSONObject getUserInfo(String token) {
String url = ip + "/cpn/api/extral/applicationCode/getUserInfoByToken";
JSONObject json = new JSONObject();
- json.put("appID", APP_ID);
+ json.put("appID", appId);
HashMap<String, String> header = getPostHeader(json.toString());
header.put("Authorization", token);
String body = HttpRequest.post(url)
--
Gitblit v1.9.3