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

!9 同步RuoYi更新 

Merge pull request !9 from Bo/master
This commit is contained in:
Bo 2021-07-14 07:01:51 +00:00 committed by Gitee
parent 917b74d795 a9c2d891bc
commit 923eb28ce8
5 changed files with 509 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -26,7 +26,7 @@
<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version> <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
<pagehelper.boot.version>1.3.1</pagehelper.boot.version> <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
<fastjson.version>1.2.76</fastjson.version> <fastjson.version>1.2.76</fastjson.version>
<oshi.version>5.7.4</oshi.version> <oshi.version>5.7.5</oshi.version>
<jna.version>5.8.0</jna.version> <jna.version>5.8.0</jna.version>
<commons.io.version>2.10.0</commons.io.version> <commons.io.version>2.10.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version> <commons.fileupload.version>1.4</commons.fileupload.version>

2
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -248,7 +248,7 @@ var closeItem = function(dataId){
/** 创建选项卡 */ /** 创建选项卡 */
function createMenuItem(dataUrl, menuName, isRefresh) { function createMenuItem(dataUrl, menuName, isRefresh) {
var panelUrl = window.frameElement.getAttribute('data-id'); var panelUrl = window.frameElement.getAttribute('data-id'),
dataIndex = $.common.random(1, 100), dataIndex = $.common.random(1, 100),
flag = true; flag = true;
if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false; if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;

4
ruoyi-admin/src/main/resources/templates/index-topnav.html
View File

@ -219,10 +219,10 @@
<!-- 顶部菜单列表 --> <!-- 顶部菜单列表 -->
<th:block th:each="menu : ${menus}"> <th:block th:each="menu : ${menus}">
<li role="presentation" th:id="|tab_${menu.menuId}|"> <li role="presentation" th:id="|tab_${menu.menuId}|">
<a th:if="${#lists.isEmpty(menu.children)}" data-toggle="tab" th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank' : 'menuItem noactive'}" th:href="${menu.url}"> <a th:if="${#lists.isEmpty(menu.children)}" data-toggle="tab" th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank' : 'menuItem noactive'}" th:href="@{${menu.url}}">
<i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span> <i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span>
</a> </a>
<a th:if="${not #lists.isEmpty(menu.children)}" data-toggle="tab" th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank'}" th:href="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? ${menu.url} : |#menu_${menu.menuId}|}"> <a th:if="${not #lists.isEmpty(menu.children)}" data-toggle="tab" th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank'}" th:href="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? @{${menu.url}} : |#menu_${menu.menuId}|}">
<i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span> <i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span>
</a> </a>
</li> </li>

16
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
View File

@ -48,20 +48,24 @@ public class GlobalExceptionHandler
* 请求方式不支持 * 请求方式不支持
*/ */
@ExceptionHandler({ HttpRequestMethodNotSupportedException.class }) @ExceptionHandler({ HttpRequestMethodNotSupportedException.class })
public AjaxResult handleException(HttpRequestMethodNotSupportedException e) public AjaxResult handleException(HttpRequestMethodNotSupportedException e, HttpServletRequest request)
{ {
log.error(e.getMessage(), e); String requestURI = request.getRequestURI();
return AjaxResult.error("不支持' " + e.getMethod() + "'请求"); String msg = String.format("访问的URL[%s]不支持%s请求", requestURI, e.getMethod());
log.error(msg, e);
return AjaxResult.error(msg);
} }
/** /**
* 拦截未知的运行时异常 * 拦截未知的运行时异常
*/ */
@ExceptionHandler(RuntimeException.class) @ExceptionHandler(RuntimeException.class)
public AjaxResult notFount(RuntimeException e) public AjaxResult notFount(RuntimeException e, HttpServletRequest request)
{ {
log.error("运行时异常:", e); String requestURI = request.getRequestURI();
return AjaxResult.error("运行时异常:" + e.getMessage()); String msg = String.format("访问的URL[%s]发生异常%s", requestURI, e.getMessage());
log.error(msg, e);
return AjaxResult.error(msg);
} }
/** /**

3
ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html
View File

@ -52,6 +52,9 @@
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:job:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:job:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-danger" onclick="closeItem()">
<i class="fa fa-reply-all"></i> 关闭
</a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">