From 7e57dbaade0e73f64eae6241487c2625663621ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Wed, 20 Oct 2021 23:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BD=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doc/manage/framework/config/ZyplayerDocConfig.java   | 8 ++++----
 .../swagger-ui/src/components/layouts/GlobalLayout.vue   | 6 ++----
 .../src/components/layouts/MenuChildrenLayout.vue        | 1 +
 .../swagger-ui/src/components/layouts/MenuLayout.vue     | 8 +++++---
 .../swagger-ui/src/components/layouts/PageLayout.vue     | 9 ++++++---
 zyplayer-doc-ui/swagger-ui/src/routes.js                 | 5 +----
 zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue   | 2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

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 @@
     <a-layout class="swagger-menu-trigger">
         <a-layout-sider theme="light" :trigger="null" collapsible v-model:collapsed="appMenuCollapsed" :width="rightAsideWidth" style="height: 100vh;overflow: auto;">
             <div class="logo">
-                <router-link to="/doc/console">
-                    <img src="../../assets/logo.png">
-                    <h1>swagger文档管理</h1>
-                </router-link>
+                <img src="../../assets/logo.png">
+                <h1>swagger文档管理</h1>
             </div>
             <menu-layout></menu-layout>
         </a-layout-sider>
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 @@
             <router-link :to="{path: menuItem.path, query: menuItem.query}">
                 <template v-if="menuItem.meta">
                     <DashboardOutlined v-if="menuItem.meta.icon === 'DashboardOutlined'"/>
+                    <FileTextOutlined v-if="menuItem.meta.icon === 'FileTextOutlined'"/>
                 </template>
                 <span>{{menuItem.name}}</span>
             </router-link>
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 @@
 		<a-tabs type="card" v-model:activeKey="activePage" closable @tab-click="changePage" @edit="removePageTab" style="padding: 5px 10px 0;">
 			<a-tab-pane :tab="pageTabNameMap[item.fullPath]||item.name" :name="getRouteRealPath(item)" :fullPath="item.fullPath" :key="item.fullPath" v-for="item in pageList"/>
 		</a-tabs>
-		<keep-alive>
-			<router-view :key="$route.fullPath"/>
-		</keep-alive>
+		<div class="page-body">
+			<keep-alive>
+				<router-view :key="$route.fullPath"/>
+			</keep-alive>
+		</div>
 	</div>
 </template>
 
@@ -85,5 +87,6 @@
 
 <style>
 	.page-layout{background: #fff;}
+	.page-layout .page-body{padding: 0 10px 10px 10px;}
 	.ant-tabs-bar{margin-bottom: 0;}
 </style>
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 @@
 <template>
-    <a-table :dataSource="dataSource" :columns="columns"/>
+    <a-table :dataSource="dataSource" :columns="columns"></a-table>
 </template>
 
 <script>