From 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 十二月 2025 08:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index d2a4ce5..5bb835b 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import lombok.extern.slf4j.Slf4j;
import net.sourceforge.pinyin4j.PinyinHelper;
import org.apache.commons.lang3.StringUtils;
@@ -18,7 +19,7 @@
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
+@Slf4j
public class Constants {
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_USER_KEY = "user_token_list_";
@@ -108,6 +109,7 @@
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
public static final String MEMBER_IMG = "MEMBER_IMG";
+ public static final String ACTIVATE = "ACTIVATE";
public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG";
public static final String VISIT_NOTICE = "VISIT_NOTICE";
public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG";
@@ -1576,9 +1578,12 @@
}
- public static boolean betweenTimeConfig(String timeConfigData){
+ public static boolean betweenTimeConfig(String timeConfigData,String now){
+ log.error("閽ュ寵鏌滆幏鍙栦繚娲佹椂闂撮厤缃」"+timeConfigData);
if(StringUtils.isNotBlank(timeConfigData)){
- Integer nowTime = Integer.valueOf(DateUtil.getFormattedDateUtil(new Date(),"HH:mm").replace(":",""));
+ log.error("閽ュ寵鏌滆幏鍙栦繚娲佹椂闂� - 褰撳墠鏃堕棿淇℃伅"+now);
+ Integer nowTime = Integer.valueOf(now.substring(11,16).replace(":",""));
+
List<String> cleanConfigList = Arrays.asList(StringUtils.split(timeConfigData,","));
for (String config:cleanConfigList) {
String [] timeArr = config.split("-");
--
Gitblit v1.9.3