From 33afe4119787238443d2a321883a73f8a65e2a15 Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 23 Dec 2024 10:10:07 +0800 Subject: [PATCH 1/3] opt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ac5c701..d5ce48c7 100644 --- a/pom.xml +++ b/pom.xml @@ -470,7 +470,7 @@ true UNIVERSAL - + rememberber@163.com jdk.crypto.ec,jdk.charsets From af501a8b07028e6d243d1f1ba77252b159d34e3c Mon Sep 17 00:00:00 2001 From: rememberber Date: Tue, 24 Dec 2024 15:31:00 +0800 Subject: [PATCH 2/3] grace --- .../moo/tool/ui/dialog/SupportMeDialog.form | 12 ++++++++++-- .../moo/tool/ui/dialog/SupportMeDialog.java | 7 +++++-- .../com/luoboduner/moo/tool/util/UpgradeUtil.java | 5 +++++ 3 files changed, 20 insertions(+), 4 deletions(-) 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 index d877c61b..1d130d34 100644 --- 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 @@ - + @@ -75,10 +75,18 @@ - + + + + + + + + + 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 index c4657a6d..eda05910 100644 --- 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 index cac91c51..5569c008 100644 --- 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); } } From 2ab89efb86e0edbf42ded745f9f64a81e33e1840 Mon Sep 17 00:00:00 2001 From: rememberber Date: Tue, 24 Dec 2024 15:57:51 +0800 Subject: [PATCH 3/3] grace --- grace.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grace.json b/grace.json index 7ddf9f10..871abbb4 100644 --- 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" } \ No newline at end of file