From 2632fbe1e4768ea0dc18b31e2444b08d91f89bae 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: Sat, 23 Oct 2021 23:13:56 +0800 Subject: [PATCH] =?UTF-8?q?swagger=E6=96=87=E6=A1=A3=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/manage/SwaggerDocService.java | 2 +- .../manage/impl/SwaggerDocServiceImpl.java | 5 +- .../controller/SwaggerDocumentController.java | 4 +- .../controller/SwaggerProxyController.java | 2 +- .../swagger-ui/src/api/zyplayer.js | 3 + .../src/components/layouts/GlobalLayout.vue | 2 +- .../src/components/layouts/MenuLayout.vue | 29 ++- .../src/components/layouts/PageLayout.vue | 12 +- .../src/views/common/AboutDialog.vue | 12 +- .../swagger-ui/src/views/doc/DocManage.vue | 196 +++++++++++++++--- 10 files changed, 212 insertions(+), 55 deletions(-) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SwaggerDocService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SwaggerDocService.java index 8d5011ec..d7e1b6fe 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SwaggerDocService.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SwaggerDocService.java @@ -14,5 +14,5 @@ import java.util.List; * @since 2021-10-15 */ public interface SwaggerDocService extends IService { - public List getSwaggerDocList(); + public List getSwaggerDocList(SwaggerDoc swaggerDoc); } diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SwaggerDocServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SwaggerDocServiceImpl.java index 4af6c505..9ec49346 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SwaggerDocServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SwaggerDocServiceImpl.java @@ -21,9 +21,12 @@ import java.util.List; public class SwaggerDocServiceImpl extends ServiceImpl implements SwaggerDocService { @Override - public List getSwaggerDocList() { + public List getSwaggerDocList(SwaggerDoc swaggerDoc) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("yn", 1); + queryWrapper.eq(swaggerDoc.getDocType() != null, "doc_type", swaggerDoc.getDocType()); + queryWrapper.eq(swaggerDoc.getOpenVisit() != null, "open_visit", swaggerDoc.getOpenVisit()); + queryWrapper.eq(swaggerDoc.getDocStatus() != null, "doc_status", swaggerDoc.getDocStatus()); return this.list(queryWrapper); } } diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java index 14552ead..76cd5cfd 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java @@ -50,8 +50,8 @@ public class SwaggerDocumentController { */ @ResponseBody @PostMapping(value = "/list") - public ResponseJson> list() { - List docList = swaggerDocService.getSwaggerDocList(); + public ResponseJson> list(SwaggerDoc swaggerDoc) { + List docList = swaggerDocService.getSwaggerDocList(swaggerDoc); return DocResponseJson.ok(docList); } diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java index ae1e77da..c03f619f 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java @@ -35,7 +35,7 @@ public class SwaggerProxyController { @RequestMapping("/swagger-resources") public List swaggerResources() { Set resourceList = new HashSet<>(); - List docList = swaggerDocService.getSwaggerDocList(); + List docList = swaggerDocService.getSwaggerDocList(new SwaggerDoc()); for (SwaggerDoc swaggerDoc : docList) { SwaggerResource resource = new SwaggerResource(); resource.setUrl("/doc-swagger/doc/content?id=" + swaggerDoc.getId()); diff --git a/zyplayer-doc-ui/swagger-ui/src/api/zyplayer.js b/zyplayer-doc-ui/swagger-ui/src/api/zyplayer.js index 1dc2d51a..f5c64a61 100644 --- a/zyplayer-doc-ui/swagger-ui/src/api/zyplayer.js +++ b/zyplayer-doc-ui/swagger-ui/src/api/zyplayer.js @@ -4,5 +4,8 @@ export const zyplayerApi = { getSelfUserInfo: data => apiClient({url: '/user/info/selfInfo', method: 'post', data: data}), userLogout: data => apiClient({url: '/logout', method: 'post', data: data}), systemUpgradeInfo: data => apiClient({url: '/system/info/upgrade', method: 'post', data: data}), + swaggerDocList: data => apiClient({url: '/doc-swagger/doc/list', method: 'post', data: data}), + swaggerDocAdd: data => apiClient({url: '/doc-swagger/doc/add', method: 'post', data: data}), + swaggerDocUpdate: data => apiClient({url: '/doc-swagger/doc/update', method: 'post', data: data}), }; 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 f93e6990..9268c4cc 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/GlobalLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/GlobalLayout.vue @@ -5,7 +5,7 @@

swagger文档管理

- +
... 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 ac7fb5a6..45c460ca 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/MenuLayout.vue @@ -1,14 +1,17 @@ @@ -18,12 +21,17 @@ export default { name: 'MenuLayout', + props: { + collapsed: { + type: Boolean, + default: false + }, + }, data() { return { menuData: [], selectedKeys: [], openKeys: [], - collapsed: false, // 文档树 treeData: [ { @@ -49,6 +57,9 @@ }, watch:{ '$store.state.userInfo'(userInfo) { + }, + collapsed(x) { + console.log(x, this.collapsed) } }, components: {MenuChildrenLayout}, @@ -80,6 +91,8 @@ if (this.swaggerResourceList.length > 0) { this.swaggerDocChoice = this.swaggerResourceList[0].url; } + } else { + this.$message.error('获取文档列表请求失败'); } }); } 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 2820145e..adb72ec5 100644 --- a/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue +++ b/zyplayer-doc-ui/swagger-ui/src/components/layouts/PageLayout.vue @@ -1,12 +1,14 @@ diff --git a/zyplayer-doc-ui/swagger-ui/src/views/common/AboutDialog.vue b/zyplayer-doc-ui/swagger-ui/src/views/common/AboutDialog.vue index 83eb8d40..44845721 100644 --- a/zyplayer-doc-ui/swagger-ui/src/views/common/AboutDialog.vue +++ b/zyplayer-doc-ui/swagger-ui/src/views/common/AboutDialog.vue @@ -81,13 +81,13 @@ this.upgradeInfo = json.data; if (!!this.upgradeInfo.upgradeContent) { this.upgradeInfo.upgradeContent = this.upgradeInfo.upgradeContent.replaceAll('；', '\n'); + console.log("zyplayer-doc发现新版本：" + + "\n升级地址：" + json.data.upgradeUrl + + "\n当前版本：" + json.data.nowVersion + + "\n最新版本：" + json.data.lastVersion + + "\n升级内容：" + json.data.upgradeContent + ); } - console.log("zyplayer-doc发现新版本：" - + "\n升级地址：" + json.data.upgradeUrl - + "\n当前版本：" + json.data.nowVersion - + "\n最新版本：" + json.data.lastVersion - + "\n升级内容：" + json.data.upgradeContent - ); } }); }, 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 a15fd9fa..30540fc0 100644 --- a/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue +++ b/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue @@ -1,45 +1,181 @@