Fix translation error when source text is in chinese #33

Airsaid · Airsaid · commit 13e29977a29e · 2021-07-06T17:33:35.000+08:00
diff --git a/src/main/java/com/airsaid/localization/translate/AbstractTranslator.java b/src/main/java/com/airsaid/localization/translate/AbstractTranslator.java
@@ -28,6 +28,9 @@
 
 import javax.swing.*;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,14 +58,20 @@ public String doTranslate(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull
       return requestBuilder.connect(request -> {
         String requestParams = getRequestParams(fromLang, toLang, text)
             .stream()
-            .map(pair -> pair.first.concat("=").concat(pair.second))
+            .map(pair -> {
+              try {
+                return pair.first.concat("=").concat(URLEncoder.encode(pair.second, StandardCharsets.UTF_8.name()));
+              } catch (UnsupportedEncodingException e) {
+                throw new TranslationException(fromLang, toLang, text, e);
+              }
+            })
             .collect(Collectors.joining("&"));
         if (!requestParams.isEmpty()) {
           request.write(requestParams);
         }
         String requestBody = getRequestBody(fromLang, toLang, text);
         if (!requestBody.isEmpty()) {
-          request.write(requestBody);
+          request.write(URLEncoder.encode(requestBody, StandardCharsets.UTF_8.name()));
         }
         String resultText = request.readString();
         return parsingResult(fromLang, toLang, text, resultText);
diff --git a/src/main/java/com/airsaid/localization/translate/impl/baidu/BaiduTranslator.java b/src/main/java/com/airsaid/localization/translate/impl/baidu/BaiduTranslator.java
@@ -23,11 +23,9 @@
 import com.airsaid.localization.translate.lang.Languages;
 import com.airsaid.localization.translate.util.GsonUtil;
 import com.airsaid.localization.translate.util.MD5;
-import com.airsaid.localization.translate.util.UrlBuilder;
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.io.RequestBuilder;
 import icons.PluginIcons;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -102,23 +100,22 @@ public class BaiduTranslator extends AbstractTranslator {
 
   @Override
   public @NotNull String getRequestUrl(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull String text) {
-    String salt = String.valueOf(System.currentTimeMillis());
-    String appId = getAppId();
-    String securityKey = getAppKey();
-    String sign = MD5.md5(appId + text + salt + securityKey);
-    return new UrlBuilder(TRANSLATE_URL)
-        .addQueryParameter("from", fromLang.getCode())
-        .addQueryParameter("to", toLang.getCode())
-        .addQueryParameters("appid", appId)
-        .addQueryParameters("salt", salt)
-        .addQueryParameters("sign", sign)
-        .build();
+    return TRANSLATE_URL;
   }
 
   @Override
   public @NotNull List<Pair<String, String>> getRequestParams(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull String text) {
+    String salt = String.valueOf(System.currentTimeMillis());
+    String appId = getAppId();
+    String securityKey = getAppKey();
+    String sign = MD5.md5(appId + text + salt + securityKey);
     List<Pair<String, String>> params = new ArrayList<>();
-    params.add(Pair.create("q", StringEscapeUtils.escapeJava(text)));
+    params.add(Pair.create("from", fromLang.getCode()));
+    params.add(Pair.create("to", toLang.getCode()));
+    params.add(Pair.create("appid", appId));
+    params.add(Pair.create("salt", salt));
+    params.add(Pair.create("sign", sign));
+    params.add(Pair.create("q", text));
     return params;
   }
 
diff --git a/src/main/java/com/airsaid/localization/translate/impl/google/GoogleTranslator.java b/src/main/java/com/airsaid/localization/translate/impl/google/GoogleTranslator.java
@@ -26,7 +26,6 @@
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.io.RequestBuilder;
 import icons.PluginIcons;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -106,7 +105,7 @@ public List<Lang> getSupportedLanguages() {
   @Override
   public @NotNull List<Pair<String, String>> getRequestParams(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull String text) {
     List<Pair<String, String>> params = new ArrayList<>();
-    params.add(Pair.create("q", StringEscapeUtils.escapeJava(text)));
+    params.add(Pair.create("q", text));
     return params;
   }
 
diff --git a/src/main/java/com/airsaid/localization/translate/impl/microsoft/MicrosoftTranslator.java b/src/main/java/com/airsaid/localization/translate/impl/microsoft/MicrosoftTranslator.java
@@ -26,7 +26,6 @@
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.io.RequestBuilder;
 import icons.PluginIcons;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -182,7 +181,7 @@ public boolean isNeedAppId() {
   @Override
   @NotNull
   public String getRequestBody(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull String text) {
-    return "[{\"Text\": \"" + StringEscapeUtils.escapeJava(text) + "\"}]";
+    return "[{\"Text\": \"" + text + "\"}]";
   }
 
   @Override
diff --git a/src/main/java/com/airsaid/localization/translate/impl/youdao/YoudaoTranslator.java b/src/main/java/com/airsaid/localization/translate/impl/youdao/YoudaoTranslator.java
@@ -22,11 +22,9 @@
 import com.airsaid.localization.translate.lang.Lang;
 import com.airsaid.localization.translate.lang.Languages;
 import com.airsaid.localization.translate.util.GsonUtil;
-import com.airsaid.localization.translate.util.UrlBuilder;
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.io.RequestBuilder;
 import icons.PluginIcons;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -169,20 +167,7 @@ public String getApplyAppIdUrl() {
 
   @Override
   public @NotNull String getRequestUrl(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull String text) {
-    String salt = String.valueOf(System.currentTimeMillis());
-    String curTime = String.valueOf(System.currentTimeMillis() / 1000);
-    String appId = getAppId();
-    String appKey = getAppKey();
-    String sign = getDigest(appId + truncate(text) + salt + curTime + appKey);
-    return new UrlBuilder(TRANSLATE_URL)
-        .addQueryParameter("from", fromLang.getCode())
-        .addQueryParameter("to", toLang.getCode())
-        .addQueryParameter("signType", "v3")
-        .addQueryParameter("curtime", curTime)
-        .addQueryParameter("appKey", appId)
-        .addQueryParameter("salt", salt)
-        .addQueryParameter("sign", sign)
-        .build();
+    return TRANSLATE_URL;
   }
 
   private String truncate(String q) {
@@ -212,8 +197,20 @@ private String getDigest(String string) {
 
   @Override
   public @NotNull List<Pair<String, String>> getRequestParams(@NotNull Lang fromLang, @NotNull Lang toLang, @NotNull String text) {
+    String salt = String.valueOf(System.currentTimeMillis());
+    String curTime = String.valueOf(System.currentTimeMillis() / 1000);
+    String appId = getAppId();
+    String appKey = getAppKey();
+    String sign = getDigest(appId + truncate(text) + salt + curTime + appKey);
     List<Pair<String, String>> params = new ArrayList<>();
-    params.add(Pair.create("q", StringEscapeUtils.escapeJava(text)));
+    params.add(Pair.create("from", fromLang.getCode()));
+    params.add(Pair.create("to", toLang.getCode()));
+    params.add(Pair.create("signType", "v3"));
+    params.add(Pair.create("curtime", curTime));
+    params.add(Pair.create("appKey", appId));
+    params.add(Pair.create("salt", salt));
+    params.add(Pair.create("sign", sign));
+    params.add(Pair.create("q", text));
     return params;
   }
 
