This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new abbcb7339 Fix Chinese garbled code issue when HTTP post input
parameter is param (#4860)
abbcb7339 is described below
commit abbcb733953d6a79faa8d8493b9ca52afa95f75e
Author: zhangwejun <[email protected]>
AuthorDate: Mon Aug 14 18:12:05 2023 +0800
Fix Chinese garbled code issue when HTTP post input parameter is param
(#4860)
* upgrade the version to 1.4.0
* upgrade the version to 1.4.0
* Fix Chinese garbled code issue when HTTP post input parameter is param
* upgrade the version to 1.5.0-SNAPSHOT
* upgrade the version to 1.5.0-SNAPSHOT
---------
Co-authored-by: Casion <[email protected]>
Co-authored-by: peacewong <[email protected]>
---
.github/workflows/integration-test.yml | 2 +-
.github/workflows/publish-docker.yaml | 2 +-
.../main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala | 5 +++--
linkis-web/package.json | 2 +-
pom.xml | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/integration-test.yml
b/.github/workflows/integration-test.yml
index 1487261d9..ce0b8ceec 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -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: |
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 34276fc54..ec07c2eff 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -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
diff --git
a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
index 7b443eb92..d901bb902 100644
---
a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
+++
b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
@@ -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
@@ -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)) {
@@ -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))
diff --git a/linkis-web/package.json b/linkis-web/package.json
index 064566871..47828a70c 100644
--- a/linkis-web/package.json
+++ b/linkis-web/package.json
@@ -1,6 +1,6 @@
{
"name": "linkis",
- "version": "1.3.2",
+ "version": "1.4.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/pom.xml b/pom.xml
index 44c9aebe5..001e8189d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
