xueli.xue %!s(int64=9) %!d(string=hai) anos
pai
achega
9a5b01ed39
Modificáronse 100 ficheiros con 11 adicións e 1 borrados
  1. 11 1
      branch-dianping/README.md
  2. 0 0
      branch-dianping/dianping-job-client-demo/pom.xml
  3. 0 0
      branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java
  4. 0 0
      branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml
  5. 0 0
      branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties
  6. 0 0
      branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml
  7. 0 0
      branch-dianping/dianping-job-client-demo/src/main/webapp/index.html
  8. 0 0
      branch-dianping/dianping-job-client/pom.xml
  9. 0 0
      branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java
  10. 0 0
      branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java
  11. 0 0
      branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java
  12. 0 0
      branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java
  13. 0 0
      branch-dianping/dianping-job-web/pom.xml
  14. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java
  15. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java
  16. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java
  17. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java
  18. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java
  19. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java
  20. 0 0
      branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java
  21. 0 0
      branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml
  22. 0 0
      branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml
  23. 0 0
      branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml
  24. 0 0
      branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml
  25. 0 0
      branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml
  26. 0 0
      branch-dianping/dianping-job-web/src/main/resources/freemarker.properties
  27. 0 0
      branch-dianping/dianping-job-web/src/main/resources/jdbc.properties
  28. 0 0
      branch-dianping/dianping-job-web/src/main/resources/log4j.properties
  29. 0 0
      branch-dianping/dianping-job-web/src/main/resources/quartz.properties
  30. 0 0
      branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml
  31. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/500.html
  32. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl
  33. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl
  34. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl
  35. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl
  36. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl
  37. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml
  38. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
  39. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
  40. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot
  41. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg
  42. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf
  43. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff
  44. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2
  45. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js
  46. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css
  47. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css
  48. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js
  49. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js
  50. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js
  51. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css
  52. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js
  53. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js
  54. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png
  55. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png
  56. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png
  57. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png
  58. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png
  59. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css
  60. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js
  61. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css
  62. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js
  63. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css
  64. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js
  65. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js
  66. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js
  67. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js
  68. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js
  69. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js
  70. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js
  71. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js
  72. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js
  73. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js
  74. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js
  75. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js
  76. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js
  77. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js
  78. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js
  79. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js
  80. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js
  81. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js
  82. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js
  83. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js
  84. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js
  85. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js
  86. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js
  87. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js
  88. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js
  89. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js
  90. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js
  91. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js
  92. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js
  93. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js
  94. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js
  95. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js
  96. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js
  97. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js
  98. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js
  99. 0 0
      branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js
  100. 0 0
      branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js

+ 11 - 1
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. 记录调度日系.

branch-dianping/dianping-job/dianping-job-client-demo/pom.xml → branch-dianping/dianping-job-client-demo/pom.xml


branch-dianping/dianping-job/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java → branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java


branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml → branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml


branch-dianping/dianping-job/dianping-job-client-demo/src/main/resources/log4j.properties → branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties


branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml → branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml


branch-dianping/dianping-job/dianping-job-client-demo/src/main/webapp/index.html → branch-dianping/dianping-job-client-demo/src/main/webapp/index.html


branch-dianping/dianping-job/dianping-job-client/pom.xml → branch-dianping/dianping-job-client/pom.xml


branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java → branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java


branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java → branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java


branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java → branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java


branch-dianping/dianping-job/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java → branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java


branch-dianping/dianping-job/dianping-job-web/pom.xml → branch-dianping/dianping-job-web/pom.xml


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java


branch-dianping/dianping-job/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java → branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java


branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-base.xml → branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml


branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-database.xml → branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml


branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml → branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml


branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml → branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml


branch-dianping/dianping-job/dianping-job-web/src/main/resources/applicationcontext-tx.xml → branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml


branch-dianping/dianping-job/dianping-job-web/src/main/resources/freemarker.properties → branch-dianping/dianping-job-web/src/main/resources/freemarker.properties


branch-dianping/dianping-job/dianping-job-web/src/main/resources/jdbc.properties → branch-dianping/dianping-job-web/src/main/resources/jdbc.properties


branch-dianping/dianping-job/dianping-job-web/src/main/resources/log4j.properties → branch-dianping/dianping-job-web/src/main/resources/log4j.properties


branch-dianping/dianping-job/dianping-job-web/src/main/resources/quartz.properties → branch-dianping/dianping-job-web/src/main/resources/quartz.properties


branch-dianping/dianping-job/dianping-job-web/src/main/resources/springmvc-context.xml → branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/500.html → branch-dianping/dianping-job-web/src/main/webapp/500.html


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl → branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl → branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl → branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl → branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl → branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/WEB-INF/web.xml → branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js


branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js → branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js


+ 0 - 0
branch-dianping/dianping-job/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio