Merge pull request #13657 in DESIGN/design from bugfix/11.0 to feature/x

* commit '1126030700b6a1bd59be1e135891cda331fef7b2':
  REPORT-115175 模板主题按钮显示不全
  REPORT-114522 /remote/design/service接口可以未鉴权获取源码信息

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -431,7 +431,7 @@ public class EnvChangeEntrance {
         Set<Class> localServiceSet = FineObjectPool.getInstance().getServerPool().keySet();
 
         try {
-            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList();
+            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList(info);
             for (int i = 0; i < serviceArray.size(); i++) {
                 try {
                     Class clazz = Class.forName((String) serviceArray.get(i));

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

@@ -46,10 +46,10 @@ import javax.swing.event.ChangeListener;
 import javax.swing.plaf.basic.BasicButtonUI;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Desktop;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -137,7 +137,9 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
             }
         });
 
-        tweakNinePointButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Image_Config_Nine_Point_Fill"));
+        String buttonText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Image_Config_Nine_Point_Fill");
+        tweakNinePointButton = new UIButton(buttonText);
+        tweakNinePointButton.setToolTipText(buttonText);
         borderImageOpacityPane = new UIPercentDragPane();
     }
 
@@ -174,23 +176,28 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         borderedImagePreviewPane.setPreferredSize(new Dimension(145, 145));
         borderedImagePreviewPane.add(imagePreviewPane, BorderLayout.CENTER);
 
-        JPanel tweakNinePointComposedPane = new JPanel();
-        tweakNinePointComposedPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
-        tweakNinePointButton.setPreferredSize(new Dimension(145, 16));
-        tweakNinePointComposedPane.add(tweakNinePointHelpButton);
-        tweakNinePointComposedPane.add(tweakNinePointButton);
-
         return TableLayoutHelper.createGapTableLayoutPane(
                 new JComponent[][]{
                         {null, borderedImagePreviewPane},
                         {null, chooseImageButton},
-                        {tweakNinePointComposedPane, null},
+                        {null, createTweakNinePointComposedPane()},
                         {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
                         {null, this.borderImageOpacityPane}
                 },
                 rowSize, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
     }
 
+    private JPanel createTweakNinePointComposedPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        return TableLayoutHelper.createGapTableLayoutPane(
+                new Component[][]{
+                        {tweakNinePointHelpButton, tweakNinePointButton}
+                },
+                new double[]{p},
+                new double[]{p, f},
+                new int[][]{{1, 1}}, 0, 0);
+    }
     private void initImageFileChooserIfNotExist() {
         if (imageFileChooser == null) {
             imageFileChooser = new ImageFileChooser();

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -228,7 +228,7 @@ public class VersionCheckUtils {
         Set<Class> localServiceSet = FineObjectPool.getInstance().getServerPool().keySet();
 
         try {
-            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList();
+            JSONArray serviceArray = new FunctionalHttpRequest(info).getServiceList(info);
             for (int i = 0; i < serviceArray.size(); i++) {
                 try {
                     Class clazz = Class.forName((String) serviceArray.get(i));