xueli.xue 8 lat temu
rodzic
commit
5c8cb10a95

+ 7 - 6
README.md

@@ -767,12 +767,13 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 9、GLUE模式任务实例更新逻辑优化,原根据超时时间更新改为根据版本号更新,源码变动版本号加一;
 
 #### 6.12 版本 V1.6.1 特性 (Coding)
-- 1、通讯协议二进制据增强校验,拦截非正常请求;
-- 2、数据库地址配置优化;
-- 3、WebIDE交互重构;
-- 4、前端部分组件优化;
-- 5、增强权限校验,采用动态登录TOKEN;
-- 5、rolling日志,日志界面风格同glue任务编辑器;
+- 1、Rolling日志;
+- 2、WebIDE交互重构;
+- 3、通讯增强校验,有效过滤非正常请求;
+- 4、权限增强校验,采用动态登录TOKEN(推荐接入内部SSO);
+- 5、数据库配置优化,解决乱码问题;
+
+
 
 
 #### TODO LIST

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -109,7 +109,7 @@ public class JobLogController {
         model.addAttribute("executorAddress", jobLog.getExecutorAddress());
         model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime());
         model.addAttribute("logId", jobLog.getId());
-		return "joblog/logdetail";
+		return "joblog/joblog.detail";
 	}
 
 	@RequestMapping("/logDetailCat")

+ 70 - 70
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl

@@ -1,71 +1,71 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>任务调度中心</title>
-<#import "/common/common.macro.ftl" as netCommon>
-<@netCommon.commonStyle />
-    <style>
-        html{  background-color: whitesmoke;  }
-    </style>
-</head>
-<body class="hold-transition skin-blue layout-top-nav">
-
-<div class2="wrapper">
-
-    <header class="main-header">
-        <nav class="navbar navbar-static-top">
-            <div class="container">
-            <#-- icon -->
-                <div class="navbar-header">
-                    <a href="../../index2.html" class="navbar-brand"><b>日志</b>Console</a>
-                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
-                        <i class="fa fa-bars"></i>
-                    </button>
-                </div>
-
-                <#-- left nav -->
-                <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                    <ul class="nav navbar-nav">
-                        <#--<li class="active" ><a href="javascript:;">任务:<span class="sr-only">(current)</span></a></li>-->
-                    </ul>
-                </div>
-
-                <#-- right nav -->
-                <div class="navbar-custom-menu">
-                    <ul class="nav navbar-nav">
-                        <li>
-                            <a href="javascript:window.location.reload();" >
-                                <i class="fa fa-fw fa-refresh" ></i>
-                                刷新
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-
-            </div>
-        </nav>
-    </header>
-
-    <div>
-        <pre>
-            <div id="logConsole"></div>
-            <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
-            <div style="margin-top: 50px;" ></div>
-        </pre>
-    </div>
-
-</div>
-
-<@netCommon.commonScript />
-<script>
-    // 参数
-    var triggerCode = '${triggerCode}';
-    var handleCode = '${handleCode}';
-    var executorAddress = '${executorAddress}';
-    var triggerTime = '${triggerTime}';
-    var logId = '${logId}';
-</script>
-<script src="${request.contextPath}/static/js/logdetail.index.1.js"></script>
-
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>任务调度中心</title>
+<#import "/common/common.macro.ftl" as netCommon>
+<@netCommon.commonStyle />
+    <style>
+        html{  background-color: whitesmoke;  }
+    </style>
+</head>
+<body class="hold-transition skin-blue layout-top-nav">
+
+<div class2="wrapper">
+
+    <header class="main-header">
+        <nav class="navbar navbar-static-top">
+            <div class="container">
+            <#-- icon -->
+                <div class="navbar-header">
+                    <a href="../../index2.html" class="navbar-brand"><b>日志</b>Console</a>
+                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
+                        <i class="fa fa-bars"></i>
+                    </button>
+                </div>
+
+                <#-- left nav -->
+                <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                    <ul class="nav navbar-nav">
+                        <#--<li class="active" ><a href="javascript:;">任务:<span class="sr-only">(current)</span></a></li>-->
+                    </ul>
+                </div>
+
+                <#-- right nav -->
+                <div class="navbar-custom-menu">
+                    <ul class="nav navbar-nav">
+                        <li>
+                            <a href="javascript:window.location.reload();" >
+                                <i class="fa fa-fw fa-refresh" ></i>
+                                刷新
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+
+            </div>
+        </nav>
+    </header>
+
+    <div>
+        <pre>
+            <div id="logConsole"></div>
+            <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
+            <div style="margin-top: 50px;" ></div>
+        </pre>
+    </div>
+
+</div>
+
+<@netCommon.commonScript />
+<script>
+    // 参数
+    var triggerCode = '${triggerCode}';
+    var handleCode = '${handleCode}';
+    var executorAddress = '${executorAddress}';
+    var triggerTime = '${triggerTime}';
+    var logId = '${logId}';
+</script>
+<script src="${request.contextPath}/static/js/joblog.detail.1.js"></script>
+
+</body>
 </html>

xxl-job-admin/src/main/webapp/static/js/logdetail.index.1.js → xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js