From 3402556fa70c2b43ef0e8df01ea40ab8545ef669 Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 4 Sep 2023 17:56:58 +0800 Subject: [PATCH 01/23] v_5.0.2 --- assets/files/download_links.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/files/download_links.json b/assets/files/download_links.json index fdf01f90..9c564233 100644 --- a/assets/files/download_links.json +++ b/assets/files/download_links.json @@ -1,5 +1,5 @@ { - "windows": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.1/WePush-5.0.1-windows.exe", - "mac": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.1/WePush_5.0.1.dmg", - "linux": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.1/WePush_5.0.1.deb" + "windows": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.2/WePush-5.0.2-windows.exe", + "mac": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.2/WePush_5.0.2.dmg", + "linux": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.2/WePush_5.0.2.deb" } \ No newline at end of file -- Gitee From d95e50aee106e389e5c82a6138ca936ab8c8d380 Mon Sep 17 00:00:00 2001 From: rememberber Date: Fri, 8 Sep 2023 22:01:15 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E7=AA=97=E5=8F=A3=EF=BC=9A=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E5=8F=8C=E5=87=BB=E6=9C=80=E5=A4=A7=E5=8C=96/?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/push/ui/listener/FrameListener.java | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java index 4e233439..cbea3798 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java +++ b/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java @@ -5,9 +5,7 @@ import com.fangxuele.tool.push.ui.form.MainWindow; import javax.swing.*; import java.awt.*; -import java.awt.event.KeyEvent; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; +import java.awt.event.*; import static com.fangxuele.tool.push.App.mainFrame; @@ -67,6 +65,40 @@ public class FrameListener { } }); + // 鼠标双击最大化/还原 + App.mainFrame.addMouseListener(new MouseListener() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2 && !e.isConsumed()) { + if (App.mainFrame.getExtendedState() == JFrame.MAXIMIZED_BOTH) { + App.mainFrame.setExtendedState(JFrame.NORMAL); + } else { + App.mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH); + } + } + } + + @Override + public void mousePressed(MouseEvent e) { + + } + + @Override + public void mouseReleased(MouseEvent e) { + + } + + @Override + public void mouseEntered(MouseEvent e) { + + } + + @Override + public void mouseExited(MouseEvent e) { + + } + }); + MainWindow.getInstance().getMainPanel().registerKeyboardAction(e -> mainFrame.setExtendedState(Frame.ICONIFIED), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); } } -- Gitee From 9eec08dfcc6a05c0423142a700a307a8236bb01f Mon Sep 17 00:00:00 2001 From: rememberber Date: Tue, 12 Sep 2023 15:25:21 +0800 Subject: [PATCH 03/23] IntelliJ IDEA icon --- .idea/icon.png | Bin 0 -> 1499 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .idea/icon.png diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..30c3599095ae24ae0345dc8a239e5b50a9273005 GIT binary patch literal 1499 zcmV<11tj{3P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1yo5yK~z{rtyft{ zWJeUOUfh=^BJQohHAFEgs2K$%X0%1|LkIyi5EN022tr5#$@~~H5GDi!Kg0zm@h1lJ zkq?o{*ly%wj5~-6QIm=LN*i0$am~5a)o;4(r*>-&l<(E8t~%%5TXpNHV0NOWrpD#u zgwvw zgxLzR0xByjgAwXqF!^0!x)&hi1)}kRTr_M1l$V!BgIJHI6{i0M5V3^)@vy0>XK9UJf7i)Z<{Por&O}y;$oJO zk->t3g4o8!1~VFsV$^Y9Z4FvlK|#TfgM)(?WRnCWB_%z=;76j%vA4I!va_=pjujVR z7P7v+erF-z&>kEdyc!!D`|)m4-OV%_4U3A3Vwstl z_Y#8r@E{=};fINd2_qMfn3(tt$kX|#1z=-dUS51JjE|4AmX;Q_wY9~xTCF66#E}qq zC1%|YauiL0HJ_`Hdw0CI!|rMtw#M1n87DeDJ>??S*49{WZ!Z@T8X77I2?z*qRLEQD z>FM<ilL_|bzZ%0Q*trjLBtE;OvLTIzvlN#)W4HfeL6$FF|n+=GBypN5I zP}#&UY=wk{g;@!qXk8=Zm?H2s&bzlT$bu$AC<_S*q2tQ3va2Mc%#!nI669FlarHdXlRJd&CPL}86+$% zEsde@FkfF^-X9qmVV#|w=Ht6-Rf?|zc}B&^)zy_hsc!}?N@=l7i5b}3d>q#~?^9)U zadBZtIqwq`rKP2-PEJl%_4z93E~u@oW!~PVOdTH|GZYcNDQ9M8q!gGz0x3#)d3pR) z5a{<^U0rN>d0BD*k^M`JKlCMYqX61~L_Rw^%LWDp*woaNtjFYGa&odnOsS*v5b@H| z5+}Bd9`KR`OycE%sc#EfBsw~pzjt(W@C)fGh}i5gZ8icGEh1i7S&<_)V?vDz*N?nZ z34<(10BxGh%}rr3;VLnSwUd|w^ZV2b3k$!+$HyDdkv$1?rfK6$Pfv3Kf|)o!KcD&e z`8iBXz#IeC?NtvC5AVms#Qfyu=2jubtU%|OFh4)fiBnTkxyN@Uw!l;Ra^~j&8)goh ztP+#ed`N%@a&vQ~`d(C2#BhNycXxMAOt)iye?L!;1H`oMA&zqqYJyRkRZ>#&t%rxl z7oy8S0_yAQIib04_L$1+U4eBTLHuKSmkQD1;$j^(B%KHeRBnl!i0RDZ)0#CmH{X|h z2+?{Xy01UUki#>CTJP!U`5|)cNj4Hd)r>-oZ@3$8HhTc_Wvs1(6ZD@HhfU%N3k%=z z@$q?vav4CLJCfU*K;&o-TU%TI6ef<>MOgqB$|lbAuLykxi4f*{0mOfx=|KLsFiEfx zKtOFU;NodVI*Pb5s}YOG>Wb(R#$<`>0jIx z?Qr6|#>U2FVU~s62}b4f#`k~@H|KlsC;=@DDdK`axDRh%;&mMFefUUuj-z@=V>g4b z{{T&)oRm~jxH|v<002ovPDHLkV1l^8vEyh6@gL_)vpdNb+|mF5002ovPDHLkV1hoH Buo?gW literal 0 HcmV?d00001 -- Gitee From 90b9903ff1138efc49994da9dbdb0a093f456bbb Mon Sep 17 00:00:00 2001 From: rememberber Date: Wed, 20 Sep 2023 22:58:19 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E9=82=AE=E4=BB=B6=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B6=88=E6=81=AF=E7=BC=96=E8=BE=91tab=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E6=AD=A3=E6=96=87=E5=9B=9E=E6=98=BE=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../com/fangxuele/tool/push/ui/form/msg/MailMsgForm.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 61152e4a..d4a3349f 100644 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,9 @@ 1.1.0 0.10.134 7.3.0 - 3.2 - 3.2 - 3.2 + 3.2.1 + 3.2.1 + 3.2.1 2.6.0 3.1.847 diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MailMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MailMsgForm.java index aef8257d..8e954d9f 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MailMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MailMsgForm.java @@ -93,7 +93,7 @@ public class MailMsgForm implements IMsgForm { getInstance().getMailTitleTextField().setText(tMsgMail.getTitle()); getInstance().getMailCcTextField().setText(tMsgMail.getCc()); getInstance().getMailFilesTextArea().setText(tMsgMail.getFiles()); - getInstance().getMailContentPane().setText(tMsg.getContent()); + getInstance().getMailContentPane().setText(tMsgMail.getContent()); MessageEditForm messageEditForm = MessageEditForm.getInstance(); messageEditForm.getMsgNameField().setText(tMsg.getMsgName()); -- Gitee From 20f7b7cf2567d5c5ac22c69af86d08d0f691a5f3 Mon Sep 17 00:00:00 2001 From: rememberber Date: Wed, 20 Sep 2023 23:05:16 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?tab=E5=86=85=E5=AE=B9=E5=9B=9E=E6=98=BE=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangxuele/tool/push/ui/form/msg/WxCpMsgForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/WxCpMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/WxCpMsgForm.java index bc450b91..007725c2 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/WxCpMsgForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/WxCpMsgForm.java @@ -76,7 +76,7 @@ public class WxCpMsgForm implements IMsgForm { TMsgWxCp tMsgWxCp = JSONUtil.toBean(tMsg.getContent(), TMsgWxCp.class); String cpMsgType = tMsgWxCp.getCpMsgType(); getInstance().getMsgTypeComboBox().setSelectedItem(cpMsgType); - getInstance().getContentTextArea().setText(tMsg.getContent()); + getInstance().getContentTextArea().setText(tMsgWxCp.getContent()); getInstance().getTitleTextField().setText(tMsgWxCp.getTitle()); getInstance().getPicUrlTextField().setText(tMsgWxCp.getImgUrl()); getInstance().getDescTextField().setText(tMsgWxCp.getDescribe()); -- Gitee From 7bc5ba76928e5b5c06864aadcb99efcf3dd9cc7d Mon Sep 17 00:00:00 2001 From: rememberber Date: Thu, 21 Sep 2023 10:02:32 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d4a3349f..73890cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ UTF-8 UTF-8 - 1.8 - 1.8 + 17 + 17 - 1.8 + 17 1.2.3 4.4.0 4.4.0 diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java index dbb61434..225e4722 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java @@ -706,8 +706,6 @@ public class NewTaskDialog extends JDialog { TaskForm.initTaskListTable(); - JOptionPane.showMessageDialog(this, "保存成功！", "提示", - JOptionPane.INFORMATION_MESSAGE); dispose(); } catch (Exception e) { log.error("保存任务异常:{}", ExceptionUtils.getStackTrace(e)); -- Gitee From b7d823ce0df93c15a3a3e1aef18356127a321ab9 Mon Sep 17 00:00:00 2001 From: rememberber Date: Thu, 21 Sep 2023 10:06:11 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.form | 4 ++-- .../com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.java | 4 ++-- .../com/fangxuele/tool/push/ui/dialog/UpdateDialog.form | 6 +++--- .../com/fangxuele/tool/push/ui/dialog/UpdateDialog.java | 6 +++--- .../com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.form | 4 ++-- .../com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.form b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.form index 26b321b1..91929d03 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.form +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.form @@ -1,7 +1,7 @@
- + @@ -42,7 +42,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.java index f1c96a3f..73493335 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewPeopleDialog.java @@ -169,7 +169,7 @@ public class NewPeopleDialog extends JDialog { */ private void $$$setupUI$$$() { contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(3, 1, new Insets(10, 10, 10, 10), -1, -1)); + contentPane.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1)); final JPanel panel1 = new JPanel(); panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 10, 10), -1, -1)); contentPane.add(panel1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); @@ -182,7 +182,7 @@ public class NewPeopleDialog extends JDialog { saveButton.setText("保存"); panel2.add(saveButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel3 = new JPanel(); - panel3.setLayout(new GridLayoutManager(2, 2, new Insets(5, 5, 0, 5), -1, -1)); + panel3.setLayout(new GridLayoutManager(2, 2, new Insets(10, 10, 0, 10), -1, -1)); contentPane.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); final JLabel label1 = new JLabel(); label1.setText("人群名称"); diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.form b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.form index 3097384d..dbc144d1 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.form +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.form @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.java index 2b05d84f..97617962 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.java @@ -183,9 +183,9 @@ public class UpdateDialog extends JDialog { */ private void $$$setupUI$$$() { contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(10, 10, 10, 10), -1, -1)); + contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 10, 10), -1, -1)); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(10, 10, 10, 10), -1, -1)); contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); panel1.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); @@ -202,7 +202,7 @@ public class UpdateDialog extends JDialog { buttonDownloadFromWeb.setText("打开下载页面"); panel2.add(buttonDownloadFromWeb, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel3 = new JPanel(); - panel3.setLayout(new GridLayoutManager(4, 1, new Insets(0, 0, 0, 0), -1, -1)); + panel3.setLayout(new GridLayoutManager(4, 1, new Insets(10, 10, 10, 10), -1, -1)); contentPane.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); progressBarDownload = new JProgressBar(); panel3.add(progressBarDownload, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.form b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.form index 5e3eae0c..276b94af 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.form +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.form @@ -1,7 +1,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java index b36bcbce..908b3c26 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java @@ -133,7 +133,7 @@ public class UpdateInfoDialog extends JDialog { */ private void $$$setupUI$$$() { contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 10, 0), -1, -1)); + contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1)); final JPanel panel1 = new JPanel(); panel1.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 10, 10), -1, -1)); contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); @@ -151,7 +151,7 @@ public class UpdateInfoDialog extends JDialog { final Spacer spacer2 = new Spacer(); panel1.add(spacer2, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); final JPanel panel3 = new JPanel(); - panel3.setLayout(new GridLayoutManager(1, 1, new Insets(20, 0, 0, 0), -1, -1)); + panel3.setLayout(new GridLayoutManager(1, 1, new Insets(20, 10, 10, 10), -1, -1)); contentPane.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); final JScrollPane scrollPane1 = new JScrollPane(); panel3.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)); -- Gitee From 1e58b212ef6631e6b2bee9851765044f82662f89 Mon Sep 17 00:00:00 2001 From: rememberber Date: Fri, 22 Sep 2023 22:27:16 +0800 Subject: [PATCH 08/23] opt --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 73890cc4..58200a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ UTF-8 UTF-8 - 17 - 17 + 21 + 21 - 17 + 21 1.2.3 4.4.0 4.4.0 @@ -440,7 +440,7 @@ io.github.fvarrui javapackager - 1.7.2 + 1.7.4 true com.fangxuele.tool.push.App -- Gitee From 6353b9c8954c48b1eaf31a5688a109262ab13d27 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 23 Sep 2023 08:43:02 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E5=8D=87=E7=BA=A7Java21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58200a4b..2c4bf8c6 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.0.6 1.2.7 2.3 - 1.18.20 + 1.18.30 3.5.13 3.42.0.1 4.13.1 -- Gitee From 6156c7e9565563b25f24522dce1a60fc122af9ed Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 23 Sep 2023 11:47:32 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E5=8D=87=E7=BA=A7Java21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 88 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 2c4bf8c6..c11fea06 100644 --- a/pom.xml +++ b/pom.xml @@ -447,36 +447,36 @@ true - - bundling-for-windows - package - - package - - - windows - true - jdk.crypto.ec,jdk.charsets - - - - - true - true - true - - - installForAllUsers - true - false - false - - compiler:Default.isl - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -490,20 +490,20 @@ - - - - - - - - - - - - - - + + bundling-for-mac + package + + package + + + mac + true + jdk.crypto.ec,jdk.charsets + false + + + -- Gitee From 621443668495d41532959cade44803811cd1c800 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 23 Sep 2023 12:57:26 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E6=94=B9=E7=94=A8=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/push/logic/TaskRunThread.java | 28 +++++++++---------- .../push/logic/msgthread/BaseMsgThread.java | 6 ++-- .../push/logic/msgthread/MsgSendThread.java | 3 ++ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/logic/TaskRunThread.java b/src/main/java/com/fangxuele/tool/push/logic/TaskRunThread.java index eaab3701..215f504c 100644 --- a/src/main/java/com/fangxuele/tool/push/logic/TaskRunThread.java +++ b/src/main/java/com/fangxuele/tool/push/logic/TaskRunThread.java @@ -37,7 +37,7 @@ import java.io.IOException; import java.util.List; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.LongAdder; import java.util.stream.Collectors; @@ -69,6 +69,11 @@ public class TaskRunThread extends Thread { */ public LongAdder failRecords = new LongAdder(); + /** + * 处理完毕的线程数 + */ + public AtomicInteger finishedThreadCount = new AtomicInteger(0); + /** * 停止标志 */ @@ -177,11 +182,11 @@ public class TaskRunThread extends Thread { ConsoleUtil.pushLog(logWriter, "推送开始……"); // 消息数据分片以及线程纷发 tMsg = msgMapper.selectByPrimaryKey(tTask.getMessageId()); - ThreadPoolExecutor threadPoolExecutor = shardingAndMsgThread(tMsg); + shardingAndMsgThread(tMsg); taskRunThreadMap.put(taskHis.getId(), this); // 时间监控 - timeMonitor(threadPoolExecutor); + timeMonitor(); resetLocalData(); @@ -289,9 +294,7 @@ public class TaskRunThread extends Thread { /** * 消息数据分片以及线程纷发 */ - private ThreadPoolExecutor shardingAndMsgThread(TMsg tMsg) { - int maxThreadPoolSize = tTask.getThreadCnt(); - ThreadPoolExecutor threadPoolExecutor = ThreadUtil.newExecutor(maxThreadPoolSize, maxThreadPoolSize); + private void shardingAndMsgThread(TMsg tMsg) { MsgSendThread msgSendThread; // 每个线程分配 int perThread = (int) (totalRecords / threadCount) + 1; @@ -309,24 +312,18 @@ public class TaskRunThread extends Thread { IMsgSender msgSender = MsgSenderFactory.getMsgSender(tMsg.getId(), dryRun); msgSendThread = new MsgSendThread(startIndex, endIndex, msgSender, this); - msgSendThread.setName("T-" + i); - - threadPoolExecutor.execute(msgSendThread); + Thread.ofVirtual().name("T-" + i).start(msgSendThread); } - threadPoolExecutor.shutdown(); ConsoleUtil.pushLog(logWriter, "所有线程宝宝启动完毕……"); - return threadPoolExecutor; } /** * 时间监控 - * - * @param threadPoolExecutor */ - private void timeMonitor(ThreadPoolExecutor threadPoolExecutor) { + private void timeMonitor() { // 计时 while (true) { - if (threadPoolExecutor.isTerminated()) { + if (finishedThreadCount.get() == threadCount) { taskHis.setEndTime(SqliteUtil.nowDateForSqlite()); int successCount = sendSuccessList.size(); @@ -440,6 +437,7 @@ public class TaskRunThread extends Thread { running = false; successRecords.reset(); failRecords.reset(); + finishedThreadCount.set(0); threadCount = 0; toSendList = Collections.synchronizedList(new LinkedList<>()); sendSuccessList = Collections.synchronizedList(new LinkedList<>()); diff --git a/src/main/java/com/fangxuele/tool/push/logic/msgthread/BaseMsgThread.java b/src/main/java/com/fangxuele/tool/push/logic/msgthread/BaseMsgThread.java index f978c4a1..e3814145 100644 --- a/src/main/java/com/fangxuele/tool/push/logic/msgthread/BaseMsgThread.java +++ b/src/main/java/com/fangxuele/tool/push/logic/msgthread/BaseMsgThread.java @@ -15,7 +15,7 @@ import java.util.List; * @author RememBerBer * @since 2017/3/29. */ -public class BaseMsgThread extends Thread { +public class BaseMsgThread implements Runnable { public static final Log logger = LogFactory.get(); @@ -53,7 +53,7 @@ public class BaseMsgThread extends Thread { * 初始化当前线程 */ public void initCurrentThread() { - ConsoleUtil.pushLog(taskRunThread.getLogWriter(), "线程" + this.getName() + "负责处理第:" + startIndex + "-" + endIndex + "条数据"); + ConsoleUtil.pushLog(taskRunThread.getLogWriter(), "线程" + Thread.currentThread().getName() + "负责处理第:" + startIndex + "-" + endIndex + "条数据"); list = taskRunThread.getToSendList().subList(startIndex, endIndex); @@ -63,7 +63,7 @@ public class BaseMsgThread extends Thread { * 当前线程结束 */ public void currentThreadFinish() { - ConsoleUtil.pushLog(taskRunThread.getLogWriter(), this.getName() + "已处理完第" + startIndex + "-" + endIndex + "条的数据"); + ConsoleUtil.pushLog(taskRunThread.getLogWriter(), Thread.currentThread().getName() + "已处理完第" + startIndex + "-" + endIndex + "条的数据"); } } diff --git a/src/main/java/com/fangxuele/tool/push/logic/msgthread/MsgSendThread.java b/src/main/java/com/fangxuele/tool/push/logic/msgthread/MsgSendThread.java index a3a274c8..01cd999f 100644 --- a/src/main/java/com/fangxuele/tool/push/logic/msgthread/MsgSendThread.java +++ b/src/main/java/com/fangxuele/tool/push/logic/msgthread/MsgSendThread.java @@ -68,6 +68,9 @@ public class MsgSendThread extends BaseMsgThread { currentThreadFinish(); } catch (Exception e) { logger.error(ExceptionUtils.getStackTrace(e)); + } finally { + // 线程结束，处理完毕的线程数+1 + taskRunThread.finishedThreadCount.incrementAndGet(); } } -- Gitee From 31c1e3d4e8886109d0a9c0b9dcd4b00dd00692f8 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 23 Sep 2023 13:02:29 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=BB=98=E8=AE=A4=E5=A4=A7=E5=B0=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/push/ui/dialog/InfinityTaskHisDetailDialog.java | 2 +- .../com/fangxuele/tool/push/ui/dialog/TaskHisDetailDialog.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/InfinityTaskHisDetailDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/InfinityTaskHisDetailDialog.java index b622d512..621bba89 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/InfinityTaskHisDetailDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/InfinityTaskHisDetailDialog.java @@ -82,7 +82,7 @@ public class InfinityTaskHisDetailDialog extends JDialog { public InfinityTaskHisDetailDialog() { super(App.mainFrame, "执行详情"); - ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.5, 0.64); + ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.68, 0.64); setContentPane(contentPane); setModal(true); diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/TaskHisDetailDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/TaskHisDetailDialog.java index bc99c3bf..e3094d8a 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/TaskHisDetailDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/TaskHisDetailDialog.java @@ -74,7 +74,7 @@ public class TaskHisDetailDialog extends JDialog { public TaskHisDetailDialog() { super(App.mainFrame, "执行详情"); - ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.5, 0.64); + ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.68, 0.64); setContentPane(contentPane); setModal(true); -- Gitee From 153773e91b3ae24c573de60cb85027b7b592d675 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 23 Sep 2023 19:39:04 +0800 Subject: [PATCH 13/23] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangxuele/tool/push/domain/TTask.java | 20 +++++++++ .../tool/push/ui/dialog/NewTaskDialog.form | 41 ++++++++++++++++++- .../tool/push/ui/dialog/NewTaskDialog.java | 39 +++++++++++++----- src/main/resources/mapper/TTaskMapper.xml | 30 +++++++++++++- src/main/resources/upgrade/4.sql | 3 ++ 5 files changed, 120 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/upgrade/4.sql diff --git a/src/main/java/com/fangxuele/tool/push/domain/TTask.java b/src/main/java/com/fangxuele/tool/push/domain/TTask.java index 387ca83b..6aa58894 100644 --- a/src/main/java/com/fangxuele/tool/push/domain/TTask.java +++ b/src/main/java/com/fangxuele/tool/push/domain/TTask.java @@ -37,6 +37,10 @@ public class TTask implements Serializable { private Integer saveResult; + private Integer intervalPush; + + private Integer intervalTime; + private String remark; private String createTime; @@ -181,6 +185,22 @@ public class TTask implements Serializable { this.saveResult = saveResult; } + public Integer getIntervalPush() { + return intervalPush; + } + + public void setIntervalPush(Integer intervalPush) { + this.intervalPush = intervalPush; + } + + public Integer getIntervalTime() { + return intervalTime; + } + + public void setIntervalTime(Integer intervalTime) { + this.intervalTime = intervalTime; + } + public String getRemark() { return remark; } diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.form b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.form index e84b36c9..134e8866 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.form +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.form @@ -151,7 +151,7 @@ - + @@ -440,6 +440,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java index 225e4722..2955d193 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/NewTaskDialog.java @@ -81,6 +81,8 @@ public class NewTaskDialog extends JDialog { private JCheckBox saveResponseBodyCheckBox; private JPanel otherPanel; private JTextField maxThreadCntTextField; + private JCheckBox intervalPushCheckBox; + private JTextField intervalTextField; private static TTaskMapper taskMapper = MybatisUtil.getSqlSession().getMapper(TTaskMapper.class); private static TTaskExtMapper taskExtMapper = MybatisUtil.getSqlSession().getMapper(TTaskExtMapper.class); @@ -331,6 +333,8 @@ public class NewTaskDialog extends JDialog { cronTextField.setText(beforeTTask.getPeriodTime()); } } + intervalPushCheckBox.setSelected(beforeTTask.getIntervalPush() != null && beforeTTask.getIntervalPush() == 1); + intervalTextField.setText(String.valueOf(beforeTTask.getIntervalTime())); reimportCheckBox.setSelected(beforeTTask.getReimportPeople() != null && beforeTTask.getReimportPeople() == 1); sendPushResultCheckBox.setSelected(beforeTTask.getResultAlert() != null && beforeTTask.getResultAlert() == 1); mailResultToTextField.setText(beforeTTask.getAlertEmails()); @@ -618,6 +622,8 @@ public class NewTaskDialog extends JDialog { task.setResultAlert(sendPushResultCheckBox.isSelected() ? 1 : 0); task.setAlertEmails(mailResultToTextField.getText().trim()); task.setSaveResult(saveResponseBodyCheckBox.isSelected() ? 1 : 0); + task.setIntervalPush(intervalPushCheckBox.isSelected() ? 1 : 0); + task.setIntervalTime(Integer.parseInt(intervalTextField.getText().trim())); task.setModifiedTime(nowDateForSqlite); // 如果是定时任务 @@ -909,7 +915,7 @@ public class NewTaskDialog extends JDialog { peopleComboBox = new JComboBox(); panel4.add(peopleComboBox, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel5 = new JPanel(); - panel5.setLayout(new GridLayoutManager(3, 1, new Insets(10, 10, 10, 10), -1, -1)); + panel5.setLayout(new GridLayoutManager(4, 1, new Insets(10, 10, 10, 10), -1, -1)); panel3.add(panel5, 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_CAN_GROW, null, null, null, 0, false)); panel5.setBorder(BorderFactory.createTitledBorder(null, "运行规则", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, panel5.getFont()), null)); schedulePanel = new JPanel(); @@ -1017,16 +1023,29 @@ public class NewTaskDialog extends JDialog { maxThreadCntTextField = new JTextField(); panel7.add(maxThreadCntTextField, new GridConstraints(0, 6, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(60, -1), null, 0, false)); final JPanel panel8 = new JPanel(); - panel8.setLayout(new GridLayoutManager(2, 2, new Insets(10, 10, 10, 10), -1, -1)); - panel3.add(panel8, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); - panel8.setBorder(BorderFactory.createTitledBorder(null, "告警和通知", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, panel8.getFont()), null)); + panel8.setLayout(new GridLayoutManager(1, 4, new Insets(0, 0, 0, 0), -1, -1)); + panel5.add(panel8, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + intervalPushCheckBox = new JCheckBox(); + intervalPushCheckBox.setText("间隔发送"); + panel8.add(intervalPushCheckBox, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final Spacer spacer5 = new Spacer(); + panel8.add(spacer5, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); + intervalTextField = new JTextField(); + panel8.add(intervalTextField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(60, -1), null, 0, false)); + final JLabel label15 = new JLabel(); + label15.setText("秒"); + panel8.add(label15, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JPanel panel9 = new JPanel(); + panel9.setLayout(new GridLayoutManager(2, 2, new Insets(10, 10, 10, 10), -1, -1)); + panel3.add(panel9, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + panel9.setBorder(BorderFactory.createTitledBorder(null, "告警和通知", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, panel9.getFont()), null)); sendPushResultCheckBox = new JCheckBox(); sendPushResultCheckBox.setText("将推送结果发送邮件给（多个以分号分隔）："); - panel8.add(sendPushResultCheckBox, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - final Spacer spacer5 = new Spacer(); - panel8.add(spacer5, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); + panel9.add(sendPushResultCheckBox, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final Spacer spacer6 = new Spacer(); + panel9.add(spacer6, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); mailResultToTextField = new JTextField(); - panel8.add(mailResultToTextField, new GridConstraints(1, 0, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel9.add(mailResultToTextField, new GridConstraints(1, 0, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); otherPanel = new JPanel(); otherPanel.setLayout(new GridLayoutManager(1, 2, new Insets(10, 10, 10, 10), -1, -1)); panel3.add(otherPanel, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); @@ -1034,8 +1053,8 @@ public class NewTaskDialog extends JDialog { saveResponseBodyCheckBox = new JCheckBox(); saveResponseBodyCheckBox.setText("保存请求返回的Body"); otherPanel.add(saveResponseBodyCheckBox, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - final Spacer spacer6 = new Spacer(); - otherPanel.add(spacer6, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); + final Spacer spacer7 = new Spacer(); + otherPanel.add(spacer7, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); } /** diff --git a/src/main/resources/mapper/TTaskMapper.xml b/src/main/resources/mapper/TTaskMapper.xml index bf8706e3..f2bdacfe 100644 --- a/src/main/resources/mapper/TTaskMapper.xml +++ b/src/main/resources/mapper/TTaskMapper.xml @@ -19,6 +19,8 @@ + + @@ -26,6 +28,7 @@ id, title, msg_type, account_id, message_id, people_id, task_mode, task_period, period_type, period_time, cron, thread_cnt, max_thread_cnt, reimport_people, result_alert, alert_emails, save_result, + interval_push, interval_time, remark, create_time, modified_time