xueli.xue 8 年之前
父節點
當前提交
5c8cb10a95

+ 7 - 6
README.md 查看文件

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

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java 查看文件

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

xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/logdetail.ftl → xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl 查看文件

@@ -1,71 +1,71 @@
1
-<!DOCTYPE html>
2
-<html>
3
-<head>
4
-    <title>任务调度中心</title>
5
-<#import "/common/common.macro.ftl" as netCommon>
6
-<@netCommon.commonStyle />
7
-    <style>
8
-        html{  background-color: whitesmoke;  }
9
-    </style>
10
-</head>
11
-<body class="hold-transition skin-blue layout-top-nav">
12
-
13
-<div class2="wrapper">
14
-
15
-    <header class="main-header">
16
-        <nav class="navbar navbar-static-top">
17
-            <div class="container">
18
-            <#-- icon -->
19
-                <div class="navbar-header">
20
-                    <a href="../../index2.html" class="navbar-brand"><b>日志</b>Console</a>
21
-                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
22
-                        <i class="fa fa-bars"></i>
23
-                    </button>
24
-                </div>
25
-
26
-                <#-- left nav -->
27
-                <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
28
-                    <ul class="nav navbar-nav">
29
-                        <#--<li class="active" ><a href="javascript:;">任务:<span class="sr-only">(current)</span></a></li>-->
30
-                    </ul>
31
-                </div>
32
-
33
-                <#-- right nav -->
34
-                <div class="navbar-custom-menu">
35
-                    <ul class="nav navbar-nav">
36
-                        <li>
37
-                            <a href="javascript:window.location.reload();" >
38
-                                <i class="fa fa-fw fa-refresh" ></i>
39
-                                刷新
40
-                            </a>
41
-                        </li>
42
-                    </ul>
43
-                </div>
44
-
45
-            </div>
46
-        </nav>
47
-    </header>
48
-
49
-    <div>
50
-        <pre>
51
-            <div id="logConsole"></div>
52
-            <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
53
-            <div style="margin-top: 50px;" ></div>
54
-        </pre>
55
-    </div>
56
-
57
-</div>
58
-
59
-<@netCommon.commonScript />
60
-<script>
61
-    // 参数
62
-    var triggerCode = '${triggerCode}';
63
-    var handleCode = '${handleCode}';
64
-    var executorAddress = '${executorAddress}';
65
-    var triggerTime = '${triggerTime}';
66
-    var logId = '${logId}';
67
-</script>
68
-<script src="${request.contextPath}/static/js/logdetail.index.1.js"></script>
69
-
70
-</body>
1
+<!DOCTYPE html>
2
+<html>
3
+<head>
4
+    <title>任务调度中心</title>
5
+<#import "/common/common.macro.ftl" as netCommon>
6
+<@netCommon.commonStyle />
7
+    <style>
8
+        html{  background-color: whitesmoke;  }
9
+    </style>
10
+</head>
11
+<body class="hold-transition skin-blue layout-top-nav">
12
+
13
+<div class2="wrapper">
14
+
15
+    <header class="main-header">
16
+        <nav class="navbar navbar-static-top">
17
+            <div class="container">
18
+            <#-- icon -->
19
+                <div class="navbar-header">
20
+                    <a href="../../index2.html" class="navbar-brand"><b>日志</b>Console</a>
21
+                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
22
+                        <i class="fa fa-bars"></i>
23
+                    </button>
24
+                </div>
25
+
26
+                <#-- left nav -->
27
+                <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
28
+                    <ul class="nav navbar-nav">
29
+                        <#--<li class="active" ><a href="javascript:;">任务:<span class="sr-only">(current)</span></a></li>-->
30
+                    </ul>
31
+                </div>
32
+
33
+                <#-- right nav -->
34
+                <div class="navbar-custom-menu">
35
+                    <ul class="nav navbar-nav">
36
+                        <li>
37
+                            <a href="javascript:window.location.reload();" >
38
+                                <i class="fa fa-fw fa-refresh" ></i>
39
+                                刷新
40
+                            </a>
41
+                        </li>
42
+                    </ul>
43
+                </div>
44
+
45
+            </div>
46
+        </nav>
47
+    </header>
48
+
49
+    <div>
50
+        <pre>
51
+            <div id="logConsole"></div>
52
+            <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
53
+            <div style="margin-top: 50px;" ></div>
54
+        </pre>
55
+    </div>
56
+
57
+</div>
58
+
59
+<@netCommon.commonScript />
60
+<script>
61
+    // 参数
62
+    var triggerCode = '${triggerCode}';
63
+    var handleCode = '${handleCode}';
64
+    var executorAddress = '${executorAddress}';
65
+    var triggerTime = '${triggerTime}';
66
+    var logId = '${logId}';
67
+</script>
68
+<script src="${request.contextPath}/static/js/joblog.detail.1.js"></script>
69
+
70
+</body>
71 71
 </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 查看文件