Merge pull request #254 from rememberber/develop

release:v_4.2.3_201210
rememberber · Dec 10, 2020 · 3e0382d · 3e0382d
2 parents c726cdd + 0116125
commit 3e0382d
Show file tree

Hide file tree

Showing 26 changed files with 63 additions and 32 deletions.
diff --git a/download.md b/download.md
@@ -3,6 +3,7 @@
 <details>
 <summary>Windows</summary>
 
+[WePush-v4.2.3_201210-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.3_201210-x64-Setup.exe)  
 [WePush-v4.2.2_201208-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.2_201208-x64-Setup.exe)  
 [WePush-v4.2.1_200308-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.1_200308-x64-Setup.exe)  
 [WePush-v4.2.0_191129-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.0_191129-x64-Setup.exe)  
@@ -76,6 +77,7 @@
 <details>
 <summary>Mac OS</summary>
 
+[v_4.2.3_201210.app](http://download.zhoubochina.com/mac/4.2.3.zip)  
 [v_4.2.2_201208.app](http://download.zhoubochina.com/mac/4.2.2.zip)  
 [v_4.2.1_200308.app](http://download.zhoubochina.com/mac/4.2.1.zip)  
 [v_4.1.1_191027.app](http://download.zhoubochina.com/mac/4.1.1.zip)  
@@ -129,6 +131,7 @@
 <details>
 <summary>Portable(各系统通用绿色便携版32/64位)</summary>
 
+[v4.2.3_201210](http://download.zhoubochina.com/linux/WePush-4.2.3.zip)  
 [v4.2.2_201208](http://download.zhoubochina.com/linux/WePush-4.2.2.zip)  
 [v4.2.1_200308](http://download.zhoubochina.com/linux/WePush-4.2.1.zip)  
 [v4.2.0_191129](http://download.zhoubochina.com/linux/WePush-4.2.0.zip)  

diff --git a/src/main/java/com/fangxuele/tool/push/ui/Init.java b/src/main/java/com/fangxuele/tool/push/ui/Init.java
@@ -32,6 +32,8 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * <pre>
@@ -134,7 +136,8 @@ public static void initAllTab() {
 
         // 检查新版版
         if (App.config.isAutoCheckUpdate()) {
-            ThreadUtil.execute(() -> UpgradeUtil.checkUpdate(true));
+            ScheduledThreadPoolExecutor threadPoolExecutor = new ScheduledThreadPoolExecutor(1);
+            threadPoolExecutor.scheduleAtFixedRate(() -> UpgradeUtil.checkUpdate(true), 0, 24, TimeUnit.HOURS);
         }
         // 更新二维码
         ThreadUtil.execute(AboutListener::initQrCode);

diff --git a/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java b/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java
@@ -16,7 +16,7 @@ public class UiConsts {
      * 软件名称,版本
      */
     public final static String APP_NAME = "WePush";
-    public final static String APP_VERSION = "v_4.2.2_201208";
+    public final static String APP_VERSION = "v_4.2.3_201210";
 
     /**
      * Logo-1024*1024

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java
@@ -117,6 +117,7 @@ public void windowClosing(WindowEvent e) {
             renderTable();
             SettingForm.initSwitchMultiAccount();
             MessageManageForm.initSwitchMultiAccount();
+            MessageManageForm.init();
             JOptionPane.showMessageDialog(this, "保存成功！", "成功",
                     JOptionPane.INFORMATION_MESSAGE);
         });

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/MessageManageForm.java
@@ -90,8 +90,6 @@ public static MessageManageForm getInstance() {
     public static void init() {
         messageManageForm = getInstance();
 
-        MessageEditForm.getInstance().getMsgNameField().setText("");
-
         initSwitchMultiAccount();
 
         initMessageList();
@@ -220,19 +218,21 @@ public static void initSwitchMultiAccount() {
                 for (TWxAccount tWxAccount : wxAccountList) {
                     messageManageForm.getAccountSwitchComboBox().addItem(tWxAccount.getAccountName());
                 }
-                accountSwitchComboBoxListenIgnore = false;
                 messageManageForm.getAccountSwitchComboBox().setSelectedItem(App.config.getWechatMpName());
+                accountSwitchComboBoxListenIgnore = false;
                 break;
 
             case MessageTypeEnum.MA_SUBSCRIBE_CODE:
             case MessageTypeEnum.MA_TEMPLATE_CODE:
             case MessageTypeEnum.WX_UNIFORM_MESSAGE_CODE:
                 // 多账号切换-小程序
                 wxAccountList = wxAccountMapper.selectByAccountType(UiConsts.WX_ACCOUNT_TYPE_MA);
+                accountSwitchComboBoxListenIgnore = true;
                 for (TWxAccount tWxAccount : wxAccountList) {
                     messageManageForm.getAccountSwitchComboBox().addItem(tWxAccount.getAccountName());
                 }
                 messageManageForm.getAccountSwitchComboBox().setSelectedItem(App.config.getMiniAppName());
+                accountSwitchComboBoxListenIgnore = false;
                 break;
             default:
                 break;

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/MessageTypeForm.java
@@ -132,6 +132,7 @@ public static void init() {
         MessageEditForm.switchMsgType(msgType);
         MessageEditForm.getInstance().getMsgTypeName().setText(MessageTypeEnum.getName(msgType));
         MessageManageForm.init();
+        MessageEditForm.getInstance().getMsgNameField().setText("");
         MemberForm.init();
         PushHisForm.init();
         ScheduleForm.init();

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.form
@@ -24,7 +24,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="etched" title="短信模板变量（可使用&quot;$ENTER$&quot;作为换行符）">
+            <border type="etched" title="短信模板变量（可使用&quot;${ENTER}&quot;作为换行符）">
               <font/>
             </border>
             <children>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/AliYunMsgForm.java
@@ -262,7 +262,7 @@ public static void clearAllField() {
         templateMsgDataPanel = new JPanel();
         templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1));
         templateMsgPanel.add(templateMsgDataPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量（可使用\"$ENTER$\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, templateMsgDataPanel.getFont()), null));
+        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量（可使用\"${ENTER}\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, templateMsgDataPanel.getFont()), null));
         templateDataNameTextField = new JTextField();
         templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
         templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.form
@@ -24,7 +24,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="etched" title="短信模板变量（可使用&quot;$ENTER$&quot;作为换行符）">
+            <border type="etched" title="短信模板变量（可使用&quot;${ENTER}&quot;作为换行符）">
               <font style="1"/>
             </border>
             <children>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/BdYunMsgForm.java
@@ -265,7 +265,7 @@ public static void clearAllField() {
         templateMsgDataPanel = new JPanel();
         templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1));
         templateMsgPanel.add(templateMsgDataPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量（可使用\"$ENTER$\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
+        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量（可使用\"${ENTER}\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
         templateDataNameTextField = new JTextField();
         templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
         templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.form
@@ -24,7 +24,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="etched" title="短信模板变量（可使用&quot;$ENTER$&quot;作为换行符）">
+            <border type="etched" title="短信模板变量（可使用&quot;${ENTER}&quot;作为换行符）">
               <font style="1"/>
             </border>
             <children>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/HwYunMsgForm.java
@@ -266,7 +266,7 @@ public static void clearAllField() {
         templateMsgDataPanel = new JPanel();
         templateMsgDataPanel.setLayout(new GridLayoutManager(3, 3, new Insets(10, 0, 0, 0), -1, -1));
         templateMsgPanel.add(templateMsgDataPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量（可使用\"$ENTER$\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
+        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "短信模板变量（可使用\"${ENTER}\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
         templateDataNameTextField = new JTextField();
         templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
         templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.form
@@ -24,7 +24,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="etched" title="模板变量（可使用&quot;$ENTER$&quot;作为换行符）">
+            <border type="etched" title="模板变量（可使用&quot;${ENTER}&quot;作为换行符）">
               <font style="1"/>
             </border>
             <children>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MaSubscribeMsgForm.java
@@ -287,7 +287,7 @@ public static void clearAllField() {
         templateMsgDataPanel = new JPanel();
         templateMsgDataPanel.setLayout(new GridLayoutManager(3, 4, new Insets(10, 0, 0, 0), -1, -1));
         templateMsgPanel.add(templateMsgDataPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量（可使用\"$ENTER$\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
+        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量（可使用\"${ENTER}\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
         templateDataNameTextField = new JTextField();
         templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
         templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.form
@@ -24,7 +24,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="etched" title="模板变量（可使用&quot;$ENTER$&quot;作为换行符）">
+            <border type="etched" title="模板变量（可使用&quot;${ENTER}&quot;作为换行符）">
               <font style="1"/>
             </border>
             <children>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpTemplateMsgForm.java
@@ -140,7 +140,7 @@ public MpTemplateMsgForm() {
         });
         templateListComboBox.addItemListener(e -> {
             if (needListenTemplateListComboBox && e.getStateChange() == ItemEvent.SELECTED) {
-                clearAllField();
+                clearAllFieldExceptTemplateListAndContent();
                 fillWxTemplateContentToField();
             }
         });
@@ -162,12 +162,15 @@ public void init(String msgName) {
         }
 
         clearAllField();
-        initTemplateList();
+
         Integer msgId = 0;
         List<TMsgMpTemplate> tMsgMpTemplateList = msgMpTemplateMapper.selectByMsgTypeAndMsgName(MessageTypeEnum.MP_TEMPLATE_CODE, msgName);
         if (tMsgMpTemplateList.size() > 0) {
             TMsgMpTemplate tMsgMpTemplate = tMsgMpTemplateList.get(0);
             msgId = tMsgMpTemplate.getId();
+            selectedMsgTemplateId = tMsgMpTemplate.getTemplateId();
+            initTemplateList();
+
             mpTemplateMsgForm.getMsgTemplateIdTextField().setText(tMsgMpTemplate.getTemplateId());
             mpTemplateMsgForm.getMsgTemplateUrlTextField().setText(tMsgMpTemplate.getUrl());
             mpTemplateMsgForm.getMsgTemplateMiniAppidTextField().setText(tMsgMpTemplate.getMaAppid());
@@ -176,8 +179,8 @@ public void init(String msgName) {
             MessageEditForm messageEditForm = MessageEditForm.getInstance();
             messageEditForm.getMsgNameField().setText(tMsgMpTemplate.getMsgName());
             messageEditForm.getPreviewUserField().setText(tMsgMpTemplate.getPreviewUser());
-
-            selectedMsgTemplateId = tMsgMpTemplate.getTemplateId();
+        } else {
+            initTemplateList();
         }
 
         initTemplateDataTable();
@@ -417,15 +420,22 @@ public static void initTemplateDataTable() {
      * 清空所有界面字段
      */
     public static void clearAllField() {
+        clearAllFieldExceptTemplateListAndContent();
+        getInstance().getTemplateListComboBox().removeAllItems();
+        getInstance().getTemplateContentTextArea().setText("");
+    }
+
+    /**
+     * 清空所有界面字段
+     */
+    public static void clearAllFieldExceptTemplateListAndContent() {
         getInstance().getMsgTemplateIdTextField().setText("");
         getInstance().getMsgTemplateUrlTextField().setText("");
         getInstance().getMsgTemplateMiniAppidTextField().setText("");
         getInstance().getMsgTemplateMiniPagePathTextField().setText("");
         getInstance().getTemplateDataNameTextField().setText("");
         getInstance().getTemplateDataValueTextField().setText("");
         getInstance().getTemplateDataColorTextField().setText("");
-        getInstance().getTemplateListComboBox().removeAllItems();
-        getInstance().getTemplateContentTextArea().setText("");
         selectedMsgTemplateId = null;
         initTemplateDataTable();
     }
@@ -454,7 +464,7 @@ public static void clearAllField() {
         templateMsgDataPanel = new JPanel();
         templateMsgDataPanel.setLayout(new GridLayoutManager(3, 4, new Insets(10, 0, 0, 0), -1, -1));
         templateMsgPanel.add(templateMsgDataPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量（可使用\"$ENTER$\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
+        templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量（可使用\"${ENTER}\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
         templateDataNameTextField = new JTextField();
         templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
         templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/QiNiuYunMsgForm.form
@@ -24,7 +24,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="etched" title="短信模板变量（可使用&quot;$ENTER$&quot;作为换行符）">
+            <border type="etched" title="短信模板变量（可使用&quot;${ENTER}&quot;作为换行符）">
               <font style="1"/>
             </border>
             <children>