From 93c1331453da0037daf227988c889f34a5937465 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 23 May 2024 13:39:16 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=ACcontroller=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?erpVersion.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ErpVersionController.java | 23 +++++ .../src/main/resources/application.yml | 6 +- .../system/erpVersion/erpVersion.html | 93 +++++++++++++++++++ 3 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpVersionController.java create mode 100644 ruoyi-admin/src/main/resources/templates/system/erpVersion/erpVersion.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpVersionController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpVersionController.java new file mode 100644 index 00000000..286bed0e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpVersionController.java @@ -0,0 +1,23 @@ +package com.ruoyi.system.controller; + +import com.ruoyi.common.config.RuoYiConfig; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/system/erpVersion") +public class ErpVersionController { + + + private String prefix = "system/erpVersion"; + + // 系统版本 + @GetMapping("/erpVersion") + public String main(ModelMap mmap) + { + mmap.put("version", RuoYiConfig.getVersion()); + return prefix+ "/erpVersion"; + } +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 84a31842..203a1b03 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,11 +1,11 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi + name: wancaiErp # 版本 - version: 4.6.1 + version: 1.1.1 # 版权年份 - copyrightYear: 2021 + copyrightYear: 2024 # 实例演示开关 demoEnabled: false # 文件路径 示例（ Windows配置c:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） diff --git a/ruoyi-admin/src/main/resources/templates/system/erpVersion/erpVersion.html b/ruoyi-admin/src/main/resources/templates/system/erpVersion/erpVersion.html new file mode 100644 index 00000000..8fd2e028 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/erpVersion/erpVersion.html @@ -0,0 +1,93 @@ + + + + + + + 系统版本 + + + + + + + +
+
+

万材ERP系统

+
+

+ 当前版本：v[[${version}]] +

+
+
+
+
+
+
+
+

系统更新日志

+
+
+
+ +
+
+
+
+ v1.1.12024.05.23 +
+
+
+
+
    +
  1. 测试1
    2. +
  2. 测试1
    3. +
  3. 测试1
    4. +
+
+
+
+ +
+
+
+ v1.1.02024.05.23 +
+
+
+
+
    +
  1. 测试2
    2. +
  2. 测试2
    3. +
  3. 测试2
    4. +
  4. 测试2
    5. +
+
+
+
+
+
+
+
+
+
+
+ + + + + +