Pull request #1779: REPORT-29573 【国际化】插件管理类别、场景部分仍显示中文

Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0

* commit '3a3c6adf8a165058e4efb29862016b0ad7f465ea':
  REPORT-29573 【国际化】插件管理类别、场景部分仍显示中文

designer-base/src/main/java/com/fr/design/extra/exe/GetPluginCategoriesExecutor.java

@@ -1,10 +1,13 @@
 package com.fr.design.extra.exe;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.extra.PluginConstants;
 import com.fr.design.extra.Process;
 import com.fr.general.CloudCenter;
-import com.fr.general.http.HttpClient;
+import com.fr.general.http.HttpToolbox;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
+import java.util.Locale;
 
 /**
  * Created by vito on 16/5/16.
@@ -28,14 +31,17 @@ public class GetPluginCategoriesExecutor implements Executor {
 
                     @Override
                     public void run(Process<String> process) {
-                        String url = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.category");
+                        Locale locale = DesignerEnvManager.getEnvManager().getLanguage();
+                        String url = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.category") + "&locale=" + locale.toString();
                         if (StringUtils.isNotEmpty(url)) {
-                            HttpClient httpClient = new HttpClient(url);
-                            result = httpClient.getResponseText();
-                        } else {
-                            result = PluginConstants.CONNECTION_404;
+                            try {
+                                result = HttpToolbox.get(url);
+                                return;
+                            } catch (Exception e) {
+                                FineLoggerFactory.getLogger().error(e.getMessage(), e);
                             }
-
+                        }
+                        result = PluginConstants.CONNECTION_404;
                     }
                 }
         };