Merge pull request #6484 in DESIGN/design from feature/10.0 to feature/x

* commit 'a0df3e86030758e70a926c41b0357a7c6ffe113f': REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全 REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全 REPORT-59614 远程设计下无推送日志
3 years ago · c0a06fd410
6 changed files with 6 additions and 5 deletions
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
@ -1,6 +1,6 @@
 com.fr.design.mainframe.check.CheckButton=305*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=630*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280
 com.fr.design.report.ReportColumnsPane=800*600
 com.fr.env.RemoteEnvPane.dialog=458*132
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
@ -1,6 +1,6 @@
 com.fr.design.mainframe.check.CheckButton=280*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=610*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=610*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=550*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=610*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=430*95
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
@ -1,5 +1,5 @@
 com.fr.design.mainframe.check.CheckButton=230*118
-com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=490*185
+com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=550*185
 com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=490*35
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=490*280
 com.fr.env.RemoteEnvPane.dialog=458*132
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
@ -1,7 +1,7 @@
 # \u9ED8\u8BA4\u4E3A\u7C7B\u7684\u5168\u9650\u5B9A\u540D\uFF08\u53EF\u81EA\u5B9A\u4E49key\uFF09= width * height
 com.fr.design.mainframe.check.CheckButton=250*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=385*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280
 com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
@ -1,6 +1,6 @@
 com.fr.design.mainframe.check.CheckButton=250*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185
-com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=385*31
+com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31
 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280
 com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
--- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
@ -125,6 +125,7 @@ public class DesignerSocketIO {

    private static IO.Options createOptions() {
        IO.Options options = new IO.Options();
+        options.path = WebSocketConfig.getInstance().getSocketContext();
        try {
            if (ComparatorUtils.equals(currentProtocol, HTTPS)) {
                options.sslContext = getSSLContext();