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]>
apache · Aug 14, 2023 · abbcb73 · abbcb73
1 parent 1dd22bc
commit abbcb73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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/...ns/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala b/...ns/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
@@ -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
@@ -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>