From 9a5b01ed39ba610eda015e1a7b15c39afe2b8bf0 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Wed, 23 Dec 2015 17:58:24 +0800 Subject: [PATCH] init --- branch-dianping/README.md | 12 +++++++++++- .../dianping-job-client-demo/pom.xml | 0 .../job/service/handler/DemoJobHandler.java | 0 .../src/main/resources/applicationcontext-base.xml | 0 .../src/main/resources/log4j.properties | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.html | 0 .../{dianping-job => }/dianping-job-client/pom.xml | 0 .../job/client/handler/HandlerRepository.java | 0 .../dianping/job/client/handler/IJobHandler.java | 0 .../job/client/netcom/http/DianpingJobServlet.java | 0 .../java/com/dianping/job/client/util/HttpUtil.java | 0 .../{dianping-job => }/dianping-job-web/pom.xml | 0 .../dianping/job/controller/IndexController.java | 0 .../com/dianping/job/core/model/DianpingJobLog.java | 0 .../java/com/dianping/job/core/model/ReturnT.java | 0 .../job/core/util/DynamicSchedulerUtil.java | 0 .../com/dianping/job/service/ITriggerService.java | 0 .../job/service/impl/TriggerServiceImpl.java | 0 .../com/dianping/job/service/job/HttpJobBean.java | 0 .../src/main/resources/applicationcontext-base.xml | 0 .../main/resources/applicationcontext-database.xml | 0 .../resources/applicationcontext-trigger-db.xml | 0 .../resources/applicationcontext-trigger-local.xml | 0 .../src/main/resources/applicationcontext-tx.xml | 0 .../src/main/resources/freemarker.properties | 0 .../src/main/resources/jdbc.properties | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/quartz.properties | 0 .../src/main/resources/springmvc-context.xml | 0 .../dianping-job-web/src/main/webapp/500.html | 0 .../WEB-INF/template/common/common.exception.ftl | 0 .../webapp/WEB-INF/template/common/common.macro.ftl | 0 .../WEB-INF/template/common/common.result.ftl | 0 .../src/main/webapp/WEB-INF/template/job/help.ftl | 0 .../src/main/webapp/WEB-INF/template/job/index.ftl | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../static/adminlte/bootstrap/css/bootstrap.css.map | 0 .../static/adminlte/bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../static/adminlte/bootstrap/js/bootstrap.min.js | 0 .../static/adminlte/dist/css/AdminLTE.min.css | 0 .../adminlte/dist/css/skins/_all-skins.min.css | 0 .../main/webapp/static/adminlte/dist/js/app.min.js | 0 .../static/adminlte/dist/js/pages/dashboard.js | 0 .../static/adminlte/dist/js/pages/dashboard2.js | 0 .../plugins/datatables/dataTables.bootstrap.css | 0 .../plugins/datatables/dataTables.bootstrap.js | 0 .../plugins/datatables/dataTables.bootstrap.min.js | 0 .../adminlte/plugins/datatables/images/sort_asc.png | Bin .../plugins/datatables/images/sort_asc_disabled.png | Bin .../plugins/datatables/images/sort_both.png | Bin .../plugins/datatables/images/sort_desc.png | Bin .../datatables/images/sort_desc_disabled.png | Bin .../plugins/datatables/jquery.dataTables.css | 0 .../plugins/datatables/jquery.dataTables.js | 0 .../plugins/datatables/jquery.dataTables.min.css | 0 .../plugins/datatables/jquery.dataTables.min.js | 0 .../datatables/jquery.dataTables_themeroller.css | 0 .../static/adminlte/plugins/fastclick/fastclick.js | 0 .../adminlte/plugins/fastclick/fastclick.min.js | 0 .../adminlte/plugins/jQuery/jQuery-2.1.4.min.js | 0 .../static/adminlte/plugins/select2/i18n/az.js | 0 .../static/adminlte/plugins/select2/i18n/bg.js | 0 .../static/adminlte/plugins/select2/i18n/ca.js | 0 .../static/adminlte/plugins/select2/i18n/cs.js | 0 .../static/adminlte/plugins/select2/i18n/da.js | 0 .../static/adminlte/plugins/select2/i18n/de.js | 0 .../static/adminlte/plugins/select2/i18n/en.js | 0 .../static/adminlte/plugins/select2/i18n/es.js | 0 .../static/adminlte/plugins/select2/i18n/et.js | 0 .../static/adminlte/plugins/select2/i18n/eu.js | 0 .../static/adminlte/plugins/select2/i18n/fa.js | 0 .../static/adminlte/plugins/select2/i18n/fi.js | 0 .../static/adminlte/plugins/select2/i18n/fr.js | 0 .../static/adminlte/plugins/select2/i18n/gl.js | 0 .../static/adminlte/plugins/select2/i18n/he.js | 0 .../static/adminlte/plugins/select2/i18n/hi.js | 0 .../static/adminlte/plugins/select2/i18n/hr.js | 0 .../static/adminlte/plugins/select2/i18n/hu.js | 0 .../static/adminlte/plugins/select2/i18n/id.js | 0 .../static/adminlte/plugins/select2/i18n/is.js | 0 .../static/adminlte/plugins/select2/i18n/it.js | 0 .../static/adminlte/plugins/select2/i18n/ko.js | 0 .../static/adminlte/plugins/select2/i18n/lt.js | 0 .../static/adminlte/plugins/select2/i18n/lv.js | 0 .../static/adminlte/plugins/select2/i18n/mk.js | 0 .../static/adminlte/plugins/select2/i18n/nb.js | 0 .../static/adminlte/plugins/select2/i18n/nl.js | 0 .../static/adminlte/plugins/select2/i18n/pl.js | 0 .../static/adminlte/plugins/select2/i18n/pt-BR.js | 0 .../static/adminlte/plugins/select2/i18n/pt.js | 0 .../static/adminlte/plugins/select2/i18n/ro.js | 0 .../static/adminlte/plugins/select2/i18n/ru.js | 0 .../static/adminlte/plugins/select2/i18n/sk.js | 0 .../static/adminlte/plugins/select2/i18n/sr.js | 0 .../static/adminlte/plugins/select2/i18n/sv.js | 0 .../static/adminlte/plugins/select2/i18n/th.js | 0 .../static/adminlte/plugins/select2/i18n/tr.js | 0 .../static/adminlte/plugins/select2/i18n/uk.js | 0 .../static/adminlte/plugins/select2/i18n/vi.js | 0 .../static/adminlte/plugins/select2/i18n/zh-CN.js | 0 .../static/adminlte/plugins/select2/i18n/zh-TW.js | 0 .../static/adminlte/plugins/select2/select2.css | 0 .../static/adminlte/plugins/select2/select2.full.js | 0 .../adminlte/plugins/select2/select2.full.min.js | 0 .../static/adminlte/plugins/select2/select2.js | 0 .../static/adminlte/plugins/select2/select2.min.css | 0 .../static/adminlte/plugins/select2/select2.min.js | 0 .../src/main/webapp/static/js/common.1.js | 0 .../src/main/webapp/static/js/job.index.1.js | 0 .../src/main/webapp/static/js/login.1.js | 0 .../plugins/font-awesome-4.3.0/css/font-awesome.css | 0 .../font-awesome-4.3.0/css/font-awesome.min.css | 0 .../font-awesome-4.3.0/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../plugins/font-awesome-4.3.0/less/animated.less | 0 .../font-awesome-4.3.0/less/bordered-pulled.less | 0 .../plugins/font-awesome-4.3.0/less/core.less | 0 .../font-awesome-4.3.0/less/fixed-width.less | 0 .../font-awesome-4.3.0/less/font-awesome.less | 0 .../plugins/font-awesome-4.3.0/less/icons.less | 0 .../plugins/font-awesome-4.3.0/less/larger.less | 0 .../plugins/font-awesome-4.3.0/less/list.less | 0 .../plugins/font-awesome-4.3.0/less/mixins.less | 0 .../plugins/font-awesome-4.3.0/less/path.less | 0 .../font-awesome-4.3.0/less/rotated-flipped.less | 0 .../plugins/font-awesome-4.3.0/less/stacked.less | 0 .../plugins/font-awesome-4.3.0/less/variables.less | 0 .../static/plugins/ionicons-2.0.1/css/ionicons.css | 0 .../plugins/ionicons-2.0.1/css/ionicons.min.css | 0 .../plugins/ionicons-2.0.1/fonts/ionicons.eot | Bin .../plugins/ionicons-2.0.1/fonts/ionicons.svg | 0 .../plugins/ionicons-2.0.1/fonts/ionicons.ttf | Bin .../plugins/ionicons-2.0.1/fonts/ionicons.woff | Bin .../static/plugins/jquery/jquery.validate.min.js | 0 .../main/webapp/static/plugins/scrollup/image.css | 0 .../static/plugins/scrollup/jquery.scrollUp.min.js | 0 .../src/main/webapp/static/plugins/scrollup/top.png | Bin branch-dianping/dianping-job/README.md | 11 ----------- .../doc/db/tables_mysql-for-dianping-wed.sql | 0 .../{dianping-job => }/doc/db/tables_mysql.sql | 0 branch-dianping/{dianping-job => }/pom.xml | 0 151 files changed, 11 insertions(+), 12 deletions(-) rename branch-dianping/{dianping-job => }/dianping-job-client-demo/pom.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-client-demo/src/main/resources/log4j.properties (100%) rename branch-dianping/{dianping-job => }/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-client-demo/src/main/webapp/index.html (100%) rename branch-dianping/{dianping-job => }/dianping-job-client/pom.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/pom.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/applicationcontext-base.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/applicationcontext-database.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/applicationcontext-tx.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/freemarker.properties (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/jdbc.properties (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/log4j.properties (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/quartz.properties (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/resources/springmvc-context.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/500.html (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/WEB-INF/web.xml (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/js/common.1.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/js/job.index.1.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/js/login.1.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js (100%) rename branch-dianping/{dianping-job => }/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png (100%) delete mode 100644 branch-dianping/dianping-job/README.md rename branch-dianping/{dianping-job => }/doc/db/tables_mysql-for-dianping-wed.sql (100%) rename branch-dianping/{dianping-job => }/doc/db/tables_mysql.sql (100%) rename branch-dianping/{dianping-job => }/pom.xml (100%) diff --git a/branch-dianping/README.md b/branch-dianping/README.md index 2c762282..89fa00ed 100644 --- 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. 记录调度日系. \ No newline at end of file diff --git a/branch-dianping/dianping-job/dianping-job-client-demo/pom.xml b/branch-dianping/dianping-job-client-demo/pom.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client-demo/pom.xml rename to branch-dianping/dianping-job-client-demo/pom.xml diff --git a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java b/branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java rename to branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java diff --git a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml b/branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml rename to branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml diff --git a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/log4j.properties b/branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/log4j.properties rename to branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties diff --git a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml b/branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml rename to branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml diff --git a/branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/index.html b/branch-dianping/dianping-job-client-demo/src/main/webapp/index.html similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/index.html rename to branch-dianping/dianping-job-client-demo/src/main/webapp/index.html diff --git a/branch-dianping/dianping-job/dianping-job-client/pom.xml b/branch-dianping/dianping-job-client/pom.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client/pom.xml rename to branch-dianping/dianping-job-client/pom.xml diff --git a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java b/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java rename to branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java diff --git a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java b/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java rename to branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java diff --git a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java b/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java rename to branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java diff --git a/branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java b/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java rename to branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java diff --git a/branch-dianping/dianping-job/dianping-job-web/pom.xml b/branch-dianping/dianping-job-web/pom.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/pom.xml rename to branch-dianping/dianping-job-web/pom.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java b/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java rename to branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-base.xml b/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-base.xml rename to branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-database.xml b/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-database.xml rename to branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml b/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml rename to branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml b/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml rename to branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-tx.xml b/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-tx.xml rename to branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/freemarker.properties b/branch-dianping/dianping-job-web/src/main/resources/freemarker.properties similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/freemarker.properties rename to branch-dianping/dianping-job-web/src/main/resources/freemarker.properties diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/jdbc.properties b/branch-dianping/dianping-job-web/src/main/resources/jdbc.properties similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/jdbc.properties rename to branch-dianping/dianping-job-web/src/main/resources/jdbc.properties diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/log4j.properties b/branch-dianping/dianping-job-web/src/main/resources/log4j.properties similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/log4j.properties rename to branch-dianping/dianping-job-web/src/main/resources/log4j.properties diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/quartz.properties b/branch-dianping/dianping-job-web/src/main/resources/quartz.properties similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/quartz.properties rename to branch-dianping/dianping-job-web/src/main/resources/quartz.properties diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/resources/springmvc-context.xml b/branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/resources/springmvc-context.xml rename to branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/500.html b/branch-dianping/dianping-job-web/src/main/webapp/500.html similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/500.html rename to branch-dianping/dianping-job-web/src/main/webapp/500.html diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl rename to branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl rename to branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl rename to branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl rename to branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl rename to branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/web.xml b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/web.xml rename to branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css diff --git 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-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png diff --git 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-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png diff --git 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-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js diff --git 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-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/js/common.1.js b/branch-dianping/dianping-job-web/src/main/webapp/static/js/common.1.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/js/common.1.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/js/common.1.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/js/job.index.1.js b/branch-dianping/dianping-job-web/src/main/webapp/static/js/job.index.1.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/js/job.index.1.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/js/job.index.1.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/js/login.1.js b/branch-dianping/dianping-job-web/src/main/webapp/static/js/login.1.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/js/login.1.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/js/login.1.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js diff --git a/branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png b/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png similarity index 100% rename from branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png rename to branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png diff --git a/branch-dianping/dianping-job/README.md b/branch-dianping/dianping-job/README.md deleted file mode 100644 index 89fa00ed..00000000 --- a/branch-dianping/dianping-job/README.md +++ /dev/null @@ -1,11 +0,0 @@ -## dianping-job[任务调度平台] - - 分层： 调度和任务拆分, 支持动态扩充, 管理任务 - 1. 调度模块：dianping-job-web, 维护任务的调度信息，负责定时/周期性的发出调度请求. - 2. 任务模块：dianping-job-client, 具体的任务逻辑，负责接收调度模块的调度请求，执行任务逻辑. - 3. 通讯模块：dianping-job-client, 负责调度模块和任务模块之间的通讯. - - 说明： - 1. 调度模块集群部署[HA]. - 2. 任务串行执行. - 3. 记录调度日系. \ No newline at end of file diff --git a/branch-dianping/dianping-job/doc/db/tables_mysql-for-dianping-wed.sql b/branch-dianping/doc/db/tables_mysql-for-dianping-wed.sql similarity index 100% rename from branch-dianping/dianping-job/doc/db/tables_mysql-for-dianping-wed.sql rename to branch-dianping/doc/db/tables_mysql-for-dianping-wed.sql diff --git a/branch-dianping/dianping-job/doc/db/tables_mysql.sql b/branch-dianping/doc/db/tables_mysql.sql similarity index 100% rename from branch-dianping/dianping-job/doc/db/tables_mysql.sql rename to branch-dianping/doc/db/tables_mysql.sql diff --git a/branch-dianping/dianping-job/pom.xml b/branch-dianping/pom.xml similarity index 100% rename from branch-dianping/dianping-job/pom.xml rename to branch-dianping/pom.xml