Selaa lähdekoodia

升级quzrtz版本2.3.3

xueli.xue 9 vuotta sitten
vanhempi
commit
e0f0d660ec

+ 2 - 2
xxl-job-admin/pom.xml Näytä tiedosto

137
 			<version>1.4.6</version>
137
 			<version>1.4.6</version>
138
 		</dependency>
138
 		</dependency>
139
 		
139
 		
140
-		<!-- quartz :quartz-2.2.1/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
140
+		<!-- quartz :quartz-2.2.3/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
141
 		<dependency>
141
 		<dependency>
142
 			<groupId>org.quartz-scheduler</groupId>
142
 			<groupId>org.quartz-scheduler</groupId>
143
 			<artifactId>quartz</artifactId>
143
 			<artifactId>quartz</artifactId>
144
-			<version>2.2.2</version>
144
+			<version>2.2.3</version>
145
 		</dependency>
145
 		</dependency>
146
 		
146
 		
147
 		<!-- xxl-job-client -->
147
 		<!-- xxl-job-client -->

+ 3 - 3
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js Näytä tiedosto

171
 	$('#joblog_list').on('click', '.logDetail', function(){
171
 	$('#joblog_list').on('click', '.logDetail', function(){
172
 		var _id = $(this).attr('_id');
172
 		var _id = $(this).attr('_id');
173
 		
173
 		
174
-		window.open(base_url + 'joblog/logDetailPage?id=' + _id);
174
+		window.open(base_url + '/joblog/logDetailPage?id=' + _id);
175
 		return;
175
 		return;
176
 		
176
 		
177
 		/*
177
 		/*
178
 		$.ajax({
178
 		$.ajax({
179
 			type : 'POST',
179
 			type : 'POST',
180
-			url : base_url + 'joblog/logDetail',
180
+			url : base_url + '/joblog/logDetail',
181
 			data : {"id":_id},
181
 			data : {"id":_id},
182
 			dataType : "json",
182
 			dataType : "json",
183
 			success : function(data){
183
 			success : function(data){
196
 		ComConfirm.show("确认主动终止任务?", function(){
196
 		ComConfirm.show("确认主动终止任务?", function(){
197
 			$.ajax({
197
 			$.ajax({
198
 				type : 'POST',
198
 				type : 'POST',
199
-				url : base_url + 'joblog/logKill',
199
+				url : base_url + '/joblog/logKill',
200
 				data : {"id":_id},
200
 				data : {"id":_id},
201
 				dataType : "json",
201
 				dataType : "json",
202
 				success : function(data){
202
 				success : function(data){