From 5a3e4a98d4791f696030cc31e487fb4965c144dc Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Fri, 30 Jul 2021 16:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysIndexController.java | 11 ++++++ .../src/main/resources/templates/login.html | 2 +- .../main/resources/templates/loginwechat.html | 1 - .../src/main/resources/templates/main.html | 35 +++++++++++++++++-- 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 4ac9fb758..2cb8c985c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -4,6 +4,9 @@ import java.util.Date; import java.util.List; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.utils.http.HttpUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -126,6 +129,14 @@ public class SysIndexController extends BaseController @GetMapping("/system/main") public String main(ModelMap mmap) { + JSONObject wordsJson = JSONObject.parseObject(HttpUtils.sendGet("https://v1.jinrishici.com/all.json","")); + JSONObject oneWordJson = JSONObject.parseObject(HttpUtils.sendGet("https://api.xygeng.cn/one","")); + JSONObject oneWordDataJson = JSONObject.parseObject(oneWordJson.getString("data")); + mmap.put("wordsContent",wordsJson.get("content")); + mmap.put("wordsAuthor",wordsJson.get("author")); + mmap.put("wordsOrigin",wordsJson.getString("origin")); + mmap.put("oneWordOrigin",oneWordDataJson.get("origin")); + mmap.put("oneWordContent",oneWordDataJson.get("content")); mmap.put("version", RuoYiConfig.getVersion()); return "main"; } diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 95188c7f1..807382248 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -3,7 +3,7 @@ - 登录BPS后台管理系统 + BPS后台管理系统 diff --git a/ruoyi-admin/src/main/resources/templates/loginwechat.html b/ruoyi-admin/src/main/resources/templates/loginwechat.html index 8aa641f4f..9edc37af2 100644 --- a/ruoyi-admin/src/main/resources/templates/loginwechat.html +++ b/ruoyi-admin/src/main/resources/templates/loginwechat.html @@ -38,7 +38,6 @@

登录中...

-
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index ef324c721..ab20e2681 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -9,10 +9,41 @@ + -
+
+
+

[[${wordsContent}]]

+
--  《[[${wordsOrigin}]]》 · [[${wordsAuthor}]]
+

+

[[${oneWordContent}]]

+
--  《[[${oneWordOrigin}]]》
+
+
+ +