Browse Source

Merge branch 'dev' of chenweida/jw2.0 into dev

chenweida 7 years ago
parent
commit
0627ad394a
100 changed files with 14 additions and 7 deletions
  1. 14 7
      app/app-iot-server/src/main/java/com/yihu/ehr/iot/config/WebMvcConfig.java
  2. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/commonFoot.jsp
  3. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/commonHead.jsp
  4. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/commonInclude.jsp
  5. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/layout.xml
  6. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/mainLayout.jsp
  7. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/simpleLayout.jsp
  8. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/error.jsp
  9. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/signin.jsp
  10. 0 0
      app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/signinJs.jsp
  11. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/animate.min.css
  12. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/bootstrap.min.css
  13. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/bootstrap.min14ed.css
  14. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/demo/webuploader-demo.min.css
  15. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/font-awesome.min93e3.css
  16. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/index.css
  17. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/login.css
  18. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/login.min.css
  19. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/patterns/header-profile-skin-1.png
  20. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/patterns/header-profile-skin-3.png
  21. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/patterns/header-profile.png
  22. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/patterns/shattered.png
  23. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css
  24. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/css/blueimp-gallery.min.css
  25. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/error.png
  26. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/error.svg
  27. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/loading.gif
  28. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/play-pause.png
  29. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/play-pause.svg
  30. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/video-play.png
  31. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/video-play.svg
  32. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/bootstrap-table/bootstrap-table.min.css
  33. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/chosen/chosen-sprite.png
  34. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/chosen/chosen-sprite@2x.png
  35. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/chosen/chosen.css
  36. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/clockpicker/clockpicker.css
  37. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/codemirror/ambiance.css
  38. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/codemirror/codemirror.css
  39. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/css/bootstrap-colorpicker.min.css
  40. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
  41. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/alpha.png
  42. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
  43. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/hue.png
  44. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/saturation.png
  45. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/cropper/cropper.min.css
  46. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/dataTables/dataTables.bootstrap.css
  47. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/datapicker/datepicker3.css
  48. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/dropzone/basic.css
  49. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/dropzone/dropzone.css
  50. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.eot
  51. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.svg
  52. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.ttf
  53. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.woff
  54. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footabled41d.eot
  55. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/footable.core.css
  56. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/fullcalendar/fullcalendar.css
  57. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/fullcalendar/fullcalendar.print.css
  58. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/iCheck/custom.css
  59. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/iCheck/green.png
  60. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/iCheck/green@2x.png
  61. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/sort_asc.png
  62. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/sort_desc.png
  63. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/sprite-skin-flat.png
  64. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/spritemap.png
  65. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/spritemap@2x.png
  66. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/ionRangeSlider/ion.rangeSlider.css
  67. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/ionRangeSlider/ion.rangeSlider.skinFlat.css
  68. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/jasny/jasny-bootstrap.min.css
  69. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/jqgrid/ui.jqgridffe4.css
  70. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/jsTree/style.min.css
  71. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/markdown/bootstrap-markdown.min.css
  72. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/morris/morris-0.4.3.min.css
  73. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/nouslider/jquery.nouislider.css
  74. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/plyr/plyr.css
  75. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/plyr/sprite.svg
  76. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/simditor/simditor.css
  77. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/steps/jquery.steps.css
  78. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/summernote/summernote-bs3.css
  79. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/summernote/summernote.css
  80. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/sweetalert/sweetalert.css
  81. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/switchery/switchery.css
  82. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/toastr/toastr.min.css
  83. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/treeview/bootstrap-treeview.css
  84. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/plugins/webuploader/webuploader.css
  85. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/reset.css
  86. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/style.min.css
  87. 0 0
      app/app-iot-server/src/main/resources/webapp/front/css/style.min862f.css
  88. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.eot
  89. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.svg
  90. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.ttf
  91. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.woff
  92. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.woff2
  93. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfontd41d.eot
  94. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.eot
  95. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.svg
  96. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.ttf
  97. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.woff
  98. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.woff2
  99. 0 0
      app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regulard41d.eot
  100. 0 0
      app/app-iot-server/src/main/webapp/front/images/01309157481ed232f875a42919209a.gif

+ 14 - 7
app/app-iot-server/src/main/java/com/yihu/ehr/iot/config/WebMvcConfig.java

@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
/**
@ -28,13 +29,19 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
        super.addInterceptors(registry);
    }
    /**
     * 配置路径完全匹配
     * @param configurer
     */
//    /**
//     * 配置路径完全匹配
//     *
//     * @param configurer
//     */
//    @Override
//    public void configurePathMatch(PathMatchConfigurer configurer) {
//        configurer.setUseSuffixPatternMatch(false)
//                .setUseTrailingSlashMatch(true);
//    }
    @Override
    public void configurePathMatch(PathMatchConfigurer configurer) {
        configurer.setUseSuffixPatternMatch(false)
                .setUseTrailingSlashMatch(true);
    public void addResourceHandlers(ResourceHandlerRegistry registry) {
        registry.addResourceHandler("/front/**").addResourceLocations("classpath:/webapp/front/");
    }
}

app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonFoot.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/commonFoot.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonHead.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/commonHead.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonInclude.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/commonInclude.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/layout.xml → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/layout.xml


app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/mainLayout.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/mainLayout.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/simpleLayout.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/common/simpleLayout.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/error.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/error.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/signin.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/signin.jsp


app/app-iot-server/src/main/webapp/WEB-INF/jsp/signinJs.jsp → app/app-iot-server/src/main/resources/webapp/WEB-INF/jsp/signinJs.jsp


app/app-iot-server/src/main/webapp/front/css/animate.min.css → app/app-iot-server/src/main/resources/webapp/front/css/animate.min.css


app/app-iot-server/src/main/webapp/front/css/bootstrap.min.css → app/app-iot-server/src/main/resources/webapp/front/css/bootstrap.min.css


app/app-iot-server/src/main/webapp/front/css/bootstrap.min14ed.css → app/app-iot-server/src/main/resources/webapp/front/css/bootstrap.min14ed.css


app/app-iot-server/src/main/webapp/front/css/demo/webuploader-demo.min.css → app/app-iot-server/src/main/resources/webapp/front/css/demo/webuploader-demo.min.css


app/app-iot-server/src/main/webapp/front/css/font-awesome.min93e3.css → app/app-iot-server/src/main/resources/webapp/front/css/font-awesome.min93e3.css


app/app-iot-server/src/main/webapp/front/css/index.css → app/app-iot-server/src/main/resources/webapp/front/css/index.css


app/app-iot-server/src/main/webapp/front/css/login.css → app/app-iot-server/src/main/resources/webapp/front/css/login.css


app/app-iot-server/src/main/webapp/front/css/login.min.css → app/app-iot-server/src/main/resources/webapp/front/css/login.min.css


app/app-iot-server/src/main/webapp/front/css/patterns/header-profile-skin-1.png → app/app-iot-server/src/main/resources/webapp/front/css/patterns/header-profile-skin-1.png


app/app-iot-server/src/main/webapp/front/css/patterns/header-profile-skin-3.png → app/app-iot-server/src/main/resources/webapp/front/css/patterns/header-profile-skin-3.png


app/app-iot-server/src/main/webapp/front/css/patterns/header-profile.png → app/app-iot-server/src/main/resources/webapp/front/css/patterns/header-profile.png


app/app-iot-server/src/main/webapp/front/css/patterns/shattered.png → app/app-iot-server/src/main/resources/webapp/front/css/patterns/shattered.png


app/app-iot-server/src/main/webapp/front/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/css/blueimp-gallery.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/css/blueimp-gallery.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/error.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/error.png


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/error.svg → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/error.svg


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/loading.gif → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/loading.gif


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/play-pause.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/play-pause.png


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/play-pause.svg → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/play-pause.svg


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/video-play.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/video-play.png


app/app-iot-server/src/main/webapp/front/css/plugins/blueimp/img/video-play.svg → app/app-iot-server/src/main/resources/webapp/front/css/plugins/blueimp/img/video-play.svg


app/app-iot-server/src/main/webapp/front/css/plugins/bootstrap-table/bootstrap-table.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/bootstrap-table/bootstrap-table.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/chosen/chosen-sprite.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/chosen/chosen-sprite.png


app/app-iot-server/src/main/webapp/front/css/plugins/chosen/chosen-sprite@2x.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/chosen/chosen-sprite@2x.png


app/app-iot-server/src/main/webapp/front/css/plugins/chosen/chosen.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/chosen/chosen.css


app/app-iot-server/src/main/webapp/front/css/plugins/clockpicker/clockpicker.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/clockpicker/clockpicker.css


app/app-iot-server/src/main/webapp/front/css/plugins/codemirror/ambiance.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/codemirror/ambiance.css


app/app-iot-server/src/main/webapp/front/css/plugins/codemirror/codemirror.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/codemirror/codemirror.css


app/app-iot-server/src/main/webapp/front/css/plugins/colorpicker/css/bootstrap-colorpicker.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/css/bootstrap-colorpicker.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png


app/app-iot-server/src/main/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/alpha.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/alpha.png


app/app-iot-server/src/main/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png


app/app-iot-server/src/main/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/hue.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/hue.png


app/app-iot-server/src/main/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/saturation.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/colorpicker/img/bootstrap-colorpicker/saturation.png


app/app-iot-server/src/main/webapp/front/css/plugins/cropper/cropper.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/cropper/cropper.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/dataTables/dataTables.bootstrap.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/dataTables/dataTables.bootstrap.css


app/app-iot-server/src/main/webapp/front/css/plugins/datapicker/datepicker3.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/datapicker/datepicker3.css


app/app-iot-server/src/main/webapp/front/css/plugins/dropzone/basic.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/dropzone/basic.css


app/app-iot-server/src/main/webapp/front/css/plugins/dropzone/dropzone.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/dropzone/dropzone.css


app/app-iot-server/src/main/webapp/front/css/plugins/footable/fonts/footable.eot → app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.eot


app/app-iot-server/src/main/webapp/front/css/plugins/footable/fonts/footable.svg → app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.svg


app/app-iot-server/src/main/webapp/front/css/plugins/footable/fonts/footable.ttf → app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.ttf


app/app-iot-server/src/main/webapp/front/css/plugins/footable/fonts/footable.woff → app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footable.woff


app/app-iot-server/src/main/webapp/front/css/plugins/footable/fonts/footabled41d.eot → app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/fonts/footabled41d.eot


app/app-iot-server/src/main/webapp/front/css/plugins/footable/footable.core.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/footable/footable.core.css


app/app-iot-server/src/main/webapp/front/css/plugins/fullcalendar/fullcalendar.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/fullcalendar/fullcalendar.css


app/app-iot-server/src/main/webapp/front/css/plugins/fullcalendar/fullcalendar.print.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/fullcalendar/fullcalendar.print.css


app/app-iot-server/src/main/webapp/front/css/plugins/iCheck/custom.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/iCheck/custom.css


app/app-iot-server/src/main/webapp/front/css/plugins/iCheck/green.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/iCheck/green.png


app/app-iot-server/src/main/webapp/front/css/plugins/iCheck/green@2x.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/iCheck/green@2x.png


app/app-iot-server/src/main/webapp/front/css/plugins/images/sort_asc.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/sort_asc.png


app/app-iot-server/src/main/webapp/front/css/plugins/images/sort_desc.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/sort_desc.png


app/app-iot-server/src/main/webapp/front/css/plugins/images/sprite-skin-flat.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/sprite-skin-flat.png


app/app-iot-server/src/main/webapp/front/css/plugins/images/spritemap.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/spritemap.png


app/app-iot-server/src/main/webapp/front/css/plugins/images/spritemap@2x.png → app/app-iot-server/src/main/resources/webapp/front/css/plugins/images/spritemap@2x.png


app/app-iot-server/src/main/webapp/front/css/plugins/ionRangeSlider/ion.rangeSlider.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/ionRangeSlider/ion.rangeSlider.css


app/app-iot-server/src/main/webapp/front/css/plugins/ionRangeSlider/ion.rangeSlider.skinFlat.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/ionRangeSlider/ion.rangeSlider.skinFlat.css


app/app-iot-server/src/main/webapp/front/css/plugins/jasny/jasny-bootstrap.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/jasny/jasny-bootstrap.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/jqgrid/ui.jqgridffe4.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/jqgrid/ui.jqgridffe4.css


app/app-iot-server/src/main/webapp/front/css/plugins/jsTree/style.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/jsTree/style.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/markdown/bootstrap-markdown.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/markdown/bootstrap-markdown.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/morris/morris-0.4.3.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/morris/morris-0.4.3.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/nouslider/jquery.nouislider.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/nouslider/jquery.nouislider.css


app/app-iot-server/src/main/webapp/front/css/plugins/plyr/plyr.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/plyr/plyr.css


app/app-iot-server/src/main/webapp/front/css/plugins/plyr/sprite.svg → app/app-iot-server/src/main/resources/webapp/front/css/plugins/plyr/sprite.svg


app/app-iot-server/src/main/webapp/front/css/plugins/simditor/simditor.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/simditor/simditor.css


app/app-iot-server/src/main/webapp/front/css/plugins/steps/jquery.steps.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/steps/jquery.steps.css


app/app-iot-server/src/main/webapp/front/css/plugins/summernote/summernote-bs3.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/summernote/summernote-bs3.css


app/app-iot-server/src/main/webapp/front/css/plugins/summernote/summernote.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/summernote/summernote.css


app/app-iot-server/src/main/webapp/front/css/plugins/sweetalert/sweetalert.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/sweetalert/sweetalert.css


app/app-iot-server/src/main/webapp/front/css/plugins/switchery/switchery.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/switchery/switchery.css


app/app-iot-server/src/main/webapp/front/css/plugins/toastr/toastr.min.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/toastr/toastr.min.css


app/app-iot-server/src/main/webapp/front/css/plugins/treeview/bootstrap-treeview.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/treeview/bootstrap-treeview.css


app/app-iot-server/src/main/webapp/front/css/plugins/webuploader/webuploader.css → app/app-iot-server/src/main/resources/webapp/front/css/plugins/webuploader/webuploader.css


app/app-iot-server/src/main/webapp/front/css/reset.css → app/app-iot-server/src/main/resources/webapp/front/css/reset.css


app/app-iot-server/src/main/webapp/front/css/style.min.css → app/app-iot-server/src/main/resources/webapp/front/css/style.min.css


app/app-iot-server/src/main/webapp/front/css/style.min862f.css → app/app-iot-server/src/main/resources/webapp/front/css/style.min862f.css


app/app-iot-server/src/main/webapp/front/fonts/fontawesome-webfont93e3.eot → app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.eot


app/app-iot-server/src/main/webapp/front/fonts/fontawesome-webfont93e3.svg → app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.svg


app/app-iot-server/src/main/webapp/front/fonts/fontawesome-webfont93e3.ttf → app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.ttf


app/app-iot-server/src/main/webapp/front/fonts/fontawesome-webfont93e3.woff → app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.woff


app/app-iot-server/src/main/webapp/front/fonts/fontawesome-webfont93e3.woff2 → app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfont93e3.woff2


app/app-iot-server/src/main/webapp/front/fonts/fontawesome-webfontd41d.eot → app/app-iot-server/src/main/resources/webapp/front/fonts/fontawesome-webfontd41d.eot


app/app-iot-server/src/main/webapp/front/fonts/glyphicons-halflings-regular.eot → app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.eot


app/app-iot-server/src/main/webapp/front/fonts/glyphicons-halflings-regular.svg → app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.svg


app/app-iot-server/src/main/webapp/front/fonts/glyphicons-halflings-regular.ttf → app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.ttf


app/app-iot-server/src/main/webapp/front/fonts/glyphicons-halflings-regular.woff → app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.woff


app/app-iot-server/src/main/webapp/front/fonts/glyphicons-halflings-regular.woff2 → app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regular.woff2


app/app-iot-server/src/main/webapp/front/fonts/glyphicons-halflings-regulard41d.eot → app/app-iot-server/src/main/resources/webapp/front/fonts/glyphicons-halflings-regulard41d.eot


+ 0 - 0
app/app-iot-server/src/main/webapp/front/images/01309157481ed232f875a42919209a.gif


Some files were not shown because too many files changed in this diff