From e2a8c46afb0fb6a95902937013d61c0828b88eb1 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, 15 Dec 2021 23:20:17 +0800
Subject: [PATCH] =?UTF-8?q?#I4MKKW=20api=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E6=94=AF=E6=8C=81=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=EF=BC=8C=E5=85=A8=E5=B1=80=E5=8F=82=E6=95=B0=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiGlobalParamController.java  | 23 +++++++--
 .../controller/ApiPoxyRequestController.java  |  3 ++
 .../service/SwaggerHttpRequestService.java    | 33 +++++++++++++
 .../impl/ApiGlobalParamServiceImpl.java       |  8 +++-
 zyplayer-doc-ui/api-ui/.env.development       |  2 +-
 .../src/components/layouts/MenuLayout.vue     | 20 +++++++-
 .../components/layouts/doc-tree/OpenApi.vue   | 14 +++---
 .../components/layouts/doc-tree/Swagger.vue   | 13 ++---
 .../src/components/params/ParamTable.vue      | 12 ++---
 .../src/components/share/MenuLayout.vue       | 11 ++++-
 .../src/components/share/doc-tree/OpenApi.vue | 14 +++---
 .../src/components/share/doc-tree/Swagger.vue | 11 +++--
 zyplayer-doc-ui/api-ui/src/store/index.js     | 15 ++++++
 .../manage/components/EditGlobalParam.vue     |  2 +-
 .../src/views/openapi/docView/DocDebugger.vue | 48 +++++++++++++------
 .../src/views/swagger/docView/DocDebugger.vue | 38 +++++++++++----
 16 files changed, 206 insertions(+), 61 deletions(-)

diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java b/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java
index 7bf0748c..d79c4486 100644
--- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java
+++ b/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java
@@ -1,6 +1,7 @@
 package com.zyplayer.doc.api.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zyplayer.doc.api.service.ApiDocAuthJudgeService;
 import com.zyplayer.doc.core.annotation.AuthMan;
 import com.zyplayer.doc.core.json.DocResponseJson;
 import com.zyplayer.doc.core.json.ResponseJson;
@@ -37,6 +38,8 @@ public class ApiGlobalParamController {
 	
 	@Resource
 	private ApiGlobalParamService apiGlobalParamService;
+	@Resource
+	ApiDocAuthJudgeService apiDocAuthJudgeService;
 	
 	/**
 	 * 获取所有的全局参数
@@ -49,6 +52,9 @@ public class ApiGlobalParamController {
 	@PostMapping(value = "/list")
 	public ResponseJson<List<ApiGlobalParam>> list(Long docId) {
 		Long docIdNew = Optional.ofNullable(docId).orElse(0L);
+		if (docIdNew > 0 && !apiDocAuthJudgeService.haveDevelopAuth(docIdNew)) {
+			return DocResponseJson.warn("没有此文档的查看权限");
+		}
 		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
 		QueryWrapper<ApiGlobalParam> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("yn", 1);
@@ -71,6 +77,11 @@ public class ApiGlobalParamController {
 	@PostMapping(value = "/update")
 	public ResponseJson<List<ApiDoc>> update(ApiGlobalParam globalParam) {
 		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
+		globalParam.setDocId(Optional.ofNullable(globalParam.getDocId()).orElse(0L));
+		// 新的文档ID是否有权限
+		if (globalParam.getDocId() > 0 && !apiDocAuthJudgeService.haveDevelopAuth(globalParam.getDocId())) {
+			return DocResponseJson.warn("没有此文档的查看权限");
+		}
 		if (globalParam.getId() == null) {
 			globalParam.setYn(1);
 			globalParam.setCreateTime(new Date());
@@ -78,11 +89,17 @@ public class ApiGlobalParamController {
 			globalParam.setCreateUserName(currentUser.getUsername());
 		} else {
 			ApiGlobalParam param = apiGlobalParamService.getById(globalParam.getId());
-			if (param == null || !Objects.equals(param.getCreateUserId(), currentUser.getUserId())) {
-				return DocResponseJson.warn("目标全局参数不存在");
+			if (param.getDocId() > 0) {
+				// 已有的文档ID是否有权限
+				if (!apiDocAuthJudgeService.haveDevelopAuth(param.getDocId())) {
+					return DocResponseJson.warn("没有此文档的查看权限");
+				}
+			} else {
+				if (!Objects.equals(param.getCreateUserId(), currentUser.getUserId())) {
+					return DocResponseJson.warn("目标全局参数不存在");
+				}
 			}
 		}
-		globalParam.setDocId(Optional.ofNullable(globalParam.getDocId()).orElse(0L));
 		QueryWrapper<ApiGlobalParam> wrapper = new QueryWrapper<>();
 		wrapper.eq("yn", 1);
 		wrapper.eq("param_key", globalParam.getParamKey());
diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java b/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java
index dc508ede..4c7355c7 100644
--- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java
+++ b/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java
@@ -12,10 +12,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 请求参数控制器
diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java b/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java
index 47fa728d..878f33e4 100644
--- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java
+++ b/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java
@@ -1,9 +1,12 @@
 package com.zyplayer.doc.api.service;
 
+import cn.hutool.core.io.resource.BytesResource;
+import cn.hutool.core.io.resource.MultiResource;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
+import com.zyplayer.doc.api.controller.ApiPoxyRequestController;
 import com.zyplayer.doc.api.controller.param.ProxyRequestParam;
 import com.zyplayer.doc.api.controller.vo.HttpCookieVo;
 import com.zyplayer.doc.api.controller.vo.HttpHeaderVo;
@@ -16,12 +19,17 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 
 import javax.annotation.Resource;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.net.HttpCookie;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -35,6 +43,7 @@ import java.util.stream.Stream;
  */
 @Service
 public class SwaggerHttpRequestService {
+	private static Logger logger = LoggerFactory.getLogger(SwaggerHttpRequestService.class);
 	
 	@Resource
 	private ApiGlobalParamService apiGlobalParamService;
@@ -153,6 +162,30 @@ public class SwaggerHttpRequestService {
 		// 用户输入的参数
 		requestParam.getFormParamData().forEach(data -> httpRequest.form(data.getCode(), data.getValue()));
 		requestParam.getFormEncodeParamData().forEach(data -> httpRequest.form(data.getCode(), data.getValue()));
+		// 文件参数
+		if (request instanceof StandardMultipartHttpServletRequest) {
+			StandardMultipartHttpServletRequest multipartRequest = (StandardMultipartHttpServletRequest) request;
+			Iterator<String> fileNames = multipartRequest.getFileNames();
+			while (fileNames.hasNext()) {
+				String fileName = fileNames.next();
+				String originKey = fileName.replace("_file_", "");
+				List<MultipartFile> fileList = multipartRequest.getFiles(fileName);
+				try {
+					if (fileList.size() > 1) {
+						MultiResource multiResource = new MultiResource();
+						for (MultipartFile file : fileList) {
+							multiResource.add(new BytesResource(file.getBytes(), file.getOriginalFilename()));
+						}
+						httpRequest.form(originKey, multiResource);
+					} else if (fileList.size() > 0) {
+						MultipartFile multipartFile = fileList.get(0);
+						httpRequest.form(originKey, multipartFile.getBytes(), multipartFile.getOriginalFilename());
+					}
+				} catch (IOException e) {
+					logger.error("读取上传的文件失败", e);
+				}
+			}
+		}
 		// cookie参数
 		Map<String, String> cookieParam = new HashMap<>();
 		String headerCookie = headerParam.getOrDefault("Cookie", headerParam.get("cookie"));
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java
index a28495a0..2f249663 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java
@@ -30,9 +30,13 @@ public class ApiGlobalParamServiceImpl extends ServiceImpl<ApiGlobalParamMapper,
 		
 		QueryWrapper<ApiGlobalParam> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("yn", 1);
-		queryWrapper.eq("doc_id", docIdNew);
 		// 全局参数才按创建人来控制，文档的全局参数大家共用
-		queryWrapper.eq(docIdNew == 0, "create_user_id", currentUser.getUserId());
+		if (docIdNew == 0) {
+			queryWrapper.eq("create_user_id", currentUser.getUserId());
+		} else {
+			queryWrapper.and(con -> con.or(or -> or.eq("doc_id", docIdNew))
+					.or(or -> or.eq("create_user_id", currentUser.getUserId())));
+		}
 		return this.list(queryWrapper);
 	}
 }
diff --git a/zyplayer-doc-ui/api-ui/.env.development b/zyplayer-doc-ui/api-ui/.env.development
index 4d516ca1..45732d00 100644
--- a/zyplayer-doc-ui/api-ui/.env.development
+++ b/zyplayer-doc-ui/api-ui/.env.development
@@ -1,7 +1,7 @@
 VITE_APP_TITLE=API文档管理
 
 本地切换环境改这个参数，可选值：dev、online
-VITE_APP_ENV=online
+VITE_APP_ENV=dev
 
 # 线上环境
 VITE_APP_BASE_URL_ONLINE=http://doc.zyplayer.com/zyplayer-doc-manage
diff --git a/zyplayer-doc-ui/api-ui/src/components/layouts/MenuLayout.vue b/zyplayer-doc-ui/api-ui/src/components/layouts/MenuLayout.vue
index c8aab4ed..b95a6ca1 100644
--- a/zyplayer-doc-ui/api-ui/src/components/layouts/MenuLayout.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/layouts/MenuLayout.vue
@@ -10,7 +10,7 @@
                     <a-select placeholder="请选择分组" v-model:value="docChoiceId" @change="docChoiceChange" style="width: 100%;">
                         <a-select-option :value="item.id" v-for="item in docResourceList">{{item.name}}</a-select-option>
                     </a-select>
-                    <a-input-search v-model:value="searchKeywords" placeholder="搜索文档内容" style="width: 100%;margin-top: 10px;" @search="docChoiceChange"/>
+                    <a-input-search v-model:value="searchKeywords" placeholder="搜索文档内容" style="width: 100%;margin-top: 10px;" @search="searchDoc"/>
                 </div>
                 <template v-if="docChoice && docChoice.docType">
                     <DocTreeSwagger v-if="docChoice.docType === 1 || docChoice.docType === 2" ref="swaggerRef"></DocTreeSwagger>
@@ -102,9 +102,26 @@
                         openApiRef.value.loadDoc(docChoiceId.value, searchKeywords.value, loadDocCallback);
                     }
                 }
+	            zyplayerApi.docApiGlobalParamList({docId: docChoiceId.value}).then(res => {
+		            let docGlobalParam = res.data || [];
+		            store.commit('setDocGlobalParam', docGlobalParam);
+	            });
             };
             const docChoiceChange = () => {
                 loadDoc();
+            };
+	        // 搜索文档
+            const searchDoc = () => {
+	            // 如果文档是swagger类型
+	            if (docChoice.value.docType === 1 || docChoice.value.docType === 2) {
+		            if (swaggerRef.value) {
+			            swaggerRef.value.loadTreeData(searchKeywords.value);
+		            }
+	            } else if (docChoice.value.docType === 3 || docChoice.value.docType === 4) {
+		            if (openApiRef.value) {
+			            openApiRef.value.loadTreeData(searchKeywords.value);
+		            }
+	            }
             };
             watch(store.getters.getDocChangedNum, () => {
                 getApiDocList();
@@ -136,6 +153,7 @@
                 swaggerRef,
                 openApiRef,
                 docChoice,
+	            searchDoc,
                 docChoiceChange,
             };
         },
diff --git a/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/OpenApi.vue b/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/OpenApi.vue
index 94d95bb7..8c79d3a3 100644
--- a/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/OpenApi.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/OpenApi.vue
@@ -41,7 +41,6 @@
             let treeData = ref([]);
             let expandedKeys = ref([]);
             let choiceDocId = ref('');
-            let searchKeywords = ref('');
 
             const docChecked = (val, node) => {
                 if (node.node.key === 'info') {
@@ -53,11 +52,11 @@
             };
             const loadDoc = (docId, keyword, callback) => {
                 choiceDocId.value = docId;
-                searchKeywords.value = keyword;
                 zyplayerApi.apiDocApisDetail({id: docId}).then(res => {
                     let v2Doc = toJsonObj(res.data);
                     // os：doc.swagger 和 doc.openapi 的区别
                     if (typeof v2Doc !== 'object' || !v2Doc.openapi) {
+	                    callback(false);
                         message.error('获取文档数据失败，请检查文档是否为标准的OpenApi文档格式');
                         return;
                     }
@@ -67,13 +66,15 @@
                     store.commit('setOpenApiUrlMethodMap', treeData.urlMethodMap);
                     store.commit('setOpenApiMethodStatistic', treeData.methodStatistic);
                     tagPathMap.value = treeData.tagPathMap;
-                    loadTreeData();
-                    callback();
+                    loadTreeData(keyword);
+                    callback(true);
+                }).catch(() => {
+	                callback(false);
                 });
             };
-            const loadTreeData = async () => {
+            const loadTreeData = async (keyword) => {
                 let metaInfo = {id: choiceDocId.value};
-                treeData.value = getTreeDataForTag(openApiDoc.value, tagPathMap.value, searchKeywords.value, metaInfo);
+                treeData.value = getTreeDataForTag(openApiDoc.value, tagPathMap.value, keyword, metaInfo);
                 treeData.value.unshift({key: 'info', title: '文档说明信息', isLeaf: true});
                 await nextTick();
                 expandedKeys.value = ['main'];
@@ -97,6 +98,7 @@
                 expandedKeys,
                 docChecked,
                 loadDoc,
+	            loadTreeData,
                 treeData,
             };
         },
diff --git a/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/Swagger.vue b/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/Swagger.vue
index 3660f151..5c7db24f 100644
--- a/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/Swagger.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/layouts/doc-tree/Swagger.vue
@@ -41,7 +41,6 @@
             let treeData = ref([]);
             let expandedKeys = ref([]);
             let choiceDocId = ref('');
-            let searchKeywords = ref('');
 
             const docChecked = (val, node) => {
                 if (node.node.key === 'info') {
@@ -53,7 +52,6 @@
             };
             const loadDoc = (docId, keyword, callback) => {
                 choiceDocId.value = docId;
-                searchKeywords.value = keyword;
                 zyplayerApi.apiDocApisDetail({id: docId}).then(res => {
                     let v2Doc = toJsonObj(res.data);
                     if (typeof v2Doc !== 'object' || !v2Doc.swagger) {
@@ -67,13 +65,15 @@
                     store.commit('setSwaggerUrlMethodMap', treeData.urlMethodMap);
                     store.commit('setSwaggerMethodStatistic', treeData.methodStatistic);
                     tagPathMap.value = treeData.tagPathMap;
-                    loadTreeData();
-                    callback(true);
+	                loadTreeData(keyword);
+	                callback(true);
+                }).catch(() => {
+	                callback(false);
                 });
             };
-            const loadTreeData = async () => {
+            const loadTreeData = async (keyword) => {
                 let metaInfo = {id: choiceDocId.value};
-                treeData.value = getTreeDataForTag(swaggerDoc.value, tagPathMap.value, searchKeywords.value, metaInfo);
+                treeData.value = getTreeDataForTag(swaggerDoc.value, tagPathMap.value, keyword, metaInfo);
                 treeData.value.unshift({key: 'info', title: '文档说明信息', isLeaf: true});
                 await nextTick();
                 expandedKeys.value = ['main'];
@@ -97,6 +97,7 @@
                 expandedKeys,
                 docChecked,
                 loadDoc,
+	            loadTreeData,
                 treeData,
             };
         },
diff --git a/zyplayer-doc-ui/api-ui/src/components/params/ParamTable.vue b/zyplayer-doc-ui/api-ui/src/components/params/ParamTable.vue
index 0d1f88f3..3305c21b 100644
--- a/zyplayer-doc-ui/api-ui/src/components/params/ParamTable.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/params/ParamTable.vue
@@ -41,7 +41,7 @@
                         <a-select-option value="true">TRUE</a-select-option>
                         <a-select-option value="false">FALSE</a-select-option>
                     </a-select>
-                    <a-upload v-else-if="isFileType(record.type)"
+                    <a-upload v-else-if="isFileType(record)"
                               :file-list="record.value" name="file" :multiple="record.type === 'array'"
                               :before-upload="file=>{return beforeUpload(file, record)}"
                               :remove="file=>{return handleRemove(file, record)}"
@@ -121,11 +121,11 @@
             paramListColumns.value.push({title: '参数值', dataIndex: 'value'});
             paramListColumns.value.push({title: '', dataIndex: 'action', width: 40});
             const beforeUpload = (file, record) => {
-                if (record.type !== 'array') {
-                    record.value = [file];
-                } else {
-                    record.value = [...record.value, file];
-                }
+	            if (record.type !== 'array' || !(record.value instanceof Array) || record.value.length <= 0) {
+		            record.value = [file];
+	            } else {
+		            record.value = [...record.value, file];
+	            }
                 return false;
             };
             const handleRemove = (file, record) => {
diff --git a/zyplayer-doc-ui/api-ui/src/components/share/MenuLayout.vue b/zyplayer-doc-ui/api-ui/src/components/share/MenuLayout.vue
index 29257a7b..00f76f3e 100644
--- a/zyplayer-doc-ui/api-ui/src/components/share/MenuLayout.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/share/MenuLayout.vue
@@ -78,7 +78,16 @@
                 }
             };
             const docSearch = () => {
-                loadDoc();
+	            // 如果文档是swagger类型
+	            if (docChoice.value.docType === 1 || docChoice.value.docType === 2) {
+		            if (swaggerRef.value) {
+			            swaggerRef.value.loadTreeData(searchKeywords.value);
+		            }
+	            } else if (docChoice.value.docType === 3 || docChoice.value.docType === 4) {
+		            if (openApiRef.value) {
+			            openApiRef.value.loadTreeData(searchKeywords.value);
+		            }
+	            }
             };
             onMounted(() => {
                 docChoiceId.value = route.query.uuid;
diff --git a/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/OpenApi.vue b/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/OpenApi.vue
index 08b8146d..80b4b596 100644
--- a/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/OpenApi.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/OpenApi.vue
@@ -36,7 +36,6 @@
             let treeData = ref([]);
             let expandedKeys = ref([]);
             let choiceDocId = ref('');
-            let searchKeywords = ref('');
 
             const docChecked = (val, node) => {
                 if (node.node.isLeaf) {
@@ -46,11 +45,11 @@
             };
             const loadDoc = (docId, keyword, callback) => {
                 choiceDocId.value = docId;
-                searchKeywords.value = keyword;
                 zyplayerApi.apiShareDocApisDetail({shareUuid: docId}).then(res => {
                     let v2Doc = toJsonObj(res.data);
                     // os：doc.swagger 和 doc.openapi 的区别
                     if (typeof v2Doc !== 'object' || !v2Doc.openapi) {
+	                    callback(false);
                         message.error('获取文档数据失败，请检查文档是否为标准的OpenApi文档格式');
                         return;
                     }
@@ -60,13 +59,15 @@
                     store.commit('setOpenApiUrlMethodMap', treeData.urlMethodMap);
                     store.commit('setOpenApiMethodStatistic', treeData.methodStatistic);
                     tagPathMap.value = treeData.tagPathMap;
-                    loadTreeData();
-                    callback();
+                    loadTreeData(keyword);
+                    callback(true);
+                }).catch(() => {
+	                callback(false);
                 });
             };
-            const loadTreeData = async () => {
+            const loadTreeData = async (keyword) => {
                 let metaInfo = {uuid: choiceDocId.value};
-                treeData.value = getTreeDataForTag(openApiDoc.value, tagPathMap.value, searchKeywords.value, metaInfo);
+                treeData.value = getTreeDataForTag(openApiDoc.value, tagPathMap.value, keyword, metaInfo);
                 await nextTick();
                 expandedKeys.value = ['main'];
             };
@@ -89,6 +90,7 @@
                 expandedKeys,
                 docChecked,
                 loadDoc,
+	            loadTreeData,
                 treeData,
             };
         },
diff --git a/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/Swagger.vue b/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/Swagger.vue
index 58c1c28f..f4bdb60d 100644
--- a/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/Swagger.vue
+++ b/zyplayer-doc-ui/api-ui/src/components/share/doc-tree/Swagger.vue
@@ -36,7 +36,6 @@
             let treeData = ref([]);
             let expandedKeys = ref([]);
             let choiceDocId = ref('');
-            let searchKeywords = ref('');
 
             const docChecked = (val, node) => {
                 if (node.node.isLeaf) {
@@ -46,7 +45,6 @@
             };
             const loadDoc = (docId, keyword, callback) => {
                 choiceDocId.value = docId;
-                searchKeywords.value = keyword;
                 zyplayerApi.apiShareDocApisDetail({shareUuid: docId}).then(res => {
                     let v2Doc = toJsonObj(res.data);
                     if (typeof v2Doc !== 'object' || !v2Doc.swagger) {
@@ -60,13 +58,15 @@
                     store.commit('setSwaggerUrlMethodMap', treeData.urlMethodMap);
                     store.commit('setSwaggerMethodStatistic', treeData.methodStatistic);
                     tagPathMap.value = treeData.tagPathMap;
-                    loadTreeData();
+                    loadTreeData(keyword);
                     callback(true);
+                }).catch(() => {
+	                callback(false);
                 });
             };
-            const loadTreeData = async () => {
+            const loadTreeData = async (keyword) => {
                 let metaInfo = {uuid: choiceDocId.value};
-                treeData.value = getTreeDataForTag(swaggerDoc.value, tagPathMap.value, searchKeywords.value, metaInfo);
+                treeData.value = getTreeDataForTag(swaggerDoc.value, tagPathMap.value, keyword, metaInfo);
                 await nextTick();
                 expandedKeys.value = ['main'];
             };
@@ -89,6 +89,7 @@
                 expandedKeys,
                 docChecked,
                 loadDoc,
+	            loadTreeData,
                 treeData,
             };
         },
diff --git a/zyplayer-doc-ui/api-ui/src/store/index.js b/zyplayer-doc-ui/api-ui/src/store/index.js
index 5e9bd344..9334d025 100644
--- a/zyplayer-doc-ui/api-ui/src/store/index.js
+++ b/zyplayer-doc-ui/api-ui/src/store/index.js
@@ -13,6 +13,8 @@ export default createStore({
             apiDoc: {},
             // 全局参数
             globalParam: [],
+            // 当前文档全局参数
+            docGlobalParam: [],
             // 左侧菜单栏宽度
             leftAsideWidth: 0,
 
@@ -53,6 +55,19 @@ export default createStore({
         setGlobalParam(state, globalParam) {
             state.globalParam = globalParam;
         },
+        setDocGlobalParam(state, globalParam) {
+            state.docGlobalParam = globalParam;
+        },
+        setGlobalParamOnChange(state, globalParam, docId) {
+            if (docId && docId > 0) {
+                // 当前选中的文档是修改的文档才更新
+                if (state.apiDoc.id === docId) {
+                    state.docGlobalParam = globalParam;
+                }
+            } else {
+                state.globalParam = globalParam;
+            }
+        },
         setApiDoc(state, apiDoc) {
             state.apiDoc = apiDoc;
         },
diff --git a/zyplayer-doc-ui/api-ui/src/views/manage/components/EditGlobalParam.vue b/zyplayer-doc-ui/api-ui/src/views/manage/components/EditGlobalParam.vue
index 19114cc6..8680cb10 100644
--- a/zyplayer-doc-ui/api-ui/src/views/manage/components/EditGlobalParam.vue
+++ b/zyplayer-doc-ui/api-ui/src/views/manage/components/EditGlobalParam.vue
@@ -70,7 +70,7 @@
                 zyplayerApi.docApiGlobalParamList(props.dynamicParam).then(res => {
                     setTimeout(() => docListLoading.value = false, 500);
                     docList.value = res.data || [];
-                    store.commit('setGlobalParam', docList.value);
+	                store.commit('setGlobalParamOnChange', docList.value, props.dynamicParam.id);
                 });
             };
             let docEdit = ref({});
diff --git a/zyplayer-doc-ui/api-ui/src/views/openapi/docView/DocDebugger.vue b/zyplayer-doc-ui/api-ui/src/views/openapi/docView/DocDebugger.vue
index 7402b8f0..a5b184c3 100644
--- a/zyplayer-doc-ui/api-ui/src/views/openapi/docView/DocDebugger.vue
+++ b/zyplayer-doc-ui/api-ui/src/views/openapi/docView/DocDebugger.vue
@@ -19,7 +19,7 @@
                             <a-radio value="form">form-data</a-radio>
                             <a-radio value="formUrlEncode">x-www-form-urlencoded</a-radio>
                             <a-radio value="row">row</a-radio>
-<!--                            <a-radio value="binary">binary</a-radio>-->
+                            <!--                            <a-radio value="binary">binary</a-radio>-->
                         </a-radio-group>
                         <a-select v-if="bodyParamType === 'row'" v-model:value="consumesParamType" size="small" style="margin-left: 10px;vertical-align: top;width: 100px;">
                             <a-select-option value="json">JSON</a-select-option>
@@ -98,16 +98,18 @@
         setup(props) {
             const store = useStore();
             let apiDoc = store.state.apiDoc || {};
-            let globalParam = store.state.globalParam || [];
-            let openApiDoc = store.state.openApiDoc || {};
+            let userGlobalParam = store.state.globalParam || [];
+            let docGlobalParam = store.state.docGlobalParam || [];
+	        let openApiDoc = store.state.openApiDoc || {};
             let urlDomain = apiDoc.rewriteDomain || '';
-            // os：取服务地址不一样 todo 多服务地址的情况处理
-            let servers = openApiDoc.servers || [];
-            if (!urlDomain && servers.length > 0 && servers[0].url) {
-                urlDomain = servers[0].url;
-            }
+	        // os：取服务地址不一样 todo 多服务地址的情况处理
+	        let servers = openApiDoc.servers || [];
+	        if (!urlDomain && servers.length > 0 && servers[0].url) {
+		        urlDomain = servers[0].url;
+	        }
             let docUrl = ref(urlDomain + props.docInfoShow.url);
             let activePage = ref('urlParam');
+            let globalParam = [].concat(userGlobalParam, docGlobalParam);
             // URL参数处理
             const urlParamRef = ref();
             let urlParamListProp = props.requestParamList.filter(item => item.in === 'query' || item.in === 'path');
@@ -184,6 +186,9 @@
             } else if (headerParamListProp.length > 0) {
                 activePage.value = 'headerParam';
             }
+            const isFileType = record => {
+                return record.type === 'file' || record.subType === 'file' || record.subType === 'MultipartFile';
+            };
             // 发送请求
             let requestResult = ref({});
             let requestLoading = ref(false);
@@ -195,11 +200,29 @@
                     message.error('请输入请求的目标URL地址');
                     return;
                 }
+                // 用于替换URL上的path参数
                 let formObjData = {};
+                // 代理请求发送给后端的对象
                 const formData = new FormData();
+                const appendData = item => {
+                    if (isFileType(item)) {
+                        // 防止参数重名，加个前缀
+                        let name = '_file_' + item.name;
+                        if (item.type === 'array') {
+                            item.value.forEach(file => formData.append(name, file));
+                        } else {
+                            if (item.value instanceof Array && item.value.length > 0) {
+                                formData.append(name, item.value[0]);
+                            }
+                        }
+                    } else {
+                        formObjData[item.name] = item.value;
+                        formData.append(item.name, item.value);
+                    }
+                };
                 let urlParamSelected = urlParamRef.value.getSelectedRowKeys();
                 let urlParamStr = urlParamList.value.filter(item => urlParamSelected.indexOf(item.key) >= 0 && item.name && item.value).map(item => {
-                    formObjData[item.name] = item.value;
+                    appendData(item);
                     return item.name + '=' + encodeURIComponent(item.value);
                 }).join('&');
                 let headerParamSelected = headerParamRef.value.getSelectedRowKeys();
@@ -215,7 +238,7 @@
                     let formParamSelected = formParamRef.value.getSelectedRowKeys();
                     formParamArr = formParamList.value.filter(item => formParamSelected.indexOf(item.key) >= 0 && item.name && item.value).map(item => {
                         // todo 判断处理文件格式
-                        formObjData[item.name] = item.value;
+                        appendData(item);
                         return {code: item.name, value: item.value};
                     });
                 }
@@ -224,7 +247,7 @@
                     let formEncodeParamSelected = formEncodeParamRef.value.getSelectedRowKeys();
                     formEncodeParamArr = formEncodeParamList.value.filter(item => formEncodeParamSelected.indexOf(item.key) >= 0 && item.name && item.value).map(item => {
                         // todo 判断处理文件格式
-                        formObjData[item.name] = item.value;
+                        appendData(item);
                         return {code: item.name, value: item.value};
                     });
                 }
@@ -232,9 +255,6 @@
                 if (bodyParamRef.value) {
                     bodyParamStr = bodyParamRef.value.getParam();
                 }
-                // fileList.value.forEach(file => {
-                //     formData.append('files[]', file);
-                // });
                 let url = urlParamStr ? (docUrl.value + '?' + urlParamStr) : docUrl.value;
                 // 替换path参数
                 Object.keys(formObjData).forEach((key) => {
diff --git a/zyplayer-doc-ui/api-ui/src/views/swagger/docView/DocDebugger.vue b/zyplayer-doc-ui/api-ui/src/views/swagger/docView/DocDebugger.vue
index 3dfe87c9..67ad875e 100644
--- a/zyplayer-doc-ui/api-ui/src/views/swagger/docView/DocDebugger.vue
+++ b/zyplayer-doc-ui/api-ui/src/views/swagger/docView/DocDebugger.vue
@@ -98,11 +98,13 @@
         setup(props) {
             const store = useStore();
             let apiDoc = store.state.apiDoc || {};
-            let globalParam = store.state.globalParam || [];
+            let userGlobalParam = store.state.globalParam || [];
+            let docGlobalParam = store.state.docGlobalParam || [];
             let swaggerDoc = store.state.swaggerDoc || {};
             let urlDomain = apiDoc.rewriteDomain || swaggerDoc.host;
             let docUrl = ref(urlDomain + props.docInfoShow.url);
             let activePage = ref('urlParam');
+	        let globalParam = [].concat(userGlobalParam, docGlobalParam);
             // URL参数处理
             const urlParamRef = ref();
             let urlParamListProp = props.requestParamList.filter(item => item.in === 'query' || item.in === 'path');
@@ -179,6 +181,9 @@
             } else if (headerParamListProp.length > 0) {
                 activePage.value = 'headerParam';
             }
+	        const isFileType = record => {
+		        return record.type === 'file' || record.subType === 'file' || record.subType === 'MultipartFile';
+	        };
             // 发送请求
             let requestResult = ref({});
             let requestLoading = ref(false);
@@ -190,11 +195,29 @@
                     message.error('请输入请求的目标URL地址');
                     return;
                 }
-                let formObjData = {};
-                const formData = new FormData();
+	            // 用于替换URL上的path参数
+	            let formObjData = {};
+	            // 代理请求发送给后端的对象
+	            const formData = new FormData();
+	            const appendData = item => {
+		            if (isFileType(item)) {
+						// 防止参数重名，加个前缀
+			            let name = '_file_' + item.name;
+			            if (item.type === 'array') {
+				            item.value.forEach(file => formData.append(name, file));
+			            } else {
+				            if (item.value instanceof Array && item.value.length > 0) {
+					            formData.append(name, item.value[0]);
+				            }
+			            }
+		            } else {
+			            formObjData[item.name] = item.value;
+			            formData.append(item.name, item.value);
+		            }
+	            };
                 let urlParamSelected = urlParamRef.value.getSelectedRowKeys();
                 let urlParamStr = urlParamList.value.filter(item => urlParamSelected.indexOf(item.key) >= 0 && item.name && item.value).map(item => {
-                    formObjData[item.name] = item.value;
+	                appendData(item);
                     return item.name + '=' + encodeURIComponent(item.value);
                 }).join('&');
                 let headerParamSelected = headerParamRef.value.getSelectedRowKeys();
@@ -210,7 +233,7 @@
                     let formParamSelected = formParamRef.value.getSelectedRowKeys();
                     formParamArr = formParamList.value.filter(item => formParamSelected.indexOf(item.key) >= 0 && item.name && item.value).map(item => {
                         // todo 判断处理文件格式
-                        formObjData[item.name] = item.value;
+	                    appendData(item);
                         return {code: item.name, value: item.value};
                     });
                 }
@@ -219,7 +242,7 @@
                     let formEncodeParamSelected = formEncodeParamRef.value.getSelectedRowKeys();
                     formEncodeParamArr = formEncodeParamList.value.filter(item => formEncodeParamSelected.indexOf(item.key) >= 0 && item.name && item.value).map(item => {
                         // todo 判断处理文件格式
-                        formObjData[item.name] = item.value;
+	                    appendData(item);
                         return {code: item.name, value: item.value};
                     });
                 }
@@ -227,9 +250,6 @@
                 if (bodyParamRef.value) {
                     bodyParamStr = bodyParamRef.value.getParam();
                 }
-                // fileList.value.forEach(file => {
-                //     formData.append('files[]', file);
-                // });
                 let url = urlParamStr ? (docUrl.value + '?' + urlParamStr) : docUrl.value;
                 // 替换path参数
                 Object.keys(formObjData).forEach((key) => {