diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java index 53ba0125..7ab9f82d 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java @@ -32,9 +32,9 @@ public class ZyplayerDocConfig { @EnableDocDb public class enableDocDb{} -// @EnableDocSwagger(selfDoc = false) -// public class enableDocSwagger{} + @EnableDocSwagger(selfDoc = false) + public class enableDocSwagger{} - @EnableDocSwaggerPlus - public class enableDocSwaggerPlus{} +// @EnableDocSwaggerPlus +// public class enableDocSwaggerPlus{} } diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/GlobalLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/GlobalLayout.vue index 1257c05e..f93e6990 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/GlobalLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/GlobalLayout.vue @@ -2,10 +2,8 @@ diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuChildrenLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuChildrenLayout.vue index 1276b7b1..b30d7fc0 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuChildrenLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuChildrenLayout.vue @@ -16,6 +16,7 @@ {{menuItem.name}} diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue index c796754a..ac7fb5a6 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue @@ -75,9 +75,11 @@ }, getSwaggerResourceList() { customApi.post('./swagger-resources').then(res => { - this.swaggerResourceList = res || []; - if (this.swaggerResourceList.length > 0) { - this.swaggerDocChoice = this.swaggerResourceList[0].url; + if (res instanceof Array) { + this.swaggerResourceList = res || []; + if (this.swaggerResourceList.length > 0) { + this.swaggerDocChoice = this.swaggerResourceList[0].url; + } } }); } diff --git a/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue b/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue index 12686e43..2820145e 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue @@ -3,9 +3,11 @@ - - - +
+ + + +
@@ -85,5 +87,6 @@ diff --git a/zyplayer-doc-ui/swagger-ui/src/routes.js b/zyplayer-doc-ui/swagger-ui/src/routes.js index b31bc8af..d25c7514 100644 --- a/zyplayer-doc-ui/swagger-ui/src/routes.js +++ b/zyplayer-doc-ui/swagger-ui/src/routes.js @@ -11,9 +11,6 @@ let routers = [ { path: '/doc', name: '系统配置', - meta: { - icon: 'SettingOutlined' - }, component: PageLayout, children: [ { @@ -28,7 +25,7 @@ let routers = [ path: '/doc/manage', name: '文档管理', meta: { - icon: 'DashboardOutlined' + icon: 'FileTextOutlined' }, component: () => import('./views/doc/DocManage.vue') }, diff --git a/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue b/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue index 174ecc13..a15fd9fa 100644 --- a/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue +++ b/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue @@ -1,5 +1,5 @@