Merge pull request #132 from rememberber/develop

Develop
rememberber · Dec 24, 2024 · 51c766f · 51c766f
2 parents 8301509 + 2ab89ef
commit 51c766f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/grace.json b/grace.json
@@ -1,6 +1,6 @@
 {
-  "title": "京东年终巨惠，爆款低至5折",
-  "image": "http://so47396bf.hb-bkt.clouddn.com/grace/qrCode-2024-12-11-19-58-38.jpg",
-  "url": "https://u.jd.com/uOj06i5",
-  "tips": "买家电上京东\n年底添新家，太值啦！"
+  "title": "京东无门槛红包，速抢！",
+  "image": "http://so47396bf.hb-bkt.clouddn.com/grace/qrCode-2024-12-24-15-54-07.jpg",
+  "url": "https://u.jd.com/srHaeim",
+  "tips": "京东无门槛红包\n买年货前先领！\n每天可点3次\n"
 }
diff --git a/pom.xml b/pom.xml
@@ -470,7 +470,7 @@
                             <createTarball>true</createTarball>
                             <macConfig>
                                 <macStartup>UNIVERSAL</macStartup>
-<!--                                <developerId>rememberber@163.com</developerId>-->
+                                <developerId>rememberber@163.com</developerId>
                             </macConfig>
                             <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
                             <additionalResources>

diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/SupportMeDialog.form b/src/main/java/com/luoboduner/moo/tool/ui/dialog/SupportMeDialog.form
@@ -53,7 +53,7 @@
         <properties/>
         <border type="empty"/>
         <children>
-          <grid id="e3588" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="e3588" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints/>
             <properties/>
@@ -75,10 +75,18 @@
                   <text value="您的赞赏将会给我带来更多动力"/>
                 </properties>
               </component>
-              <component id="7c8ff" class="javax.swing.JLabel">
+              <component id="bcac6" class="javax.swing.JLabel">
                 <constraints>
                   <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
+                <properties>
+                  <text value="(´∀｀)♡"/>
+                </properties>
+              </component>
+              <component id="7c8ff" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
                 <properties>
                   <text value=""/>
                 </properties>

diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/SupportMeDialog.java b/src/main/java/com/luoboduner/moo/tool/ui/dialog/SupportMeDialog.java
@@ -106,7 +106,7 @@ private void onCancel() {
         contentPane.add(scrollPane1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
         scrollPane1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
         final JPanel panel3 = new JPanel();
-        panel3.setLayout(new GridLayoutManager(4, 3, new Insets(0, 0, 0, 0), -1, -1));
+        panel3.setLayout(new GridLayoutManager(5, 3, new Insets(0, 0, 0, 0), -1, -1));
         scrollPane1.setViewportView(panel3);
         final JLabel label1 = new JLabel();
         label1.setText("如果MooTool项目对您有所帮助或带来一些便利,欢迎给予支持");
@@ -115,8 +115,11 @@ private void onCancel() {
         label2.setText("您的赞赏将会给我带来更多动力");
         panel3.add(label2, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label3 = new JLabel();
-        label3.setText("");
+        label3.setText("(´∀｀)♡");
         panel3.add(label3, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label4 = new JLabel();
+        label4.setText("");
+        panel3.add(label4, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final Spacer spacer3 = new Spacer();
         panel3.add(spacer3, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
         final Spacer spacer4 = new Spacer();

diff --git a/src/main/java/com/luoboduner/moo/tool/util/UpgradeUtil.java b/src/main/java/com/luoboduner/moo/tool/util/UpgradeUtil.java
@@ -9,6 +9,7 @@
 import com.luoboduner.moo.tool.dao.TQuickNoteMapper;
 import com.luoboduner.moo.tool.domain.TQuickNote;
 import com.luoboduner.moo.tool.ui.UiConsts;
+import com.luoboduner.moo.tool.ui.dialog.SupportMeDialog;
 import com.luoboduner.moo.tool.ui.dialog.UpdateInfoDialog;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -145,6 +146,10 @@ public static void smoothUpgrade() {
             App.config.setBeforeVersion(currentVersion);
             App.config.save();
             log.info("平滑升级结束");
+
+            SupportMeDialog supportMeDialog = new SupportMeDialog();
+            supportMeDialog.pack();
+            supportMeDialog.setVisible(true);
         }
     }