manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

请求提交修改优化

Browse Source
This commit is contained in:
暮光：城中城
2018-12-29 21:08:22 +08:00
parent 09d077cb07
commit 8095b1d78b
2 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/mg-ui-debug.js
View File

@@ -78,13 +78,6 @@ $(document).ready(function(){
}); });
storeRequestParam.form = paramFormSend; storeRequestParam.form = paramFormSend;
// 表单参数是否拼在url上
if(formToUrl == 1) {
postUrl += "?" + reqParamStr;
paramFormSend = "";
} else {
formDataToServer.append("form", JSON.stringify(paramFormSend));
}
// 显示加载中图标 // 显示加载中图标
$(".send-request .icon").removeClass("hide"); $(".send-request .icon").removeClass("hide");
// 获取header // 获取header
@@ -105,10 +98,18 @@ $(document).ready(function(){
formDataToServer.append('files', fileInput[i].files[j]); formDataToServer.append('files', fileInput[i].files[j]);
formDataToServer.append('fileNames', fileName); formDataToServer.append('fileNames', fileName);
} }
paramFormSend[fileName] = "-";
} }
formDataToServer.append("header", JSON.stringify(paramHeaderSend)); formDataToServer.append("header", JSON.stringify(paramHeaderSend));
formDataToServer.append("url", postUrl); formDataToServer.append("url", postUrl);
formDataToServer.append("method", options); formDataToServer.append("method", options);
// 表单参数是否拼在url上
if(formToUrl == 1) {
postUrl += "?" + reqParamStr;
paramFormSend = "";
} else {
formDataToServer.append("form", JSON.stringify(paramFormSend));
}
// debugger; // debugger;
// 模拟请求开始 // 模拟请求开始
postWithFile("swagger-mg-ui/http/request", formDataToServer, function(result){ postWithFile("swagger-mg-ui/http/request", formDataToServer, function(result){
@@ -279,14 +280,14 @@ function createOnlineDebugRequestParam(requestParamObj, url) {
/** /**
* 生成在线调试相关数据 * 生成在线调试相关数据
* @param pRequestObj 之前的调试参数 * @param oldRequestObj 之前的调试参数
* @param requestParamObj 参数列表的参数 * @param requestParamObj 参数列表的参数
* @param url 请求url * @param url 请求url
* @returns * @returns
*/ */
function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) { function createOnlineDebugRequestParamFun(oldRequestObj, requestParamObj, url) {
if(isEmptyObject(pRequestObj)) { if(isEmptyObject(oldRequestObj)) {
pRequestObj = {}; oldRequestObj = {};
} }
// 清空参数列表 // 清空参数列表
$("#tabParamHeader table tbody .new").remove(); $("#tabParamHeader table tbody .new").remove();
@@ -302,33 +303,36 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
$("#bulkEditHeader,#bulkEditForm").hide(); $("#bulkEditHeader,#bulkEditForm").hide();
$("#tabParamTypeForm table").show(); $("#tabParamTypeForm table").show();
$("#requestHeaderForm table").show(); $("#requestHeaderForm table").show();
$("#tabParamTypeForm table tbody .base input[name=paramValue]")
.attr("type", "text").removeClass("file-input")
.removeAttr("multiple").attr("placeholder", "").val("");
var options = $("#debugRequstType .btn .options").text(); var options = $("#debugRequstType .btn .options").text();
var formToUrl = pRequestObj.formToUrl || 0; var formToUrl = oldRequestObj.formToUrl || 0;
var formToUrlChecked = (options != "GET" && formToUrl == 1); var formToUrlChecked = (options != "GET" && formToUrl == 1);
$("input[name='formToUrl']").prop("checked", formToUrlChecked); $("input[name='formToUrl']").prop("checked", formToUrlChecked);
var onlyUseLastParam = (userSettings.onlyUseLastParam == 1); var onlyUseLastParam = (userSettings.onlyUseLastParam == 1);
var onlyUseLastHeader = onlyUseLastParam && !isEmptyObject(pRequestObj.header); var onlyUseLastHeader = onlyUseLastParam && !isEmptyObject(oldRequestObj.header);
var onlyUseLastForm = onlyUseLastParam && !isEmptyObject(pRequestObj.form); var onlyUseLastForm = onlyUseLastParam && !isEmptyObject(oldRequestObj.form);
var onlyUseLastBody = onlyUseLastParam && !isEmptyObject(pRequestObj.body); var onlyUseLastBody = onlyUseLastParam && !isEmptyObject(oldRequestObj.body);
var headerValueCount = 0, formValueCount = 0; var headerValueCount = 0, formValueCount = 0;
if(typeof pRequestObj != 'object') { if(typeof oldRequestObj != 'object') {
pRequestObj = {}; oldRequestObj = {};
} }
if(typeof pRequestObj.header != 'object') { if(typeof oldRequestObj.header != 'object') {
pRequestObj.header = {}; oldRequestObj.header = {};
} }
if(typeof pRequestObj.form != 'object') { if(typeof oldRequestObj.form != 'object') {
pRequestObj.form = {}; oldRequestObj.form = {};
} }
for (var i = 0; i < debugGlobalParam.length; i++) { for (var i = 0; i < debugGlobalParam.length; i++) {
var item = debugGlobalParam[i]; var item = debugGlobalParam[i];
if (item.paramIn == 'header') { if (item.paramIn == 'header') {
pRequestObj.header[item.key] = item.value; oldRequestObj.header[item.key] = item.value;
} else if (item.paramIn == 'form') { } else if (item.paramIn == 'form') {
pRequestObj.form[item.key] = item.value; oldRequestObj.form[item.key] = item.value;
} }
} }
Object.keys(requestParamObj).forEach(function(key){ Object.keys(requestParamObj).forEach(function(key){
@@ -336,7 +340,7 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
if (key == "p-body-obj") { if (key == "p-body-obj") {
//console.log(tempParam); //console.log(tempParam);
var paramObj = onlyUseLastBody ? {} : getParamBodyTransObj(tempParam); var paramObj = onlyUseLastBody ? {} : getParamBodyTransObj(tempParam);
var bodyObj = pRequestObj.body; var bodyObj = oldRequestObj.body;
try { try {
bodyObj = JSON.parse(bodyObj); bodyObj = JSON.parse(bodyObj);
if(!isEmptyObject(bodyObj)) { if(!isEmptyObject(bodyObj)) {
@@ -352,7 +356,7 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
if (tempParam.paramIn == "header" && !onlyUseLastHeader) { if (tempParam.paramIn == "header" && !onlyUseLastHeader) {
//console.log(tempParam); //console.log(tempParam);
var headerVal = getNotEmptyStr(tempParam.value); var headerVal = getNotEmptyStr(tempParam.value);
var headerObj = pRequestObj.header; var headerObj = oldRequestObj.header;
if(!isEmptyObject(headerObj) && isNotEmpty(headerObj[key])) { if(!isEmptyObject(headerObj) && isNotEmpty(headerObj[key])) {
headerVal = headerObj[key]; headerVal = headerObj[key];
headerObj[key] = "";// 赋值为空，后面不再使用 headerObj[key] = "";// 赋值为空，后面不再使用
@@ -376,10 +380,14 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
|| (tempParam.paramIn == "form") || (tempParam.paramIn == "form")
|| (tempParam.paramIn == "formData") || (tempParam.paramIn == "formData")
|| isNotEmpty(tempParam.paramIn); || isNotEmpty(tempParam.paramIn);
if (paramInForm && !onlyUseLastForm) { paramInForm = paramInForm && !onlyUseLastForm;
var formObj = oldRequestObj.form;
if (onlyUseLastForm && !isEmptyObject(formObj) && isNotEmpty(formObj[key])) {
paramInForm = onlyUseLastForm || true;
}
if (paramInForm) {
//console.log(tempParam); //console.log(tempParam);
var formVal = getNotEmptyStr(tempParam.value); var formVal = getNotEmptyStr(tempParam.value);
var formObj = pRequestObj.form;
if(!isEmptyObject(formObj) && isNotEmpty(formObj[key])) { if(!isEmptyObject(formObj) && isNotEmpty(formObj[key])) {
formVal = formObj[key]; formVal = formObj[key];
formObj[key] = "";// 赋值为空，后面不再使用 formObj[key] = "";// 赋值为空，后面不再使用
@@ -394,13 +402,9 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
if(tempParam.paramType == 'file'){ if(tempParam.paramType == 'file'){
$("#tabParamTypeForm table tbody .base input[name=paramValue]") $("#tabParamTypeForm table tbody .base input[name=paramValue]")
.attr("type", "file").attr("multiple", "multiple") .attr("type", "file").attr("multiple", "multiple")
.addClass("file-input") .addClass("file-input");
.val(formVal);
} else { } else {
$("#tabParamTypeForm table tbody .base input[name=paramValue]") $("#tabParamTypeForm table tbody .base input[name=paramValue]").val(formVal);
.attr("type", "text")
.removeClass("file-input")
.val(formVal);
} }
$("#tabParamTypeForm table tbody .base input[name=paramName]").val(key); $("#tabParamTypeForm table tbody .base input[name=paramName]").val(key);
$("#tabParamTypeForm table tbody .base input[name=paramValue]").attr("placeholder", getNotEmptyStr(tempParam.paramDesc)); $("#tabParamTypeForm table tbody .base input[name=paramValue]").attr("placeholder", getNotEmptyStr(tempParam.paramDesc));
@@ -412,7 +416,7 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
} }
}); });
// 处理参数外的header // 处理参数外的header
var headerObj = pRequestObj.header; var headerObj = oldRequestObj.header;
if(!isEmptyObject(headerObj)) { if(!isEmptyObject(headerObj)) {
Object.keys(headerObj).forEach(function(key){ Object.keys(headerObj).forEach(function(key){
if(isNotEmpty(headerObj[key])) { if(isNotEmpty(headerObj[key])) {
@@ -427,7 +431,7 @@ function createOnlineDebugRequestParamFun(pRequestObj, requestParamObj, url) {
}); });
} }
// 处理参数外的form // 处理参数外的form
var formObj = pRequestObj.form; var formObj = oldRequestObj.form;
if(!isEmptyObject(formObj)) { if(!isEmptyObject(formObj)) {
Object.keys(formObj).forEach(function(key){ Object.keys(formObj).forEach(function(key){
if(isNotEmpty(formObj[key])) { if(isNotEmpty(formObj[key])) {
@@ -545,7 +549,7 @@ function getParamTableTr(name, value, namePl, valuePl, paramType) {
+'<td><input type="text" class="form-control" name="paramName" value="'+name+'" placeholder="'+namePl+'"></td>'; +'<td><input type="text" class="form-control" name="paramName" value="'+name+'" placeholder="'+namePl+'"></td>';
// 文件的input特殊处理 // 文件的input特殊处理
if(paramType == 'file') { if(paramType == 'file') {
resultStr += '<td><input type="file" multiple class="form-control file-input" name="paramValue" value="'+value+'" placeholder="'+valuePl+'"></td>'; resultStr += '<td><input type="file" multiple class="form-control file-input" name="paramValue" placeholder="'+valuePl+'"></td>';
} else { } else {
resultStr += '<td><input type="text" class="form-control" name="paramValue" value="'+value+'" placeholder="'+valuePl+'"></td>' resultStr += '<td><input type="text" class="form-control" name="paramValue" value="'+value+'" placeholder="'+valuePl+'"></td>'
} }

11
zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/mg-ui.js
View File

@@ -374,15 +374,18 @@ $("#apiPathTree").on("click", ".show-doc", function(){
var paramDesc = getNotEmptyStr(tempParameters.description); var paramDesc = getNotEmptyStr(tempParameters.description);
var paramIn = getNotEmptyStr(tempParameters.in); var paramIn = getNotEmptyStr(tempParameters.in);
var example = getNotEmptyStr(tempParameters.example, tempParameters.default); var example = getNotEmptyStr(tempParameters.example, tempParameters.default);
if(isNotEmpty(tempParameters.items)) { if (isNotEmpty(tempParameters.items)) {
if(tempParameters.items.$ref == '#/definitions/MultipartFile') { // 判断文件类型
var refTmp = getNotEmptyStr(tempParameters.items.$ref).toLowerCase();
if (refTmp == '#/definitions/multipartfile'
|| refTmp == '#/definitions/file') {
htmlStr = paramName; htmlStr = paramName;
htmlStrExample = paramName; htmlStrExample = paramName;
paramType = 'file'; paramType = 'file';
addRequestParamObj(requestParamObj, paramName, paramType, paramIn, required, paramDesc, example); addRequestParamObj(requestParamObj, paramName, paramType, paramIn, required, paramDesc, example);
} else { } else {
htmlStr = paramName + "[0]"; htmlStr = paramName + "[]";
htmlStrExample = paramName + "[0]"; htmlStrExample = paramName + "[]";
} }
} else if(isNotEmpty(tempParameters.schema)) { } else if(isNotEmpty(tempParameters.schema)) {
if("array" == tempParameters.schema.type) { if("array" == tempParameters.schema.type) {