Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Chinese garbled code issue when HTTP post input parameter is param #4860

Merged
merged 6 commits into from
Aug 14, 2023
Merged

Fix Chinese garbled code issue when HTTP post input parameter is param #4860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82c3e6a
upgrade the version to 1.4.0
casionone Jul 27, 2023
a119d2e
upgrade the version to 1.4.0
casionone Jul 27, 2023
7f3c1a9
Merge pull request #4832 from apache/master
peacewong Jul 27, 2023
d46e3c5
Fix Chinese garbled code issue when HTTP post input parameter is param
zhangwejun Aug 11, 2023
bd83bf8
upgrade the version to 1.5.0-SNAPSHOT
zhangwejun Aug 11, 2023
30f9d3a
upgrade the version to 1.5.0-SNAPSHOT
zhangwejun Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.4.0-SNAPSHOT
LINKIS_VERSION: 1.5.0-SNAPSHOT
steps:
- name: Free up disk space
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.4.0-SNAPSHOT
LINKIS_VERSION: 1.5.0-SNAPSHOT
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
5 changes: 3 additions & 2 deletions ...ns/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import org.apache.http.message.BasicNameValuePair
import org.apache.http.util.EntityUtils

import java.net.URI
import java.nio.charset.Charset
import java.util
import java.util.Locale

Expand Down Expand Up @@ -285,7 +286,7 @@ abstract class AbstractHttpClient(clientConfig: ClientConfig, clientName: String
if (v != null) nameValuePairs.add(new BasicNameValuePair(k, v.toString))
}
}
httpPut.setEntity(new UrlEncodedFormEntity(nameValuePairs))
httpPut.setEntity(new UrlEncodedFormEntity(nameValuePairs, Charset.defaultCharset))
}

if (StringUtils.isNotBlank(put.getRequestPayload)) {
Expand Down Expand Up @@ -343,7 +344,7 @@ abstract class AbstractHttpClient(clientConfig: ClientConfig, clientName: String
post.getParameters.asScala.foreach { case (k, v) =>
if (v != null) nvps.add(new BasicNameValuePair(k, v.toString))
}
httpPost.setEntity(new UrlEncodedFormEntity(nvps))
httpPost.setEntity(new UrlEncodedFormEntity(nvps, Charset.defaultCharset))
} else if (post.getFormParams.asScala.nonEmpty) {
post.getFormParams.asScala.foreach { case (k, v) =>
if (v != null) nvps.add(new BasicNameValuePair(k, v.toString))
Expand Down
2 changes: 1 addition & 1 deletion linkis-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkis",
"version": "1.3.2",
"version": "1.4.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</snapshotRepository>
</distributionManagement>
<properties>
<revision>1.4.0-SNAPSHOT</revision>
<revision>1.5.0-SNAPSHOT</revision>

<zookeeper.version>3.5.9</zookeeper.version>
<curator.version>4.2.0</curator.version>
Expand Down
Loading