ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!15 调整首页界面 

Merge pull request !15 from Bo/bo_dev
This commit is contained in:
Bo 2021-07-30 08:22:37 +00:00 committed by Gitee
parent d18dc2c515 5a3e4a98d4
commit 659389ad41
4 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

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

2
ruoyi-admin/src/main/resources/templates/login.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>登录BPS后台管理系统</title>
<title>BPS后台管理系统</title>
<meta name="description" content="BPS后台管理框架">
<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"/>

1
ruoyi-admin/src/main/resources/templates/loginwechat.html
View File

@ -38,7 +38,6 @@
<div id="parent">
<div id="child"><h4> <strong>登录中...</strong></h4></div>
<div id="validateFalse"></div>
</div>
<script th:inline="javascript"> </script>

35
ruoyi-admin/src/main/resources/templates/main.html
View File

@ -9,10 +9,41 @@
<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"/>
<style type="text/css">
html, body {
margin: 0;
padding: 0;
height: 100%;
}
#parent {
height: 100%;
margin: 0;
border: 0;
}
#child {
position: absolute;
top: 40%;
left: 40%;
right: 0;
bottom: 0;
transform: translate(-50%, -50%);
border: 0;
}
</style>
</head>
<body class="gray-bg">
<div class="row border-bottom white-bg dashboard-header">
<div id="parent" class="col-sm-4">
<div id="child">
<h3 class="text-primary"> <strong>[[${wordsContent}]]</strong></h3>
<h5 class="pull-right text-warning">--&nbsp;&nbsp;《[[${wordsOrigin}]]》 · [[${wordsAuthor}]]</h5>
<br/><br/>
<h3 class="text-primary"> <strong>[[${oneWordContent}]]</strong></h3>
<h5 class="pull-right text-warning">--&nbsp;&nbsp;《[[${oneWordOrigin}]]》</h5>
</div>
</div>
<!--<div class="row border-bottom white-bg dashboard-header">
<div class="col-sm-12">
<h2>BPS后台管理系统</h2>
<p>
@ -178,7 +209,7 @@
</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>