<@netCommon.commonHeader />
diff --git a/README.md b/README.md
index eaacebd..3ff07e7 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,8 @@
# 新版本 V1.3.x，新特性
1、遗弃“本地任务”开发模式，推荐使用“远程任务”，易于系统解耦；
2、遗弃“servlet”方式底层系统通讯，推荐使用JETTY方式，重构通讯逻辑；
- 3、【重要】“远程任务”细分为：BEAN、GLUE两种开发模式，其中GLUE方式“远程任务”的逻辑代码托管至云端，详情请前往博客查看；
+ 3、【重要】“远程任务”细分为：BEAN、GLUE两种开发模式，其中GLUE方式“远程任务”的逻辑代码托管至云端，动态编译生效，详情请前往博客查看；
+ 4、UI交互优化：左侧菜单展开状态优化，菜单项选中状态优化，任务列表打开表格有压缩优化；
# 其他说明
diff --git a/pom.xml b/pom.xml
index a434dd4..2fdec54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.xxl
xxl-job
-
1.2.0-SNAPSHOT
+
1.3.0-SNAPSHOT
pom
xxl-job-admin
diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 91f9b52..8b8dc12 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -4,10 +4,10 @@
com.xxl
xxl-job
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
xxl-job-admin
- 1.2.1-SNAPSHOT
+ 1.3.1-SNAPSHOT
war
@@ -148,7 +148,7 @@
com.xxl
xxl-job-client
- 1.2.1-SNAPSHOT
+ 1.3.1
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java
index 84e9145..3337085 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java
@@ -69,7 +69,7 @@
}
@RequestMapping("/help")
- public String help(Model model) {
+ public String help() {
return "help";
}
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/interceptor/CookieInterceptor.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/interceptor/CookieInterceptor.java
new file mode 100644
index 0000000..876473b
--- /dev/null
+++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/interceptor/CookieInterceptor.java
@@ -0,0 +1,34 @@
+package com.xxl.job.controller.interceptor;
+
+import java.util.HashMap;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+/**
+ * push cookies to model as cookieMap
+ * @author xuxueli 2015-12-12 18:09:04
+ */
+public class CookieInterceptor extends HandlerInterceptorAdapter {
+
+ @Override
+ public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+ ModelAndView modelAndView) throws Exception {
+
+ if (modelAndView!=null && ArrayUtils.isNotEmpty(request.getCookies())) {
+ HashMap cookieMap = new HashMap();
+ for (Cookie ck : request.getCookies()) {
+ cookieMap.put(ck.getName(), ck);
+ }
+ modelAndView.addObject("cookieMap", cookieMap);
+ }
+
+ super.postHandle(request, response, handler, modelAndView);
+ }
+
+}
diff --git a/xxl-job-admin/src/main/resources/springmvc-context.xml b/xxl-job-admin/src/main/resources/springmvc-context.xml
index b0a795b..594e6b1 100644
--- a/xxl-job-admin/src/main/resources/springmvc-context.xml
+++ b/xxl-job-admin/src/main/resources/springmvc-context.xml
@@ -43,6 +43,10 @@
+
+
+
+
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
index 525ddce..3455365 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
@@ -5,7 +5,7 @@
<#import "/common/common.macro.ftl" as netCommon>
<@netCommon.commonStyle />
-
+sidebar-collapse ">
<@netCommon.commonHeader />
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl
index 6e064dc..d55e20b 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/index.ftl
@@ -10,8 +10,7 @@
.CodeMirror {
border: 0px solid black;
font-size:16px;
- height: 95%;
- row:200;
+ height: 100%;
}
@@ -71,7 +70,7 @@
<@netCommon.commonFooter />
-