From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/holiday/HolidayUtil.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/holiday/HolidayUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/holiday/HolidayUtil.java
index 20cab47..1389a7b 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/holiday/HolidayUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/holiday/HolidayUtil.java
@@ -7,7 +7,7 @@
import com.xiaopeng.common.core.utils.HttpUtils;
import com.xiaopeng.common.redis.service.RedisService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.time.Duration;
@@ -24,6 +24,9 @@
@Autowired
private RedisService redisService;
+ @Value("${holiday.api.url}")
+ private String holidayApiUrl;
+
public boolean isHoliday() {
LocalDate now = LocalDate.now();
@@ -32,7 +35,7 @@
if (redisService.getCacheObject(CacheConstants.IS_HOLIDAY+now) != null && ("1").equals(redisService.getCacheObject(CacheConstants.IS_HOLIDAY+now).toString())) {
return true;
}
- String result = HttpUtils.sendGet("https://publicapi.xiaoai.me/holiday/day?date=" + now);
+ String result = HttpUtils.sendGet(holidayApiUrl + now);
// String result = HttpUtil.get("https://publicapi.xiaoai.me/holiday/day?date=" +now);
JSONObject jsonObject = JSONObject.parseObject(result);
Object data = jsonObject.get("data");
@@ -60,7 +63,7 @@
if (cacheObject!=null) {
return Integer.valueOf(cacheObject.toString());
}
- String result = HttpUtils.sendGet("https://publicapi.xiaoai.me/holiday/day?date=" +now);
+ String result = HttpUtils.sendGet(holidayApiUrl + now);
// String result = HttpUtils.sendGet("https://publicapi.xiaoai.me/holiday/day?date=2026-01-04");
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -93,7 +96,7 @@
if (cacheObject!=null) {
return Integer.valueOf(cacheObject.toString());
}
- String result = HttpUtils.sendGet("https://publicapi.xiaoai.me/holiday/day?date=" +now);
+ String result = HttpUtils.sendGet(holidayApiUrl + now);
// String result = HttpUtils.sendGet("https://publicapi.xiaoai.me/holiday/day?date=2026-01-04");
JSONObject jsonObject = JSONObject.parseObject(result);
--
Gitblit v1.7.1