Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java

@@ -8,6 +8,7 @@ import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import java.awt.Component;
 import java.awt.HeadlessException;
+import java.awt.event.ActionListener;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -184,6 +185,29 @@ public class FineJOptionPane extends JOptionPane {
                 messageType, icon, options, initialValue);
     }
 
+    /**
+     * 带确认+取消按钮的弹出框，并绑定确认事件
+     *
+     * @param parentComponent 父容器
+     * @param message         具体的提示消息
+     * @param title           标题
+     * @param icon            图标
+     * @param initialValue    初始选项
+     * @throws HeadlessException
+     */
+    public static int showConfirmDialogWithOkListener(Component parentComponent, Object message,
+                                        String title, Icon icon, Object initialValue, ActionListener listener)
+            throws HeadlessException {
+        int val = showOptionDialog(parentComponent, message, title, JOptionPane.DEFAULT_OPTION,
+                FineJOptionPane.WARNING_MESSAGE, icon, OPTION_OK_CANCEL, initialValue);
+        if (val == JOptionPane.OK_OPTION && listener!=null) {
+            listener.actionPerformed(null);
+        }
+        return val;
+    }
+
+
+
     /**
      * 指定消息内容的输入弹出框
      * @param message 消息内容

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

@@ -1,15 +1,24 @@
 package com.fr.design.extra.exe;
 
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginsReaderFromStore;
 import com.fr.design.extra.Process;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.utils.DesignUtils;
+import com.fr.general.SiteBlockedException;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
+import javax.swing.JOptionPane;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.List;
 
+import static com.fr.design.dialog.FineJOptionPane.OPTION_OK_CANCEL;
+
 /**
  * Created by vito on 16/4/19.
  */
@@ -41,6 +50,19 @@ public class ReadUpdateOnlineExecutor implements Executor {
                                 jsonArray.put(jsonObject);
                             }
                             result = jsonArray.toString();
+                        } catch (SiteBlockedException e1) {
+                            FineJOptionPane.showConfirmDialogWithOkListener(null,
+                                    e1.getMessage(),
+                                    Toolkit.i18nText("Fine-Design_Basic_Alert"), null, null,
+                                    new ActionListener() {
+                                        @Override
+                                        public void actionPerformed(ActionEvent e) {
+                                            DesignUtils.visitEnvServerByParameters(
+                                                    "#management/system/normal",
+                                                    null,
+                                                    null);
+                                        }
+                                    });
                         } catch (Exception e) {
                             FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         }

designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java

@@ -255,6 +255,9 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse
                 } else if (pattern.indexOf("%") > 0) {
                     setPatternComboBoxAndList(FormatContents.PERCENT, pattern);
                     this.roundingBox.setSelected(((CoreDecimalFormat) format).getRoundingMode().equals(RoundingMode.HALF_UP));
+                } else if (pattern.indexOf("‰") > 0) {
+                    setPatternComboBoxAndList(FormatContents.THOUSANDTHS, pattern);
+                    this.roundingBox.setSelected(((CoreDecimalFormat) format).getRoundingMode().equals(RoundingMode.HALF_UP));
                 } else if (pattern.indexOf("E") > 0) {
                     setPatternComboBoxAndList(FormatContents.SCIENTIFIC, pattern);
                 } else {

designer-base/src/main/java/com/fr/design/style/FormatPane.java

@@ -240,7 +240,7 @@ public class FormatPane extends BasicPane {
         } else if (pattern.endsWith("%")) {
             this.percentRadioButton.setSelected(true);
             this.applyRadioActionListener(this.percentRadioButton);
-        } else if (pattern.equals("‰")){
+        } else if (pattern.endsWith("‰")){
             this.thousandthsRadioButton.setSelected(true);
             this.applyRadioActionListener(this.thousandthsRadioButton);
         } else if (pattern.indexOf("E") > 0) {

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -24,6 +24,7 @@ import com.fr.design.update.ui.widget.UpdateInfoTable;
 import com.fr.design.update.ui.widget.UpdateInfoTableCellRender;
 import com.fr.design.update.ui.widget.UpdateInfoTableModel;
 import com.fr.design.update.ui.widget.UpdateInfoTextAreaCellRender;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.*;
 import com.fr.general.http.HttpToolbox;
@@ -56,6 +57,7 @@ import java.util.*;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import static com.fr.design.dialog.FineJOptionPane.OPTION_OK_CANCEL;
 import static java.nio.charset.StandardCharsets.*;
 import static javax.swing.JOptionPane.QUESTION_MESSAGE;
 
@@ -350,7 +352,25 @@ public class UpdateMainDialog extends UIDialog {
         new SwingWorker<JSONObject, Void>() {
             @Override
             protected JSONObject doInBackground() throws Exception {
-                return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar11.update")));
+                try {
+                    String url = CloudCenter.getInstance().acquireUrlByKind("jar11.update");
+                    return new JSONObject(HttpToolbox.get(url));
+                } catch (SiteBlockedException e) {
+                    stopLoading();
+                    FineJOptionPane.showConfirmDialogWithOkListener(null,
+                            e.getMessage(),
+                            Toolkit.i18nText("Fine-Design_Basic_Alert"), null, null,
+                            new ActionListener() {
+                                @Override
+                                public void actionPerformed(ActionEvent e) {
+                                    DesignUtils.visitEnvServerByParameters(
+                                            "#management/system/normal",
+                                            null,
+                                            null);
+                                }
+                            });
+                }
+                return null;
             }
 
             @Override

designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java

@@ -5,9 +5,12 @@ import com.fr.design.RestartHelper;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginConstants;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.CloudCenter;
 import com.fr.general.IOUtils;
+import com.fr.general.SiteBlockedException;
 import com.fr.general.http.HttpClient;
 import com.fr.plugin.chart.DownloadSourcesEvent;
 import com.fr.stable.CommonUtils;
@@ -20,6 +23,8 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -33,6 +38,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 
+import static com.fr.design.dialog.FineJOptionPane.OPTION_OK_CANCEL;
+
 /**
  * Created by shine on 2017/8/21.
  */
@@ -69,7 +76,23 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
             //本地有这个资源，不下载
             return;
         }
-        httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind(siteKind));
+        try {
+            httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind(siteKind));
+        } catch (SiteBlockedException e) {
+            FineJOptionPane.showConfirmDialogWithOkListener(null,
+                    e.getMessage(),
+                    Toolkit.i18nText("Fine-Design_Basic_Alert"), null, null,
+                    new ActionListener() {
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            DesignUtils.visitEnvServerByParameters(
+                                    "#management/system/normal",
+                                    null,
+                                    null);
+                        }
+                    });
+            return;
+        }
         if (httpClient.getResponseCode() != HttpURLConnection.HTTP_OK) {
             //服务器连不上，不下载
             return;
@@ -116,12 +139,22 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
     private void downloadAndInstallPluginDependenceFile() {
         try {
             double currentBytesRead = 0;
+            result = false;
 
             for (int i = 0; i < list.size(); i++) {
                 SiteInfo siteInfo = list.get(i);
-
+                try {
-                httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind(siteInfo.siteKind));
+                    httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind(siteInfo.siteKind));
+                } catch (SiteBlockedException e) {
+                    FineJOptionPane.showConfirmDialog(null,
+                            e.getMessage(),
+                            Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.DEFAULT_OPTION,
+                            FineJOptionPane.WARNING_MESSAGE, null, OPTION_OK_CANCEL, null);
+                    result = false;
+                    return;
+                }
                 if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                    result = true;
                     String temp = StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE);
                     File file = new File(temp);
                     StableUtils.makesureFileExist(file);