Merge pull request #1568 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0

* commit '1ad716365b7decd75dc0c971a61be6fcc4050f61':
  REPORT-28415 10.0连接帆软服务开关

designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@@ -72,11 +72,11 @@ public class AboutPane extends JPanel {
         addPhoneAndQQPane(contentPane);
 
         // 官网
-        JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL));
+        JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Official_Website"), CloudCenter.getInstance().acquireConf("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL));
 
         // 支持邮箱
-        String defaultEmail = CloudCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL);
+        String defaultEmail = CloudCenter.getInstance().acquireConf("support.email", ProductConstants.SUPPORT_EMAIL);
-        JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + GeneralContext.getLocale(), defaultEmail));
+        JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Email"), CloudCenter.getInstance().acquireConf("support.email." + GeneralContext.getLocale(), defaultEmail));
 
         contentPane.add(urlActionPane);
         contentPane.add(emailPane);
@@ -96,7 +96,7 @@ public class AboutPane extends JPanel {
         if (GeneralContext.getLocale().equals(Locale.US)) {
             return;
         }
-        boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE));
+        boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Service_Phone") + CloudCenter.getInstance().acquireConf("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE));
         contentPane.add(boxCenterAlignmentPane);
         // 繁体版不显示QQ
         if (GeneralContext.getLocale().equals(Locale.TAIWAN)) {
@@ -176,7 +176,7 @@ public class AboutPane extends JPanel {
 
     private String getCopyRight() {
         return append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_CopyRight"), COPYRIGHT_LABEL,
-                ProductConstants.HISTORY, StringUtils.BLANK, CloudCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME));
+                ProductConstants.HISTORY, StringUtils.BLANK, CloudCenter.getInstance().acquireConf("company.name", ProductConstants.COMPANY_NAME));
     }
 
     private String getBuildTitle() {

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

@@ -1,10 +1,10 @@
 package com.fr.design.extra;
 
 import com.fr.config.MarketConfig;
+import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.exe.callback.InstallFromDiskCallback;
 import com.fr.design.extra.exe.callback.InstallOnlineCallback;
-import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.extra.exe.callback.ModifyStatusCallback;
 import com.fr.design.extra.exe.callback.UninstallPluginCallback;
 import com.fr.design.extra.exe.callback.UpdateFromDiskCallback;
@@ -13,6 +13,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
+import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
@@ -25,9 +26,9 @@ import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
-import javax.swing.SwingUtilities;
 import java.io.File;
+import java.net.HttpURLConnection;
 import java.util.List;
 
 
@@ -110,13 +111,18 @@ public class PluginOperateUtils {
     public static String getRecommendPlugins() {
         String plistUrl = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.feature");
         JSONArray resultArray = JSONArray.create();
+        if (StringUtils.isBlank(plistUrl)) {
+            return resultArray.toString();
+        }
         try {
             HttpClient httpClient = new HttpClient(plistUrl);
+            if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
                 String result = httpClient.getResponseText();
                 JSONArray jsonArray = new JSONArray(result);
                 resultArray = PluginUtils.filterPluginsFromVersion(jsonArray);
-        } catch (Exception e) {
+            }
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        } catch (JSONException e) {
+            FineLoggerFactory.getLogger().info(e.getMessage(), e);
         }
         return resultArray.toString();
     }

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

@@ -2,6 +2,7 @@ package com.fr.design.extra;
 
 import com.fr.base.TemplateUtils;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
@@ -12,8 +13,8 @@ import com.fr.plugin.basic.version.Version;
 import com.fr.plugin.basic.version.VersionIntervalFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
-import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.error.PluginBaseErrorCode;
+import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.EncodeConstants;
@@ -21,11 +22,12 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
@@ -46,8 +48,7 @@ public class PluginUtils {
     public static PluginMarker createPluginMarker(String pluginInfo) {
         //todo 判空
         String[] plugin = pluginInfo.split("_");
-        PluginMarker pluginMarker = PluginMarker.create(plugin[0], plugin[1]);
+        return PluginMarker.create(plugin[0], plugin[1]);
-        return pluginMarker;
     }
 
     public static JSONObject getLatestPluginInfo(String pluginID) throws Exception {
@@ -90,7 +91,11 @@ public class PluginUtils {
         InputStream reader = null;
         FileOutputStream writer = null;
         try {
-            HttpClient httpClient = new HttpClient(getDownloadPath(id));
+            String downloadPath = getDownloadPath(id);
+            if (StringUtils.isBlank(downloadPath)) {
+                throw new PluginVerifyException(Toolkit.i18nText("Fine-Design_Basic_Plugin_Connect_Server_Error"));
+            }
+            HttpClient httpClient = new HttpClient(downloadPath);
             if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
                 int totalSize = httpClient.getContentLength();
                 reader = httpClient.getResponseStream();
@@ -108,12 +113,12 @@ public class PluginUtils {
                     p.process(totalBytesRead / (double) totalSize);
                 }
             } else {
-                throw new com.fr.plugin.PluginVerifyException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Connect_Server_Error"));
+                throw new PluginVerifyException(Toolkit.i18nText("Fine-Design_Basic_Plugin_Connect_Server_Error"));
             }
         } catch (PluginVerifyException e) {
             FineJOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
             return false;
-        } catch (Exception e) {
+        } catch (IOException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return false;
         } finally {
@@ -136,19 +141,27 @@ public class PluginUtils {
         }
     }
 
-    private static String getDownloadPath(String id) throws Exception {
+    private static String getDownloadPath(String id) {
-        HashMap<String, String> map = new HashMap<String, String>();
+        String url = CloudCenter.getInstance().acquireUrlByKind("shop.script.download");
-        map.put("id", id);
+        if (StringUtils.isBlank(url)) {
-        HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.script.download")+ "?" + FR_VERSION + "=" + ProductConstants.VERSION);
+            return StringUtils.EMPTY;
+        }
+        HttpClient httpClient = new HttpClient(url + "?" + FR_VERSION + "=" + ProductConstants.VERSION);
         httpClient.asGet();
+        if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
             String resText = httpClient.getResponseText();
             JSONObject resultJSONObject = new JSONObject(resText);
             String scriptUrl = resultJSONObject.optString("result");
             String charSet = EncodeConstants.ENCODING_UTF_8;
+            try {
                 scriptUrl = URLDecoder.decode(URLDecoder.decode(scriptUrl, charSet), charSet);
-
+            } catch (UnsupportedEncodingException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
             return scriptUrl;
         }
+        return StringUtils.EMPTY;
+    }
 
     public static boolean isPluginMatch(PluginView pluginView, String text) {
         return StringUtils.contains(pluginView.getID(), text)
@@ -219,9 +232,10 @@ public class PluginUtils {
 
     /**
      * 在不同设计器版本下展示不同插件
+     *
      * @return 插件
      */
-    public static JSONArray filterPluginsFromVersion(JSONArray oriJSONArray) throws Exception{
+    public static JSONArray filterPluginsFromVersion(JSONArray oriJSONArray) {
         JSONArray resultJSONArray = JSONArray.create();
         for (int i = 0; i < oriJSONArray.length(); i++) {
             JSONObject jo = oriJSONArray.getJSONObject(i);

designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java

@@ -198,6 +198,9 @@ public class InformationCollector implements XMLReadable, XMLWriter {
         }
         JSONObject content = getJSONContentAsByte();
         String url = CloudCenter.getInstance().acquireUrlByKind("user.info.v10");
+        if (StringUtils.isBlank(url)) {
+            return;
+        }
         boolean success = false;
         try {
             HashMap<String, Object> para = new HashMap<>();

designer-realize/src/main/java/com/fr/design/mainframe/bbs/BBSConstants.java

@@ -64,7 +64,7 @@ public class BBSConstants {
     }
 
     private static String[] loadAllGuestsInfoOnline(String key, String defaultValue) {
-        String guest = CloudCenter.getInstance().acquireUrlByKind(key, defaultValue);
+        String guest = CloudCenter.getInstance().acquireConf(key, defaultValue);
         if (StringUtils.isNotEmpty(guest)) {
             return guest.split("\\|");
         }

designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@@ -17,6 +17,7 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -100,7 +101,10 @@ public class ErrorInfoUploader {
 
     private void downloadSolution(File localCacheZip) {
         try {
-            String downloadURL = CloudCenter.getInstance().acquireUrlByKind("solution.download", "http://cloud.fanruan.com/api/solution");
+            String downloadURL = CloudCenter.getInstance().acquireUrlByKind("solution.download");
+            if (StringUtils.isBlank(downloadURL)) {
+                return;
+            }
             downloadURL = String.format("%s?token=%s", downloadURL, SiteCenterToken.generateToken());
             InputStream in = HttpToolbox.post(downloadURL, new HashMap<String, Object>(), HttpResponseType.STREAM);
             StableUtils.makesureFileExist(localCacheZip);
@@ -119,7 +123,10 @@ public class ErrorInfoUploader {
     private boolean needUpdate(File localCacheZip) {
         if (localCacheZip.exists()) {
             // 判断本地文件大小.
-            String checkURL = CloudCenter.getInstance().acquireUrlByKind("solution.check", "http://cloud.fanruan.com/api/solution/cache/check");
+            String checkURL = CloudCenter.getInstance().acquireUrlByKind("solution.check");
+            if (StringUtils.isBlank(checkURL)) {
+                return false;
+            }
             checkURL = String.format("%s?token=%s", checkURL, SiteCenterToken.generateToken());
             try {
                 JSONObject res = new JSONObject(HttpToolbox.get(checkURL));
@@ -143,6 +150,9 @@ public class ErrorInfoUploader {
         }
 
         File[] files = folder.listFiles();
+        if (files == null) {
+            return;
+        }
         if (ArrayUtils.getLength(files) > MAX_ERROR_SIZE) {
             CommonIOUtils.deleteFile(folder);
             return;
@@ -168,6 +178,9 @@ public class ErrorInfoUploader {
                         tempFiles.add(file);
                         if (jsonArray.length() == MAX_ITEMS || count == files.length) {
                             String url = CloudCenter.getInstance().acquireUrlByKind("design.error");
+                            if (StringUtils.isBlank(url)) {
+                                return;
+                            }
                             if (sendErrorInfo(url, jsonArray)) {
                                 deleteFiles(tempFiles);
                             }