diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java index a0aefc56..cb1c0792 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java @@ -36,7 +36,7 @@ public class Application extends SpringBootServletInitializer { String urlCtx = hostAddress + ":" + serverPort + "/" + contextPath; logger.info("\n----------------------------------------------------------\n\t" + "\t\t地址列表\n\t" + - "管理地址：http://{}statics/manage/home.html\n" + + "管理地址：http://{}static/manage/home.html\n" + "----------------------------------------------------------", urlCtx ); diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/WebSecurityConfig.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/WebSecurityConfig.java index 810fd275..85d66911 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/WebSecurityConfig.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/WebSecurityConfig.java @@ -39,12 +39,12 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { */ @Override public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/statics/lib/**", "/css/**", "/js/**", "/img/**"); + web.ignoring().antMatchers("/static/lib/**", "/css/**", "/js/**", "/img/**"); } @Override protected void configure(HttpSecurity http) throws Exception { - String loginPage = "/statics/manage/login.html"; + String loginPage = "/static/manage/login.html"; http.authorizeRequests().antMatchers("/login/**").permitAll()//为了测试其他功能，设置“ /** ”允许所有请求 .antMatchers("/document.html", "/doc.html").hasAuthority("DOC_ALL") @@ -135,4 +135,4 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { return myFilter; } -} \ No newline at end of file +} diff --git a/zyplayer-doc-manage/src/main/resources/application.yml b/zyplayer-doc-manage/src/main/resources/application.yml index 9d35216c..f8a48bd8 100644 --- a/zyplayer-doc-manage/src/main/resources/application.yml +++ b/zyplayer-doc-manage/src/main/resources/application.yml @@ -1,30 +1,14 @@ spring: application: name: zyplayer-doc-manage - velocity: - layout-url: common/default.vm - cache: false - suffix: .vm - expose-spring-macro-helpers: true - date-tool-attribute: dateTool - number-tool-attribute: numberTool - contentType: text/html;charset=UTF-8 - resource-loader-path: classpath:/vm/ - default-content-type: text/html - ignore-accept-header: true - charset: UTF-8 - properties: - input: - encoding: UTF-8 - output: - encoding: UTF-8 +# mvc: +# static-path-pattern: /** server: port: 8082 servlet: context-path: /zyplayer-doc-manage - zyplayer: doc: # zyplayer_doc_manage管理端的数据库配置 @@ -74,8 +58,8 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true cache-enabled: false - - + + #一些测试地址 #https://gitee.com/GeekPerson/central-platform 项目的文档 -#http://47.99.88.28:9200/swagger-resources \ No newline at end of file +#http://47.99.88.28:9200/swagger-resources diff --git a/zyplayer-doc-manage/src/main/webapp/statics/common/403.html b/zyplayer-doc-manage/src/main/webapp/static/common/403.html similarity index 97% rename from zyplayer-doc-manage/src/main/webapp/statics/common/403.html rename to zyplayer-doc-manage/src/main/webapp/static/common/403.html index f467cedc..aee691b4 100644 --- a/zyplayer-doc-manage/src/main/webapp/statics/common/403.html +++ b/zyplayer-doc-manage/src/main/webapp/static/common/403.html @@ -1,14 +1,14 @@ - - - - - - - - - 403错误页面 + + + + + + + + + 403错误页面 -
您没有权限访问此页面
- + +
您没有权限访问此页面
+ \ No newline at end of file diff --git a/zyplayer-doc-manage/src/main/webapp/statics/common/404.html b/zyplayer-doc-manage/src/main/webapp/static/common/404.html similarity index 97% rename from zyplayer-doc-manage/src/main/webapp/statics/common/404.html rename to zyplayer-doc-manage/src/main/webapp/static/common/404.html index 5fba5b96..f41ef799 100644 --- a/zyplayer-doc-manage/src/main/webapp/statics/common/404.html +++ b/zyplayer-doc-manage/src/main/webapp/static/common/404.html @@ -1,14 +1,14 @@ - - - - - - - - - 404错误页面 - -
您访问的页面不存在
- + + + + + + + + + 404错误页面 + +
您访问的页面不存在
+ \ No newline at end of file diff --git a/zyplayer-doc-manage/src/main/webapp/statics/common/500.html b/zyplayer-doc-manage/src/main/webapp/static/common/500.html similarity index 97% rename from zyplayer-doc-manage/src/main/webapp/statics/common/500.html rename to zyplayer-doc-manage/src/main/webapp/static/common/500.html index 8d49f79b..60442273 100644 --- a/zyplayer-doc-manage/src/main/webapp/statics/common/500.html +++ b/zyplayer-doc-manage/src/main/webapp/static/common/500.html @@ -1,14 +1,14 @@ - - - - - - - - - 500错误页面 - -
服务器错误
- + + + + + + + + + 500错误页面 + +
服务器错误
+ \ No newline at end of file diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/jquery/jquery-3.1.0.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/jquery/jquery-3.1.0.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/jquery/jquery-3.1.0.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/jquery/jquery-3.1.0.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mg/css/mg-ui.css b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/css/mg-ui.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mg/css/mg-ui.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/mg/css/mg-ui.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mg/js/common.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mg/js/common.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mg/js/mgResizable.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/mgResizable.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mg/js/mgResizable.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/mgResizable.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mg/js/toast.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/toast.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mg/js/toast.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/toast.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/css/mzui.css b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/css/mzui.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/css/mzui.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/css/mzui.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/css/mzui.min.css b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/css/mzui.min.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/css/mzui.min.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/css/mzui.min.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.eot b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.eot similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.eot rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.eot diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.svg b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.svg similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.svg rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.svg diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.ttf b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.ttf similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.ttf rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.ttf diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.woff b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.woff similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/fonts/zenicon.woff rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/fonts/zenicon.woff diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/img/loginBg.jpg b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/img/loginBg.jpg similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/img/loginBg.jpg rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/img/loginBg.jpg diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/js/mzui.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/js/mzui.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/js/mzui.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/js/mzui.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/js/mzui.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mzui/js/mzui.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/mzui/js/mzui.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/mzui/js/mzui.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/vue/vue.js b/zyplayer-doc-manage/src/main/webapp/static/lib/vue/vue.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/vue/vue.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/vue/vue.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/vue/vue.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/vue/vue.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/vue/vue.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/vue/vue.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/css/zui-theme.min.css b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/css/zui-theme.min.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/css/zui-theme.min.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/css/zui-theme.min.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/css/zui.lite.min.css b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/css/zui.lite.min.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/css/zui.lite.min.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/css/zui.lite.min.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/css/zui.min.css b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/css/zui.min.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/css/zui.min.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/css/zui.min.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.eot b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.eot similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.eot rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.eot diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.svg b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.svg similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.svg rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.svg diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.ttf b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.ttf similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.ttf rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.ttf diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.woff b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.woff similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/fonts/zenicon.woff rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/fonts/zenicon.woff diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/js/zui.lite.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/js/zui.lite.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/js/zui.lite.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/js/zui.lite.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/js/zui.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/js/zui.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/js/zui.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/js/zui.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/dashboard/zui.dashboard.min.css b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/dashboard/zui.dashboard.min.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/dashboard/zui.dashboard.min.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/dashboard/zui.dashboard.min.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/dashboard/zui.dashboard.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/dashboard/zui.dashboard.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/dashboard/zui.dashboard.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/dashboard/zui.dashboard.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.css b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.js b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.min.css b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.min.css similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.min.css rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.min.css diff --git a/zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.min.js b/zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.min.js similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/lib/zui/lib/tabs/zui.tabs.min.js rename to zyplayer-doc-manage/src/main/webapp/static/lib/zui/lib/tabs/zui.tabs.min.js diff --git a/zyplayer-doc-manage/src/main/webapp/statics/manage/about.html b/zyplayer-doc-manage/src/main/webapp/static/manage/about.html similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/manage/about.html rename to zyplayer-doc-manage/src/main/webapp/static/manage/about.html diff --git a/zyplayer-doc-manage/src/main/webapp/statics/manage/auth/manage.html b/zyplayer-doc-manage/src/main/webapp/static/manage/auth/manage.html similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/manage/auth/manage.html rename to zyplayer-doc-manage/src/main/webapp/static/manage/auth/manage.html diff --git a/zyplayer-doc-manage/src/main/webapp/statics/manage/home.html b/zyplayer-doc-manage/src/main/webapp/static/manage/home.html similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/manage/home.html rename to zyplayer-doc-manage/src/main/webapp/static/manage/home.html diff --git a/zyplayer-doc-manage/src/main/webapp/statics/manage/login.html b/zyplayer-doc-manage/src/main/webapp/static/manage/login.html similarity index 96% rename from zyplayer-doc-manage/src/main/webapp/statics/manage/login.html rename to zyplayer-doc-manage/src/main/webapp/static/manage/login.html index a089a639..610f1c92 100644 --- a/zyplayer-doc-manage/src/main/webapp/statics/manage/login.html +++ b/zyplayer-doc-manage/src/main/webapp/static/manage/login.html @@ -1,80 +1,80 @@ - - - - - -登录 - - - - -
-
-
-
-
-
-
登录 您没有权限访问该内容或需要登录
-
- -
-
- - -
{{errorInfo}}
-
-
- - - -
-
- -
-
- -
-
-
-
- - - - - - - - - - - - - + + + + + diff --git a/zyplayer-doc-manage/src/main/webapp/statics/manage/user/manage.html b/zyplayer-doc-manage/src/main/webapp/static/manage/user/manage.html similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/manage/user/manage.html rename to zyplayer-doc-manage/src/main/webapp/static/manage/user/manage.html diff --git a/zyplayer-doc-manage/src/main/webapp/statics/manage/user/operation-log.html b/zyplayer-doc-manage/src/main/webapp/static/manage/user/operation-log.html similarity index 100% rename from zyplayer-doc-manage/src/main/webapp/statics/manage/user/operation-log.html rename to zyplayer-doc-manage/src/main/webapp/static/manage/user/operation-log.html