From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 9d068ab..8d8fa3c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -4,10 +4,7 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.framework.web.domain.server.Sys;
@@ -96,8 +93,8 @@
LocalDateTime startDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
long daysPassed = ChronoUnit.DAYS.between(startDateTime, LocalDateTime.now());
- return AjaxResult.success("璇曠敤鎻愰啋锛氭偍杩樻湁 " + (7L - daysPassed) + " 澶╃殑璇曠敤澶╂暟");
- }else return AjaxResult.success("灏婃暚鐨勪細鍛樼敤鎴凤紝鎮ㄥソ锛佹杩庢潵鍒版湰鍢熷槦瀹剁綉");
+ return AjaxResult.success(daysPassed > 7 ? "鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�":"鎮ㄨ繕鏈� " + (7L - daysPassed) + " 澶╃殑璇曠敤澶╂暟");
+ }else return AjaxResult.success("灏婃暚鐨勪細鍛樼敤鎴凤紝鎮ㄥソ锛�");
}
--
Gitblit v1.9.1