From 317be4b0d5839fdd549b05f350abde193d51a781 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Mon, 27 Nov 2017 15:48:38 +0800
Subject: [PATCH 01/10] =?UTF-8?q?REPORT-5508=20=E5=8A=A0=E5=9B=9E=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/ibutton/UIButtonGroup.java  | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
index 76828e38e..d2e2b8d1d 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
@@ -218,11 +218,11 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
     }
 
     protected Border getGroupBorder() {
-        return BorderFactory.createEmptyBorder(0, 0, 0, 0);
+        return BorderFactory.createEmptyBorder(1, 1, 1, 1);
     }
 
     protected LayoutManager getGridLayout(int number) {
-        return new GridLayout(0, number, 0, 0);
+        return new GridLayout(0, number, 1, 0);
     }
 
     /**
@@ -233,7 +233,7 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
     public void paintComponents(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         Shape oldClip = g2d.getClip();
-        g2d.clip(new RoundRectangle2D.Double(0, 0, getWidth(), getHeight(), UIConstants.ARC, UIConstants.ARC));
+        g2d.clip(new RoundRectangle2D.Double(1, 1, getWidth(), getHeight(), UIConstants.ARC, UIConstants.ARC));
         super.paintComponents(g);
         g2d.setClip(oldClip);
     }
@@ -394,6 +394,34 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
         fireStateChanged();
     }
 
+    /**
+     * 重载Border画法
+     *
+     * @param g
+     */
+    @Override
+    protected void paintBorder(Graphics g) {
+        if (isToolBarComponent) {
+            return;
+        }
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setColor(UIConstants.SHADOW_GREY);
+
+        int width = 0;
+        for (int i = 0; i < labelButtonList.size() - 1; i++) {
+            width += labelButtonList.get(i).getWidth() + 1;
+            int height = labelButtonList.get(i).getHeight();
+            g.drawLine(width, 0, width, height);
+        }
+
+        width += labelButtonList.get(labelButtonList.size() - 1).getWidth() + 1;
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.drawRoundRect(0, 0, width, getHeight() - 1, UIConstants.BUTTON_GROUP_ARC, UIConstants.BUTTON_GROUP_ARC);
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+
+    }
+
     /**
      * main
      *

From 791cd851ba57592ced01197ea95d3b6d01715d44 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 29 Nov 2017 10:24:36 +0800
Subject: [PATCH 02/10] =?UTF-8?q?REPORT-5695=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92][8.0]=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=90=8E=EF=BC=8C=E6=8A=A5=E8=A1=A8=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/gui/itoolbar/UIToolbar.java         | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java b/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
index 76be04705..758537c18 100644
--- a/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
+++ b/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
@@ -5,7 +5,6 @@ import java.awt.*;
 import java.util.ArrayList;
 
 public class UIToolbar extends JToolBar {
-    private static final int TOOLBAR_HEIGNT = 26;
 
     public UIToolbar() {
         this(FlowLayout.LEFT);
@@ -24,13 +23,6 @@ public class UIToolbar extends JToolBar {
         this(align, new UIToolBarUI());
     }
 
-    @Override
-    public Dimension getPreferredSize() {
-        Dimension dim = super.getPreferredSize();
-        dim.height = TOOLBAR_HEIGNT;
-        return dim;
-    }
-
     public void checkComponentsByNames(boolean flag, ArrayList<String> names) {
         for (int i = 0; i < getComponentCount(); i++) {
             Component component = getComponents()[i];

From 854ad41fd029dd07ecad84f746bd6ddddb625fc9 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 29 Nov 2017 11:17:35 +0800
Subject: [PATCH 03/10] =?UTF-8?q?REPORT-5508=20=E5=8A=A0=E5=9B=9E=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/cell/settingpane/style/CustomStylePane.java      | 3 +++
 .../src/com/fr/design/gui/ibutton/UIToggleButton.java          | 1 +
 2 files changed, 4 insertions(+)

diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index 06b8cb937..0f6d38520 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -4,6 +4,7 @@ import com.fr.base.CellBorderStyle;
 import com.fr.base.NameStyle;
 import com.fr.base.Style;
 import com.fr.design.actions.utils.ReportActionUtils;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.MultiTabPane;
 import com.fr.design.gui.style.*;
@@ -12,6 +13,7 @@ import com.fr.design.style.BorderUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.util.ArrayList;
@@ -38,6 +40,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
         super();
         tabPane.setOneLineTab(true);
         tabPane.setDrawLine(false);
+        tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY));
         tabPane.setLayout(new GridLayout(1, 3, 0, 0));
     }
 
diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
index b47975b3f..a3a9d066f 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
@@ -74,6 +74,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
 	 */
 	public UIToggleButton(Icon[] icons, boolean needRelease) {
 		super(icons[0], null, icons[1]);
+		setBorderPainted(true);
 		setSelectedIcon(icons[1]);
 		setExtraPainted(true);
 		if (!needRelease) {

From 4053274b071dff7f03a2b3a2a53b03526f6fa4a1 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 29 Nov 2017 11:39:37 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/images/m_format/highlight.png | Bin 352 -> 256 bytes
 .../com/fr/design/images/m_format/modified.png  | Bin 256 -> 273 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/designer_base/src/com/fr/design/images/m_format/highlight.png b/designer_base/src/com/fr/design/images/m_format/highlight.png
index 14ff765e43e622ca8e13d6d9b3db141625ea1942..613c63d7dece6c1b43dbf5715044fc98c1a7a0d5 100644
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|c6quuhFAz5
z4UFbvQsh~}tA4?H#*e)ceve<;oK1UpoB#X*^9?gDUb)N4`fr=PO`27SMDjMhQ|txr
zO8hn7e)=7su2gkH#=+Ql?#!RFl232$ka4|q^ql@B-D58qgk~Kt>^a?5^M0?nl7I5Y
zq@Ki7)>jHwxMUu*vi>-f5s)vsBTXVEOEBBw`T@B$8w~1S{V(g0JG6y;u|USr6(3jb
zX}$Ga{#VkKAN!cBy5bVn0>w1<Z@3`**xD}iMolf_>*CCiO2*ShKwmI;y85}Sb4q9e
E0989{(EtDd

literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$8c9S!R5%f1V4xCUB*z?MW3y03#{bR#|NrM?U|>!?d-mimCQ=P@aB$#YWc-&3
zG(;V!SB`<<?`)76BpGCCY8w6d^Oq~k%*+K042=7rj`#+mS)d$(6v&YO{}~nn6*B+%
z^LHBy3$xeXzketE|IY+=5m8|TGX&@zW+WT$^78WN95`^`2S|*d*RUDF$jJB?sI?Ae
z2*@D3F2ZHV|No3}XV0Em1~LE!aJmSWA&iU+@#uzt48!Uoe1@DpeR?U(705J(K|n(c
zfU$E1IbcCy0&)p1LqG;%cn#=(M^X*JVbFg|n3IWd2}~`v1Sty)y465Kjsx@4exP?Q
yz!cMk1_!pWvB`f*Y&(1Q3?oKhQ(_=h^a21GQiRnmR(xXs0000<MNUMnLSTYyagE#n

diff --git a/designer_base/src/com/fr/design/images/m_format/modified.png b/designer_base/src/com/fr/design/images/m_format/modified.png
index 613c63d7dece6c1b43dbf5715044fc98c1a7a0d5..5baf577767be073e4823d0b5b70563dde832ff35 100644
GIT binary patch
literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#%Sl8*R5%f1U>LT55#+O^)cnH?|Nq;N<x57!BlBiYv}FQoCf5*<W~g2kWLM0a
zGYRZMWHEf~q?Ek>FnNfJU_1(F6c^z#Cpk5L#{d8S(_!*VjEpnp%$}GD<AZ3TT*UaF
zy@ipH;R{FunEub+3SuJzq70fdr|St&Qw>yO4U~^;4sk95>2P<onZn4(G!aCjm;mJv
z6-FSnVPRo^fmFfV*%P2zQ7NLlhN=ZS55+~u=>ofQ+@cT{0h2jyB?M$B(M!PSK_U$R
X!@({ce2al!00000NkvXXu0mjfeH(3^

literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|c6quuhFAz5
z4UFbvQsh~}tA4?H#*e)ceve<;oK1UpoB#X*^9?gDUb)N4`fr=PO`27SMDjMhQ|txr
zO8hn7e)=7su2gkH#=+Ql?#!RFl232$ka4|q^ql@B-D58qgk~Kt>^a?5^M0?nl7I5Y
zq@Ki7)>jHwxMUu*vi>-f5s)vsBTXVEOEBBw`T@B$8w~1S{V(g0JG6y;u|USr6(3jb
zX}$Ga{#VkKAN!cBy5bVn0>w1<Z@3`**xD}iMolf_>*CCiO2*ShKwmI;y85}Sb4q9e
E0989{(EtDd


From 60e75bf4fb3e08f040cda16abd054844b16939a2 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 29 Nov 2017 11:50:54 +0800
Subject: [PATCH 05/10] =?UTF-8?q?REPORT-5508=209.0=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E9=83=BD=E6=B2=A1=E6=9C=89=E6=8F=8F=E8=BE=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8A=A0=E4=B8=8A=E3=80=82=E8=AF=A6?=
 =?UTF-8?q?=E8=A7=81=E9=97=AE=E9=A2=98=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
index d2e2b8d1d..95c39d69e 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
@@ -222,7 +222,7 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
     }
 
     protected LayoutManager getGridLayout(int number) {
-        return new GridLayout(0, number, 1, 0);
+        return new GridLayout(0, number, 0, 0);
     }
 
     /**

From f6a7a17a55b1c5a22a7c4ee2f6bd1cd68ead3539 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 29 Nov 2017 14:51:29 +0800
Subject: [PATCH 06/10] =?UTF-8?q?REPORT-5714=20=E6=B7=BB=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=A7=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/FormParaWidgetPane.java  | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
index d28233d05..470337190 100644
--- a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -40,6 +40,7 @@ import java.util.List;
 public class FormParaWidgetPane extends JPanel {
     private static FormParaWidgetPane THIS;
     private final static int BORDER = 5;
+    private final static int WIDGET_WIDTHGAP = 4;
 
     private List<WidgetOption> predifinedwidgeList = new ArrayList<WidgetOption>();
 
@@ -123,39 +124,37 @@ public class FormParaWidgetPane extends JPanel {
     }
 
     private void initWidgetTypePopUp() {
-        if (widgetTypePopupMenu == null) {
-            JPanel widgetPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-            loadPredefinedWidget();
-            int rowNum = calculateWidgetWindowRowNum();
-            JPanel westPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            for (WidgetOption o : loadWidgetOptions()) {
-                westPanel.add(new ToolBarButton(o));
-            }
-            int x = commonWidgetNum * (widgetButtonWidth + smallGAP) - smallGAP;
-            westPanel.setPreferredSize(new Dimension(x, (int) (rowNum * westPanel.getPreferredSize().getHeight())));
-            JPanel eastPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            for (WidgetOption no : predifinedwidgeList) {
-                eastPane.add(new ToolBarButton(no));
-            }
-            int maxWidth = preWidgetShowMaxNum * (widgetButtonWidth + smallGAP) - smallGAP;
-            int width = predifinedwidgeList.size() >= preWidgetShowMaxNum ? maxWidth : (int) eastPane.getPreferredSize().getWidth();
-            eastPane.setPreferredSize(new Dimension(width, (int) (rowNum * eastPane.getPreferredSize().getHeight())));
-
-            UIScrollPane eastScrollPane = new UIScrollPane(eastPane);
-            eastScrollPane.setBorder(null);
-            int maxHeight = preWidgetShowMaxRow * (widgetButtonHeight + smallGAP) - smallGAP;
-            int height = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? maxHeight : (int) eastPane.getPreferredSize().getHeight();
-            width = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? (int) eastPane.getPreferredSize().getWidth() + smallGAP + jsparatorWidth : (int) eastPane.getPreferredSize().getWidth();
-            eastScrollPane.setPreferredSize(new Dimension(width, height));
-
-            widgetPane.add(westPanel);
-            widgetPane.add(createJSeparator(height));
-            widgetPane.add(eastScrollPane);
-
-            widgetTypePopupMenu = new UIPopupMenu();
-            widgetTypePopupMenu.setBackground(UIConstants.SELECT_TAB);
-            widgetTypePopupMenu.add(widgetPane);
+        JPanel widgetPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        loadPredefinedWidget();
+        int rowNum = calculateWidgetWindowRowNum();
+        JPanel westPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        for (WidgetOption o : loadWidgetOptions()) {
+            westPanel.add(new ToolBarButton(o));
+        }
+        int x = commonWidgetNum * (widgetButtonWidth + smallGAP) - smallGAP;
+        westPanel.setPreferredSize(new Dimension(x, (int) (rowNum * westPanel.getPreferredSize().getHeight())));
+        JPanel eastPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        for (WidgetOption no : predifinedwidgeList) {
+            eastPane.add(new ToolBarButton(no));
         }
+        int maxWidth = preWidgetShowMaxNum * (widgetButtonWidth + smallGAP) - smallGAP + WIDGET_WIDTHGAP;
+        int width = predifinedwidgeList.size() >= preWidgetShowMaxNum ? maxWidth : (int) eastPane.getPreferredSize().getWidth();
+        eastPane.setPreferredSize(new Dimension(width, (int) (rowNum * eastPane.getPreferredSize().getHeight())));
+
+        UIScrollPane eastScrollPane = new UIScrollPane(eastPane);
+        eastScrollPane.setBorder(null);
+        int maxHeight = preWidgetShowMaxRow * (widgetButtonHeight + smallGAP) - smallGAP;
+        int height = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? maxHeight : (int) eastPane.getPreferredSize().getHeight();
+        width = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? (int) eastPane.getPreferredSize().getWidth() + smallGAP + jsparatorWidth : (int) eastPane.getPreferredSize().getWidth();
+        eastScrollPane.setPreferredSize(new Dimension(width, height));
+
+        widgetPane.add(westPanel);
+        widgetPane.add(createJSeparator(height));
+        widgetPane.add(eastScrollPane);
+
+        widgetTypePopupMenu = new UIPopupMenu();
+        widgetTypePopupMenu.setBackground(UIConstants.SELECT_TAB);
+        widgetTypePopupMenu.add(widgetPane);
     }
 
     private void initChartTypePopUp() {

From 26401dbf5b23c449efc0399346859ab8dc7adfa6 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Mon, 4 Dec 2017 09:43:05 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=8A=A0token=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/RecommendSearchManager.java       |  5 +++-
 .../errorinfo/ErrorInfoUploader.java          | 24 +++++++++----------
 .../src/com/fr/design/DesignModelAdapter.java |  2 +-
 .../DesignerFrameFileDealerPane.java          |  4 ++--
 .../templateinfo/TemplateInfoCollector.java   |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java
index 6c741bd3d..552b0e026 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.alphafine.search.manager;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.SiteCenterToken;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -43,7 +44,9 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor {
         this.recommendModelList = new SearchResult();
         if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainRecommend()) {
             String result;
-            HttpClient httpClient = new HttpClient(AlphaFineConstants.SEARCH_API + CodeUtils.cjkEncode(searchText));
+            String url = AlphaFineConstants.SEARCH_API + CodeUtils.cjkEncode(searchText);
+            url = String.format("%s?token=%s", url, SiteCenterToken.generateToken());
+            HttpClient httpClient = new HttpClient(url);
             httpClient.asGet();
             if (!httpClient.isServerAlive()) {
                 return getNoConnectList();
diff --git a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
index 1ab7e44de..e2a3b30ca 100644
--- a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
+++ b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.errorinfo;
 
 import com.fr.base.FRContext;
+import com.fr.design.mainframe.SiteCenterToken;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
@@ -11,8 +12,6 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.license.function.VT4FR;
 import com.fr.log.LogHandler;
-import com.fr.regist.FRCoreContext;
-import com.fr.regist.LicenseListener;
 import com.fr.stable.CodeUtils;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.ProductConstants;
@@ -50,7 +49,7 @@ public class ErrorInfoUploader {
                 });
             }
         });
-    
+
     }
 
     private ErrorInfoUploader() {
@@ -71,8 +70,8 @@ public class ErrorInfoUploader {
     }
 
     // 从云中心更新最新的解决方案文件
-    private void checkUpdateSolution(){
-    
+    private void checkUpdateSolution() {
+
         if (!VT4FR.AlphaFine.support()) {
             return;
         }
@@ -94,6 +93,7 @@ public class ErrorInfoUploader {
     private void downloadSolution(File localCacheZip) {
         try {
             String downloadURL = SiteCenter.getInstance().acquireUrlByKind("solution.download", "http://cloud.fanruan.com/api/solution");
+            downloadURL = String.format("%s?token=%s", downloadURL, SiteCenterToken.generateToken());
             HttpClient hc = new HttpClient(downloadURL);
             hc.asGet();
             InputStream in = hc.getResponseStream();
@@ -110,13 +110,14 @@ public class ErrorInfoUploader {
 
     }
 
-    private boolean needUpdate(File localCacheZip){
+    private boolean needUpdate(File localCacheZip) {
         if (localCacheZip.exists()) {
             // 判断本地文件大小.
-            String checkURL = SiteCenter.getInstance().acquireUrlByKind("solution.check", "http://cloud.fanruan.com/api/checkUpdate");
+            String checkURL = SiteCenter.getInstance().acquireUrlByKind("solution.check", "http://cloud.fanruan.com/api/solution/cache/check");
+            checkURL = String.format("%s?token=%s", checkURL, SiteCenterToken.generateToken());
             HttpClient client = new HttpClient(checkURL);
             client.asGet();
-            if (client.isServerAlive()){
+            if (client.isServerAlive()) {
                 try {
                     JSONObject res = new JSONObject(client.getResponseText());
                     // 简单粗暴, 直接判断文件大小.
@@ -129,7 +130,7 @@ public class ErrorInfoUploader {
         return true;
     }
 
-    public void sendErrorInfo(){
+    public void sendErrorInfo() {
         // 判断更新解决方案缓存.
         checkUpdateSolution();
 
@@ -171,8 +172,7 @@ public class ErrorInfoUploader {
 
     private boolean sendErroInfo(String url, String content) {
         HashMap<String, String> para = new HashMap<>();
-        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
-        para.put("token", CodeUtils.md5Encode(date, "", "MD5"));
+        para.put("token", SiteCenterToken.generateToken());
         para.put("content", content);
         HttpClient httpClient = new HttpClient(url, para, true);
         httpClient.asGet();
@@ -181,7 +181,7 @@ public class ErrorInfoUploader {
             return false;
         }
 
-        String res =  httpClient.getResponseText();
+        String res = httpClient.getResponseText();
         boolean success;
         try {
             success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
diff --git a/designer_base/src/com/fr/design/DesignModelAdapter.java b/designer_base/src/com/fr/design/DesignModelAdapter.java
index 8e35dbf38..777b96f76 100644
--- a/designer_base/src/com/fr/design/DesignModelAdapter.java
+++ b/designer_base/src/com/fr/design/DesignModelAdapter.java
@@ -26,7 +26,7 @@ public abstract class DesignModelAdapter<T extends IOFile, S extends JTemplatePr
 
     public DesignModelAdapter(S jTemplate) {
         this.jTemplate = jTemplate;
-        setCurrentModelAdapter(this);
+            setCurrentModelAdapter(this);
     }
 
     public S getjTemplate() {
diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 0c780fe94..6b3606ff9 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -60,8 +60,8 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     private OpenFolderAction openFolderAction = new OpenFolderAction();
     private RenameAction renameAction = new RenameAction();
     private DelFileAction delFileAction = new DelFileAction();
-    
-    
+
+
     /**
      * 刷新
      */
diff --git a/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java b/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
index bad1dfcea..a7b8a2552 100644
--- a/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
+++ b/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
@@ -6,6 +6,7 @@ import com.fr.base.io.IOFile;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.SiteCenterToken;
 import com.fr.env.RemoteEnv;
 import com.fr.general.*;
 import com.fr.general.http.HttpClient;
@@ -292,8 +293,7 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable, XM
 
     private boolean sendSingleTemplateInfo(String url, String content) {
         HashMap<String, String> para = new HashMap<>();
-        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
-        para.put("token", CodeUtils.md5Encode(date, "", "MD5"));
+        para.put("token", SiteCenterToken.generateToken());
         para.put("content", content);
         HttpClient httpClient = new HttpClient(url, para, true);
         httpClient.setTimeout(5000);

From ea50351e0c730494bc9f48c9a54fdfb3e6838ecf Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Mon, 4 Dec 2017 18:02:49 +0800
Subject: [PATCH 08/10] =?UTF-8?q?REPORT-5887=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=EF=BC=8C=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=90=8D=E7=9A=84=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/extra/LoginWebBridge.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/extra/LoginWebBridge.java b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
index 330b9fc03..3fb83f5fa 100644
--- a/designer_base/src/com/fr/design/extra/LoginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
@@ -20,7 +20,7 @@ import netscape.javascript.JSObject;
 
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
-import java.awt.Desktop;
+import java.awt.*;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLEncoder;
@@ -57,6 +57,7 @@ public class LoginWebBridge {
     private static final int TIME_OUT = 10000;
     private static final String LOGIN_SUCCESS = "ok";
     private static final String LOGIN_FAILED = "failed";
+    private static final Color LOGIN_BACKGROUND = new Color(184, 220, 242);
 
     private static LoginWebBridge helper;
     private UIDialog uiDialog;
@@ -250,6 +251,7 @@ public class LoginWebBridge {
     private void loginSuccess(String username) {
         closeWindow();
         uiLabel.setText(username);
+        uiLabel.setBackground(LOGIN_BACKGROUND);
     }
 
     /**

From 69fdeb14b411673789b11cc3f31eee6c29baed27 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Tue, 5 Dec 2017 09:56:30 +0800
Subject: [PATCH 09/10] =?UTF-8?q?REPORT-5775=20=E5=B8=AEhzzz=E4=BC=A0pr?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86=E9=82=A3=E8=BE=B9?=
 =?UTF-8?q?=E6=9C=89bug=EF=BC=8C=E6=98=8E=E6=98=8E=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=BA=86=E4=B9=9F=E6=B2=A1=E5=90=88=E8=BF=9B=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/SiteCenterToken.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 designer_base/src/com/fr/design/mainframe/SiteCenterToken.java

diff --git a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
new file mode 100644
index 000000000..16af4c365
--- /dev/null
+++ b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
@@ -0,0 +1,17 @@
+package com.fr.design.mainframe;
+
+import com.fr.stable.CodeUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+/**
+ * Created by hzzz on 2017/12/4.
+ */
+public class SiteCenterToken {
+
+    public static String generateToken() {
+        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
+        return CodeUtils.md5Encode(date, "", "MD5");
+    }
+}

From 8bc46c380e3584b1def9fbffa5f1745be49004f6 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 6 Dec 2017 10:24:06 +0800
Subject: [PATCH 10/10] =?UTF-8?q?REPORT-5944=20=E7=BC=A9=E6=94=BE=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E6=9D=A1=E6=BB=91=E5=9D=97=E5=9B=BE=E6=A0=87=E4=B8=8E?=
 =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/control/icon_thumb_normal.png      | Bin 0 -> 173 bytes
 .../com/fr/design/mainframe/JSliderPane.java  |  25 +++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 designer_base/src/com/fr/design/images/control/icon_thumb_normal.png

diff --git a/designer_base/src/com/fr/design/images/control/icon_thumb_normal.png b/designer_base/src/com/fr/design/images/control/icon_thumb_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fea2e657267fbc40a23baf578e4a0635a2327cd
GIT binary patch
literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|(mh=qLo5W7
z6C^SYbev{XQ&XGA!_%`_;nV-i=jK>$mYp4?meV9)cr5b&|Nqk&6I&c-tSXdZxX5v_
z;f$L(({jcaT!kOqc@q*OjwBv9apDJySm}wJ84^9m9=HC_ROl5r`~Px+6q`IR!~QQ)
V5}Qv&1^}&O@O1TaS?83{1OPkjJ<0$8

literal 0
HcmV?d00001

diff --git a/designer_base/src/com/fr/design/mainframe/JSliderPane.java b/designer_base/src/com/fr/design/mainframe/JSliderPane.java
index d05655139..c2f4da0e7 100644
--- a/designer_base/src/com/fr/design/mainframe/JSliderPane.java
+++ b/designer_base/src/com/fr/design/mainframe/JSliderPane.java
@@ -19,11 +19,14 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.basic.BasicSliderUI;
-import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultFormatterFactory;
 import javax.swing.text.NumberFormatter;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
 import java.math.BigDecimal;
 
 /**
@@ -31,6 +34,7 @@ import java.math.BigDecimal;
  */
 public class JSliderPane extends JPanel {
 
+    public static final Image APPFIT_V0 = BaseUtils.readImage("com/fr/design/images/control/icon_thumb_normal.png");
     private static final double ONEPOINTEIGHT = 1.8;
     private static final int SIX = 6;
     private static final int TEN = 10;
@@ -433,8 +437,8 @@ public class JSliderPane extends JPanel {
 class JSliderPaneUI extends BasicSliderUI {
 
     private static final Color BACK_COLOR = new Color(245, 245, 247);
-    private static final int VERTICAL_WIDTH = 11;
-    private static final int VERTICAL_HEIGHT = 16;
+    private static final int THUMB_XOFFSET = 8;
+    private static final int THUMB_YOFFSET = 3;
     private static final int FOUR = 4;
     private static final int FIVE = 5;
     private static final int SIX = 6;
@@ -451,13 +455,9 @@ class JSliderPaneUI extends BasicSliderUI {
 
     public void paintThumb(Graphics g) {
         Rectangle knobBounds = thumbRect;
-        int w = knobBounds.width;
-        int h = knobBounds.height;
         Graphics2D g2d = (Graphics2D) g;
-
-        g2d.translate(knobBounds.x, knobBounds.y);
-        g2d.setColor(new Color(51, 51, 52));
-        g2d.fillRoundRect(0, SIX, FOUR, 9, 2, 2);
+        g2d.drawImage(JSliderPane.APPFIT_V0, knobBounds.x - THUMB_XOFFSET, knobBounds.y + THUMB_YOFFSET, null);
+        g2d.dispose();
     }
 
     /** */
@@ -481,6 +481,11 @@ class JSliderPaneUI extends BasicSliderUI {
         }
     }
 
+    public void setThumbLocation(int x, int y) {
+        super.setThumbLocation(x, y);
+        slider.repaint();
+    }
+
 }
 
 class PopupPane extends JPopupMenu {