Browse Source

[feat]系统管理:

系统版本
新增系统版本controller
新增系统版本页面erpVersion.html
dev
liuxiaoxu 6 months ago
parent
commit
93c1331453
  1. 23
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpVersionController.java
  2. 6
      ruoyi-admin/src/main/resources/application.yml
  3. 93
      ruoyi-admin/src/main/resources/templates/system/erpVersion/erpVersion.html

23
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";
}
}

6
ruoyi-admin/src/main/resources/application.yml

@ -1,11 +1,11 @@
# 项目相关配置 # 项目相关配置
ruoyi: ruoyi:
# 名称 # 名称
name: RuoYi name: wancaiErp
# 版本 # 版本
version: 4.6.1 version: 1.1.1
# 版权年份 # 版权年份
copyrightYear: 2021 copyrightYear: 2024
# 实例演示开关 # 实例演示开关
demoEnabled: false demoEnabled: false
# 文件路径 示例( Windows配置c:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) # 文件路径 示例( Windows配置c:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)

93
ruoyi-admin/src/main/resources/templates/system/erpVersion/erpVersion.html

@ -0,0 +1,93 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--360浏览器优先以webkit内核解析-->
<title>系统版本</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
</head>
<body class="gray-bg">
<div class="row border-bottom white-bg dashboard-header">
<div class="col-sm-12">
<h1>万材ERP系统</h1>
<br>
<p>
<b>当前版本:</b><span>v[[${version}]]</span>
</p>
</div>
</div>
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-sm-4">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>系统更新日志</h3>
</div>
<div class="ibox-content no-padding">
<div class="panel-body">
<!--测试1-->
<div class="panel-group" id="version">
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a data-toggle="collapse" data-parent="#version" href="#v111">v1.1.1</a><code class="pull-right">2024.05.23</code>
</h5>
</div>
<div id="v111" class="panel-collapse collapse in">
<div class="panel-body">
<ol>
<li>测试1</li>
<li>测试1</li>
<li>测试1</li>
</ol>
</div>
</div>
</div>
<!--测试2-->
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a data-toggle="collapse" data-parent="#version" href="#v110">v1.1.0</a><code class="pull-right">2024.05.23</code>
</h5>
</div>
<div id="v110" class="panel-collapse collapse in">
<div class="panel-body">
<ol>
<li>测试2</li>
<li>测试2</li>
<li>测试2</li>
<li>测试2</li>
</ol>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/js/bootstrap.min.js}"></script>
<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
<script type="text/javascript">
$('#pay-qrcode').click(function(){
var html=$(this).html();
parent.layer.open({
title: false,
type: 1,
closeBtn:false,
shadeClose:true,
area: ['600px', '360px'],
content: html
});
});
</script>
</body>
</html>
Loading…
Cancel
Save