Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
948f6fc9
Commit
948f6fc9
authored
4 years ago
by
Captain.B
Browse files
Options
Download
Email Patches
Plain Diff
refactor: 尝试解决jetty后台报错的问题
parent
08a0408b
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
backend/pom.xml
+1
-1
backend/pom.xml
backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
+8
-6
...ava/io/metersphere/api/parse/ApiImportAbstractParser.java
backend/src/main/java/io/metersphere/api/parse/MsParser.java
+2
-3
backend/src/main/java/io/metersphere/api/parse/MsParser.java
with
11 additions
and
10 deletions
+11
-10
backend/pom.xml
+
1
-
1
View file @
948f6fc9
...
...
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-
jetty
</artifactId>
<artifactId>
spring-boot-starter-
undertow
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
+
8
-
6
View file @
948f6fc9
...
...
@@ -7,9 +7,11 @@ import io.metersphere.api.dto.scenario.request.HttpRequest;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.commons.utils.LogUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
org.eclipse.jetty.http.HttpHeader
;
import
java.io.*
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStreamReader
;
import
java.nio.charset.StandardCharsets
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -19,7 +21,7 @@ public abstract class ApiImportAbstractParser implements ApiImportParser {
protected
String
getApiTestStr
(
InputStream
source
)
{
StringBuilder
testStr
=
null
;
try
(
BufferedReader
bufferedReader
=
new
BufferedReader
(
new
InputStreamReader
(
source
,
StandardCharsets
.
UTF_8
)))
{
try
(
BufferedReader
bufferedReader
=
new
BufferedReader
(
new
InputStreamReader
(
source
,
StandardCharsets
.
UTF_8
)))
{
testStr
=
new
StringBuilder
();
String
inputStr
;
while
((
inputStr
=
bufferedReader
.
readLine
())
!=
null
)
{
...
...
@@ -46,21 +48,21 @@ public abstract class ApiImportAbstractParser implements ApiImportParser {
}
protected
void
addContentType
(
HttpRequest
request
,
String
contentType
)
{
addHeader
(
request
,
HttpHeader
.
CONTENT_TYPE
.
toString
()
,
contentType
);
addHeader
(
request
,
"Content-Type"
,
contentType
);
}
protected
void
addCookie
(
HttpRequest
request
,
String
key
,
String
value
)
{
List
<
KeyValue
>
headers
=
Optional
.
ofNullable
(
request
.
getHeaders
()).
orElse
(
new
ArrayList
<>());
boolean
hasCookie
=
false
;
for
(
KeyValue
header
:
headers
)
{
if
(
StringUtils
.
equalsIgnoreCase
(
HttpHeader
.
COOKIE
.
name
()
,
header
.
getName
()))
{
if
(
StringUtils
.
equalsIgnoreCase
(
"Cookie"
,
header
.
getName
()))
{
hasCookie
=
true
;
String
cookies
=
Optional
.
ofNullable
(
header
.
getValue
()).
orElse
(
""
);
header
.
setValue
(
cookies
+
key
+
"="
+
value
+
";"
);
}
}
if
(!
hasCookie
)
{
addHeader
(
request
,
HttpHeader
.
COOKIE
.
name
()
,
key
+
"="
+
value
+
";"
);
addHeader
(
request
,
"Cookie"
,
key
+
"="
+
value
+
";"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/api/parse/MsParser.java
+
2
-
3
View file @
948f6fc9
...
...
@@ -9,7 +9,6 @@ import io.metersphere.api.dto.parse.ApiImport;
import
io.metersphere.api.dto.scenario.request.RequestType
;
import
io.metersphere.commons.constants.MsRequestBodyType
;
import
org.apache.commons.lang3.StringUtils
;
import
org.eclipse.jetty.http.HttpMethod
;
import
java.io.InputStream
;
...
...
@@ -62,7 +61,7 @@ public class MsParser extends ApiImportAbstractParser {
Object
body
=
requestObject
.
get
(
"body"
);
if
(
body
instanceof
JSONArray
)
{
JSONArray
bodies
=
requestObject
.
getJSONArray
(
"body"
);
if
(
StringUtils
.
equalsIgnoreCase
(
requestObject
.
getString
(
"method"
),
HttpMethod
.
POST
.
name
()
)
&&
bodies
!=
null
)
{
if
(
StringUtils
.
equalsIgnoreCase
(
requestObject
.
getString
(
"method"
),
"POST"
)
&&
bodies
!=
null
)
{
StringBuilder
bodyStr
=
new
StringBuilder
();
for
(
int
i
=
0
;
i
<
bodies
.
size
();
i
++)
{
String
tmp
=
bodies
.
getString
(
i
);
...
...
@@ -75,7 +74,7 @@ public class MsParser extends ApiImportAbstractParser {
}
}
else
if
(
body
instanceof
JSONObject
)
{
JSONObject
bodyObj
=
requestObject
.
getJSONObject
(
"body"
);
if
(
StringUtils
.
equalsIgnoreCase
(
requestObject
.
getString
(
"method"
),
HttpMethod
.
POST
.
name
()
)
&&
bodyObj
!=
null
)
{
if
(
StringUtils
.
equalsIgnoreCase
(
requestObject
.
getString
(
"method"
),
"POST"
)
&&
bodyObj
!=
null
)
{
JSONArray
kvs
=
new
JSONArray
();
bodyObj
.
keySet
().
forEach
(
key
->
{
JSONObject
kv
=
new
JSONObject
();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help