From 3c63b885633a3121ebb23176230b4f7889cd2bf1 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Thu, 26 Oct 2023 15:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 ++++ .../dormstar/cache/RamDataCache.java | 15 ++++ .../dormstar/controllers/IndexController.java | 16 ----- .../controllers/WxxyNetController.java | 7 ++ .../controllers/view/IndexController.java | 37 ++++++++++ .../dormstar/services/GetWxxyNetworkInfo.java | 14 ++++ src/main/resources/tailwind.css | 3 + src/main/resources/templates/center.html | 72 +++++++++++++++++++ src/main/resources/templates/help.html | 10 +++ src/main/resources/templates/index.html | 42 ++++++++++- tailwind.config.js | 12 ++++ 11 files changed, 225 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/xiaolfeng/dormstar/cache/RamDataCache.java delete mode 100644 src/main/java/com/xiaolfeng/dormstar/controllers/IndexController.java create mode 100644 src/main/java/com/xiaolfeng/dormstar/controllers/WxxyNetController.java create mode 100644 src/main/java/com/xiaolfeng/dormstar/controllers/view/IndexController.java create mode 100644 src/main/java/com/xiaolfeng/dormstar/services/GetWxxyNetworkInfo.java create mode 100644 src/main/resources/tailwind.css create mode 100644 src/main/resources/templates/center.html create mode 100644 src/main/resources/templates/help.html create mode 100644 tailwind.config.js diff --git a/pom.xml b/pom.xml index c9567b0..0751a17 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,21 @@ 3.0.2 test + + mysql + mysql-connector-java + 8.0.33 + + + org.jetbrains + annotations + 23.0.0 + compile + + + org.springframework.boot + spring-boot-starter-actuator + diff --git a/src/main/java/com/xiaolfeng/dormstar/cache/RamDataCache.java b/src/main/java/com/xiaolfeng/dormstar/cache/RamDataCache.java new file mode 100644 index 0000000..ae8a698 --- /dev/null +++ b/src/main/java/com/xiaolfeng/dormstar/cache/RamDataCache.java @@ -0,0 +1,15 @@ +package com.xiaolfeng.dormstar.cache; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +/** + * @author lfeng + */ +@Component +public class RamDataCache { + @Value("${project.version}") + public String version; + @Value("${project.name}") + public String name; +} diff --git a/src/main/java/com/xiaolfeng/dormstar/controllers/IndexController.java b/src/main/java/com/xiaolfeng/dormstar/controllers/IndexController.java deleted file mode 100644 index 48edcc0..0000000 --- a/src/main/java/com/xiaolfeng/dormstar/controllers/IndexController.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.xiaolfeng.dormstar.controllers; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author 筱锋xiao_lfeng - */ -@Controller -public class IndexController { - - @GetMapping("/") - public String getIndex() { - return "index"; - } -} diff --git a/src/main/java/com/xiaolfeng/dormstar/controllers/WxxyNetController.java b/src/main/java/com/xiaolfeng/dormstar/controllers/WxxyNetController.java new file mode 100644 index 0000000..5438a88 --- /dev/null +++ b/src/main/java/com/xiaolfeng/dormstar/controllers/WxxyNetController.java @@ -0,0 +1,7 @@ +package com.xiaolfeng.dormstar.controllers; + +/** + * @author 筱锋xiao_lfeng + */ +public class WxxyNetController { +} diff --git a/src/main/java/com/xiaolfeng/dormstar/controllers/view/IndexController.java b/src/main/java/com/xiaolfeng/dormstar/controllers/view/IndexController.java new file mode 100644 index 0000000..566cc3c --- /dev/null +++ b/src/main/java/com/xiaolfeng/dormstar/controllers/view/IndexController.java @@ -0,0 +1,37 @@ +package com.xiaolfeng.dormstar.controllers.view; + +import com.xiaolfeng.dormstar.cache.RamDataCache; +import lombok.RequiredArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author 筱锋xiao_lfeng + */ +@Controller +@RequestMapping("/") +@RequiredArgsConstructor +public class IndexController { + private final RamDataCache ramDataCache; + + @GetMapping("/") + public String getIndex(@NotNull Model model) { + model.addAttribute("title", ramDataCache.name); + return "index"; + } + + @GetMapping("/center") + public String getCenter(@NotNull Model model) { + model.addAttribute("title", ramDataCache.name); + model.addAttribute("version", ramDataCache.version); + return "center"; + } + + @GetMapping("/help") + public String getHelp() { + return "help"; + } +} diff --git a/src/main/java/com/xiaolfeng/dormstar/services/GetWxxyNetworkInfo.java b/src/main/java/com/xiaolfeng/dormstar/services/GetWxxyNetworkInfo.java new file mode 100644 index 0000000..1274fee --- /dev/null +++ b/src/main/java/com/xiaolfeng/dormstar/services/GetWxxyNetworkInfo.java @@ -0,0 +1,14 @@ +package com.xiaolfeng.dormstar.services; + +import org.springframework.stereotype.Service; + +/** + * @author 筱锋xiao_lfeng + */ +@Service +public class GetWxxyNetworkInfo { + + public String getWxxyNetWork() { + return null; + } +} diff --git a/src/main/resources/tailwind.css b/src/main/resources/tailwind.css new file mode 100644 index 0000000..bd6213e --- /dev/null +++ b/src/main/resources/tailwind.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/src/main/resources/templates/center.html b/src/main/resources/templates/center.html new file mode 100644 index 0000000..68b70d3 --- /dev/null +++ b/src/main/resources/templates/center.html @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/help.html b/src/main/resources/templates/help.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/src/main/resources/templates/help.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 69c5be6..758a8ff 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -2,9 +2,47 @@ - Title + + + + + - +
+
+
+ +
+

+ +
+ 我们的宿舍 +

+

这个只是方便我们宿舍使用的一些东西而已,没有什么其他用的东西。

+ +
+
+ App screenshot +
+
+
+
+ + \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 0000000..4f64ce4 --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,12 @@ +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: [ + "./src/main/resources/**/*.{html,js}", + "./node_modules/flowbite/**/*.js" + ], + theme: { + extend: {}, + }, plugins: [ + require('flowbite/plugin') + ], +} \ No newline at end of file