diff --git a/README.md b/README.md
index 8a08ff36..2d343479 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
## 平台简介
-
-2018年度最受欢迎中国开源软件评选
-请给若依/RuoYi 投票，谢谢大家。
-https://www.oschina.net/project/top_cn_2018?sort=1
-
-
一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适的。于是利用空闲休息时间开始自己写了一套后台系统。如此有了若依。她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
寓意：你若不离不弃，我必生死相依
diff --git a/bin/run-tomcat.bat b/bin/run-tomcat.bat
deleted file mode 100644
index 598e0267..00000000
--- a/bin/run-tomcat.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [Ϣ] ʹ Spring Boot Tomcat Web ̡
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-title %cd%
-set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-call mvn clean spring-boot:run -Dmaven.test.skip=true -U
-
-pause
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 20f6855c..1a5c0565 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi
- 3.0
+ 3.1
ruoyi
http://www.ruoyi.vip
若依管理系统
- 3.0
+ 3.1
UTF-8
UTF-8
1.8
@@ -25,6 +25,7 @@
2.3.2
2.7.0
1.2.5
+ 3.9.1
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2812cd58..c2f6b5b4 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.0
+ 3.1
4.0.0
jar
@@ -44,7 +44,6 @@
com.ruoyi
ruoyi-framework
${ruoyi.version}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
new file mode 100644
index 00000000..786926f2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@@ -0,0 +1,31 @@
+package com.ruoyi.web.controller.monitor;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.framework.web.base.BaseController;
+import com.ruoyi.framework.web.domain.Server;
+
+/**
+ * 服务器监控
+ *
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/monitor/server")
+public class ServerController extends BaseController
+{
+ private String prefix = "monitor/server";
+
+ @RequiresPermissions("monitor:server:view")
+ @GetMapping()
+ public String server(ModelMap mmap) throws Exception
+ {
+ Server server = new Server();
+ server.copyTo();
+ mmap.put("server", server);
+ return prefix + "/server";
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java
index 29d5baaf..e2d3373e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java
@@ -80,6 +80,15 @@ public class SysJobController extends BaseController
}
}
+ @RequiresPermissions("monitor:job:detail")
+ @GetMapping("/detail/{jobId}")
+ public String detail(@PathVariable("jobId") Long jobId, ModelMap mmap)
+ {
+ mmap.put("name", "job");
+ mmap.put("job", jobService.selectJobById(jobId));
+ return prefix + "/detail";
+ }
+
/**
* 任务调度状态修改
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
index 1e98551c..7b3a99d7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
@@ -69,15 +69,16 @@ public class SysJobLogController extends BaseController
{
return toAjax(jobLogService.deleteJobLogByIds(ids));
}
-
+
@RequiresPermissions("monitor:job:detail")
@GetMapping("/detail/{jobLogId}")
public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap)
{
+ mmap.put("name", "jobLog");
mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId));
return prefix + "/detail";
}
-
+
@Log(title = "调度日志", businessType = BusinessType.CLEAN)
@RequiresPermissions("monitor:job:remove")
@PostMapping("/clean")
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4dd6f204..d039e073 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
# 名称
name: RuoYi
# 版本
- version: 3.0.0
+ version: 3.1.0
# 版权年份
copyrightYear: 2018
# 文件上传路径
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index 61dacd9d..fec49f4b 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -115,6 +115,15 @@ $(function() {
})
});
+/** 刷新选项卡 */
+var refreshItem = function(){
+ var topWindow = $(window.parent.document);
+ var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
+ var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow);
+ var url = target.attr('src');
+ target.attr('src', url).ready();
+}
+
/** 创建选项卡 */
function createMenuItem(dataUrl, menuName) {
dataIndex = $.common.random(1,100),
@@ -154,6 +163,22 @@ function createMenuItem(dataUrl, menuName) {
return false;
}
+//日志打印封装处理
+var log = {
+ log: function (msg) {
+ console.log(msg);
+ },
+ info: function(msg) {
+ console.info(msg);
+ },
+ warn: function(msg) {
+ console.warn(msg);
+ },
+ error: function(msg) {
+ console.error(msg);
+ }
+};
+
/** 设置全局ajax处理 */
$.ajaxSetup({
complete: function(XMLHttpRequest, textStatus) {
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index e0b9af1f..d49dddab 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -17,6 +17,7 @@
_sortOrder = $.common.isEmpty(options.sortOrder) ? "asc" : options.sortOrder;
_sortName = $.common.isEmpty(options.sortName) ? "" : options.sortName;
_striped = $.common.isEmpty(options.striped) ? false : options.striped;
+ _escape = $.common.isEmpty(options.escape) ? false : options.escape;
$('#bootstrap-table').bootstrapTable({
url: options.url, // 请求后台的URL（*）
contentType: "application/x-www-form-urlencoded", // 编码类型
@@ -31,9 +32,10 @@
pageNumber: 1, // 初始化加载第一页，默认第一页
pageSize: 10, // 每页的记录行数（*）
pageList: [10, 25, 50], // 可供选择的每页的行数（*）
+ escape: _escape, // 转义HTML字符串
iconSize: 'outline', // 图标大小：undefined默认的按钮尺寸 xs超小按钮sm小按钮lg大按钮
toolbar: '#toolbar', // 指定工作栏
- sidePagination: "server", // 启用服务端分页
+ sidePagination: "server", // 启用服务端分页
search: $.common.visible(options.search), // 是否显示搜索框功能
showSearch: $.common.visible(options.showSearch), // 是否显示检索信息
showRefresh: $.common.visible(options.showRefresh), // 是否显示刷新按钮
@@ -124,6 +126,14 @@
}
});
return actions.join('');
+ },
+ // 显示表格指定列
+ showColumn: function(column) {
+ $("#bootstrap-table").bootstrapTable('showColumn', column);
+ },
+ // 隐藏表格指定列
+ hideColumn: function(column) {
+ $("#bootstrap-table").bootstrapTable('hideColumn', column);
}
},
// 表格树封装处理
@@ -780,6 +790,14 @@
// 指定随机数返回
random: function (min, max) {
return Math.floor((Math.random() * max) + min);
+ },
+ startWith: function(value, start) {
+ var reg = new RegExp("^" + start);
+ return reg.test(value)
+ },
+ endWith: function(value, end) {
+ var reg = new RegExp(end + "$");
+ return reg.test(value)
}
}
});
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index 7d7ee2fd..256a1671 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -38,8 +38,8 @@
-
-
+
+
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 97948706..fa4cd80e 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -15,7 +15,7 @@
-
+