From e6c239eca0f0a4fcfb906549b726a5515aeab011 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Thu, 19 May 2016 16:17:01 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E6=96=B0=E7=89=88=E6=9C=AC=20V1.3.x?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E7=89=B9=E6=80=A7=20=091=E3=80=81=E9=81=97?=
 =?UTF-8?q?=E5=BC=83=E2=80=9C=E6=9C=AC=E5=9C=B0=E4=BB=BB=E5=8A=A1=E2=80=9D?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E2=80=9C=E8=BF=9C=E7=A8=8B=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E6=98=93=E4=BA=8E=E7=B3=BB=E7=BB=9F=E8=A7=A3?=
 =?UTF-8?q?=E8=80=A6=EF=BC=9B=20=092=E3=80=81=E9=81=97=E5=BC=83=E2=80=9Cse?=
 =?UTF-8?q?rvlet=E2=80=9D=E6=96=B9=E5=BC=8F=E5=BA=95=E5=B1=82=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=80=9A=E8=AE=AF=EF=BC=8C=E6=8E=A8=E8=8D=90=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8JETTY=E6=96=B9=E5=BC=8F=EF=BC=8C=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E9=80=9A=E8=AE=AF=E9=80=BB=E8=BE=91=EF=BC=9B=20=093=E3=80=81?=
 =?UTF-8?q?=E3=80=90=E9=87=8D=E8=A6=81=E3=80=91=E2=80=9C=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E2=80=9D=E7=BB=86=E5=88=86=E4=B8=BA=EF=BC=9A?=
 =?UTF-8?q?BEAN=E3=80=81GLUE=E4=B8=A4=E7=A7=8D=E5=BC=80=E5=8F=91=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=85=B6=E4=B8=ADGLUE=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E2=80=9C=E8=BF=9C=E7=A8=8B=E4=BB=BB=E5=8A=A1=E2=80=9D=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A3=E7=A0=81=E6=89=98=E7=AE=A1=E8=87=B3?=
 =?UTF-8?q?=E4=BA=91=E7=AB=AF=EF=BC=8C=E5=8A=A8=E6=80=81=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=EF=BC=8C=E8=AF=A6=E6=83=85=E8=AF=B7=E5=89=8D?=
 =?UTF-8?q?=E5=BE=80=E5=8D=9A=E5=AE=A2=E6=9F=A5=E7=9C=8B=EF=BC=9B=20=094?=
 =?UTF-8?q?=E3=80=81UI=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E5=B1=95=E5=BC=80=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BC=98=E5=8C=96=EF=BC=8C=E8=8F=9C=E5=8D=95=E9=A1=B9?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=89=93=E5=BC=80=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=9C=89=E5=8E=8B=E7=BC=A9=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  3 +-
 pom.xml                                       |  2 +-
 xxl-job-admin/pom.xml                         |  6 ++--
 .../xxl/job/controller/IndexController.java   |  2 +-
 .../interceptor/CookieInterceptor.java        | 34 +++++++++++++++++++
 .../src/main/resources/springmvc-context.xml  |  4 +++
 .../src/main/webapp/WEB-INF/template/help.ftl |  2 +-
 .../webapp/WEB-INF/template/jobcode/index.ftl |  5 ++-
 .../webapp/WEB-INF/template/jobinfo/index.ftl |  2 +-
 .../webapp/WEB-INF/template/joblog/index.ftl  |  2 +-
 .../src/main/webapp/static/js/common.1.js     | 10 ++++--
 .../main/webapp/static/js/jobcode.index.1.js  |  9 +++--
 xxl-job-client-demo/pom.xml                   |  6 ++--
 xxl-job-client/pom.xml                        |  4 +--
 14 files changed, 68 insertions(+), 23 deletions(-)
 create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/controller/interceptor/CookieInterceptor.java

diff --git a/README.md b/README.md
index eaacebd9..3ff07e7b 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,8 @@ git.osc地址：http://git.oschina.net/xuxueli0323/xxl-job
 # 新版本 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 a434dd4b..2fdec54a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.xxl</groupId>
 	<artifactId>xxl-job</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>xxl-job-admin</module>
diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 91f9b52e..8b8dc129 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>com.xxl</groupId>
 		<artifactId>xxl-job</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>xxl-job-admin</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<properties>
@@ -148,7 +148,7 @@
 		<dependency>
 			<groupId>com.xxl</groupId>
 			<artifactId>xxl-job-client</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.3.1</version>
 		</dependency>
 
 	</dependencies>
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 84e9145c..33370856 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 @@ public class IndexController {
 	}
 	
 	@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 00000000..876473bd
--- /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<String, Cookie> cookieMap = new HashMap<String, Cookie>();
+			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 b0a795b5..594e6b1c 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 @@
 			<mvc:mapping path="/**"/>
 			<bean class="com.xxl.job.controller.interceptor.PermissionInterceptor"/>
 		</mvc:interceptor>
+		<mvc:interceptor>
+			<mvc:mapping path="/**"/>
+			<bean class="com.xxl.job.controller.interceptor.CookieInterceptor"/>
+		</mvc:interceptor>
 	</mvc:interceptors>
 	<bean id="exceptionResolver" class="com.xxl.job.controller.resolver.WebExceptionResolver" />
 	
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 525ddce9..34553653 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 />
 </head>
-<body class="hold-transition skin-blue sidebar-mini">
+<body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if> ">
 <div class="wrapper">
 	<!-- header -->
 	<@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 6e064dc5..d55e20b0 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%;
 		}
     </style>
 </head>
@@ -71,7 +70,7 @@
 	<@netCommon.commonFooter />
 </div>
 
-<textarea id="demoCode" >
+<textarea id="demoCode" style="display:none;" >
 package com.xxl.job.service.handler;
 
 import org.slf4j.Logger;
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl
index 2773184b..ea8f1f4b 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl
@@ -8,7 +8,7 @@
   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.css">
   
 </head>
-<body class="hold-transition skin-blue sidebar-mini">
+<body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if>">
 <div class="wrapper">
 	<!-- header -->
 	<@netCommon.commonHeader />
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
index 4d82663e..b7f9714c 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
@@ -9,7 +9,7 @@
   	<!-- daterangepicker -->
   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker-bs3.css">
 </head>
-<body class="hold-transition skin-blue sidebar-mini">
+<body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if> ">
 <div class="wrapper">
 	<!-- header -->
 	<@netCommon.commonHeader />
diff --git a/xxl-job-admin/src/main/webapp/static/js/common.1.js b/xxl-job-admin/src/main/webapp/static/js/common.1.js
index d7e4c6f3..05af6ddd 100644
--- a/xxl-job-admin/src/main/webapp/static/js/common.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/common.1.js
@@ -1,6 +1,6 @@
 $(function(){
 	
-	// 导航栏,选中样式处理
+	// 导航栏,选中样式处理，js遍历匹配url（遗弃）
 	$(".nav-click").removeClass("active");
 	$(".nav-click").each(function(){
 		if( window.location.href.indexOf( $(this).find("a").attr("href") ) > -1){
@@ -30,9 +30,9 @@ $(function(){
 		});
 	});
 	
-	// adminlte_settings
+	// 左侧菜单状态，js + 后端 + cookie方式（新）
 	$('.sidebar-toggle').click(function(){
-		var adminlte_settings = $.cookie('adminlte_settings');
+		var adminlte_settings = $.cookie('adminlte_settings');	// 左侧菜单展开状态[adminlte_settings]：on=展开，off=折叠
 		if ('off' == adminlte_settings) {
 			adminlte_settings = 'on';
 		} else {
@@ -40,8 +40,12 @@ $(function(){
 		}
 		$.cookie('adminlte_settings', adminlte_settings, { expires: 7 });	//$.cookie('the_cookie', '', { expires: -1 });
 	});
+	// 左侧菜单状态，js + cookie方式（遗弃）
+	/*
 	var adminlte_settings = $.cookie('adminlte_settings');
 	if (adminlte_settings == 'off') {
 		$('body').addClass('sidebar-collapse');
 	}
+	*/
+	
 });
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
index 697366cf..e6479455 100644
--- a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
@@ -8,17 +8,20 @@ $(function() {
 	});
 	codeEditor.setValue( $("#demoCode").val() );
 	
+	var height = Math.max(document.documentElement.clientHeight, document.body.offsetHeight);
+	$(".CodeMirror").attr('style', 'height:'+ height +'px');
+	
 	
 	$("#save").click(function() {
 		var codeSource = codeEditor.getValue();
 		var codeRemark = $("#codeRemark").val();
 		
 		if (!codeRemark) {
-			ComAlert.show(1, "请输入备注");
+			ComAlert.show(2, "请输入备注");
 			return;
 		}
 		if (codeRemark.length < 6|| codeRemark.length > 100) {
-			ComAlert.show(1, "备注长度应该在6至100之间");
+			ComAlert.show(2, "备注长度应该在6至100之间");
 			return;
 		}
 		
@@ -34,7 +37,7 @@ $(function() {
 				dataType : "json",
 				success : function(data){
 					if (data.code == 200) {
-						ComAlert.show(1, '提交成功', function(){
+						ComAlert.show(1, '保存成功', function(){
 							//$(window).unbind('beforeunload');
 							window.location.reload();
 						});
diff --git a/xxl-job-client-demo/pom.xml b/xxl-job-client-demo/pom.xml
index 18443946..14f153d6 100644
--- a/xxl-job-client-demo/pom.xml
+++ b/xxl-job-client-demo/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>com.xxl</groupId>
 		<artifactId>xxl-job</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>xxl-job-client-demo</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<properties>
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>com.xxl</groupId>
 			<artifactId>xxl-job-client</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.3.1</version>
 		</dependency>
 		
 	</dependencies>
diff --git a/xxl-job-client/pom.xml b/xxl-job-client/pom.xml
index 6e2e92c2..2315cb2d 100644
--- a/xxl-job-client/pom.xml
+++ b/xxl-job-client/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>com.xxl</groupId>
 		<artifactId>xxl-job</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>xxl-job-client</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.1</version>
 
 	<dependencies>