#I4MKKW api接口调试支持文件上传，全局参数控制优化

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());

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;
 
 /**
  * 请求参数控制器

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"));