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 85d66911..c95aec1a 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 @@ -46,7 +46,12 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { String loginPage = "/static/manage/login.html"; - http.authorizeRequests().antMatchers("/login/**").permitAll()//为了测试其他功能,设置“ /** ”允许所有请求 + http.authorizeRequests() + .antMatchers( + "/login/**", "/open-doc.html", + "/webjars/open-doc/**", "/swagger-mg-ui/open-doc/**", + "/webjars/zui/**", "/webjars/vue/**" + ).permitAll()//为了测试其他功能,设置“ /** ”允许所有请求 .antMatchers("/document.html", "/doc.html").hasAuthority("DOC_ALL") // 其他地址的访问均需登录 .anyRequest().authenticated().and() diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgOpenDocController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgOpenDocController.java index 2e347838..efccddd9 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgOpenDocController.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgOpenDocController.java @@ -34,6 +34,11 @@ public class MgOpenDocController { @Resource private MgStorageService storageService; + @PostMapping(value = "/checkConfig") + public DocResponseJson checkConfig() { + return DocResponseJson.ok(); + } + /** * @author 暮光:城中城 * @since 2019年1月27日 diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/formatjson.js b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/formatjson.js index 0588bcab..2ae52593 100644 --- a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/formatjson.js +++ b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/formatjson.js @@ -26,7 +26,7 @@ var Formatjson = { if (obj.length == 0) { html += this.getRow(indent, "[ ]" + comma, isPropertyContent); } else { - var clpsHtml = ''; + var clpsHtml = ''; var annotation = ''; if(showAnnotation && isNotEmpty(keyName) && isNotEmpty(this.annotationObject[keyName])) { annotation = '// '+this.annotationObject[keyName]+''; @@ -48,7 +48,7 @@ var Formatjson = { if (numProps == 0) { html += this.getRow(indent, "{ }" + comma, isPropertyContent); } else { - var clpsHtml = ''; + var clpsHtml = ''; var annotation = ''; if(showAnnotation && isNotEmpty(keyName) && isNotEmpty(this.annotationObject[keyName])) { annotation = '// '+this.annotationObject[keyName]+''; @@ -80,10 +80,10 @@ var Formatjson = { var container = img.parentNode.nextSibling; if(!container) return; var disp = "none"; - var src = "webjars/mg-ui/img/collapsed.png"; + var src = "webjars/open-doc/img/collapsed.png"; if(container.style.display == "none"){ disp = "inline"; - src = "webjars/mg-ui/img/expanded.png"; + src = "webjars/open-doc/img/expanded.png"; } container.style.display = disp; img.src = src; diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/mg-ui.js b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/mg-ui.js index bbb16054..1f38dd1f 100644 --- a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/mg-ui.js +++ b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/mg-ui.js @@ -46,7 +46,8 @@ var rightContentTabs; $(document).ready(function(){ globalLoadingMessager = new $.zui.Messager({type: 'primary', close: false, time: 0}).show(); showGlobalLoadingMessage('检查服务中,请稍候...', true); - ajaxTemp("swagger-mg-ui/storage/checkConfig", "post", "json", { + // open-doc:请求地址不同 + ajaxTemp("swagger-mg-ui/open-doc/checkConfig", "post", "json", { }, function(json){ }, function(msg){ }, function (xhr) {