9 gadus atpakaļ · 9a5b01ed39
--- a/branch-dianping/README.md
+++ b/branch-dianping/README.md
@@ -1 +1,11 @@
 
				-#点评定制版
			
 
				+## dianping-job[任务调度平台]

			
 
				+	

			
 
				+	分层： 调度和任务拆分, 支持动态扩充, 管理任务

			
 
				+		1. 调度模块：dianping-job-web, 维护任务的调度信息，负责定时/周期性的发出调度请求.

			
 
				+		2. 任务模块：dianping-job-client, 具体的任务逻辑，负责接收调度模块的调度请求，执行任务逻辑.

			
 
				+		3. 通讯模块：dianping-job-client, 负责调度模块和任务模块之间的通讯.

			
 
				+		

			
 
				+	说明：

			
 
				+		1. 调度模块集群部署[HA].

			
 
				+		2. 任务串行执行.

			
 
				+		3. 记录调度日系.
			
--- a/branch-dianping/dianping-job/dianping-job-client-demo/pom.xml
+++ b/branch-dianping/dianping-job/dianping-job-client-demo/pom.xml
--- a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java
+++ b/branch-dianping/dianping-job/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java
--- a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml
+++ b/branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml
--- a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/log4j.properties
+++ b/branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/log4j.properties
--- a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml
+++ b/branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml
--- a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/index.html
+++ b/branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/index.html
--- a/branch-dianping/dianping-job/dianping-job-client/pom.xml
+++ b/branch-dianping/dianping-job/dianping-job-client/pom.xml
--- a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java
+++ b/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java
--- a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java
+++ b/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java
--- a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java
+++ b/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java
--- a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java
+++ b/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java
--- a/branch-dianping/dianping-job/dianping-job-web/pom.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/pom.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-base.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-base.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-database.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-database.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-tx.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-tx.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/freemarker.properties
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/freemarker.properties
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/jdbc.properties
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/jdbc.properties
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/log4j.properties
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/log4j.properties
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/quartz.properties
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/quartz.properties
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/springmvc-context.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/resources/springmvc-context.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/500.html
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/500.html
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/web.xml
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/web.xml
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js
--- a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js
+++ b/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js