Skip to content

Commit 8ffb8e5

Browse files
rememberberrememberber
authored
Merge pull request #259 from rememberber/develop
Develop
2 parents 696b477 + 3ee3c95 commit 8ffb8e5

28 files changed

Lines changed: 315 additions & 134 deletions

‎download.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<details>
44
<summary>Windows</summary>
55

6+
[WePush-v4.4.0_210221-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.4.0_210221-x64-Setup.exe)
67
[WePush-v4.3.0_210123-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.3.0_210123-x64-Setup.exe)
78
[WePush-v4.2.5_210117-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.5_210117-x64-Setup.exe)
89
[WePush-v4.2.4_201222-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.4_201222-x64-Setup.exe)
@@ -80,6 +81,7 @@
8081
<details>
8182
<summary>Mac OS</summary>
8283

84+
[v_4.4.0_210221.app](http://download.zhoubochina.com/mac/4.4.0.zip)
8385
[v_4.3.0_210123.app](http://download.zhoubochina.com/mac/4.3.0.zip)
8486
[v_4.2.5_210117.app](http://download.zhoubochina.com/mac/4.2.5.zip)
8587
[v_4.2.4_201222.app](http://download.zhoubochina.com/mac/4.2.4.zip)
@@ -137,6 +139,7 @@
137139
<details>
138140
<summary>Portable(各系统通用绿色便携版32/64位)</summary>
139141

142+
[v4.4.0_210221](http://download.zhoubochina.com/linux/WePush-4.4.0.zip)
140143
[v4.3.0_210123](http://download.zhoubochina.com/linux/WePush-4.3.0.zip)
141144
[v4.2.5_210117](http://download.zhoubochina.com/linux/WePush-4.2.5.zip)
142145
[v4.2.4_201222](http://download.zhoubochina.com/linux/WePush-4.2.4.zip)

‎pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
4848
<bce-java-sdk.version>0.10.134</bce-java-sdk.version>
4949
<qiniu-java-sdk.version>7.3.0</qiniu-java-sdk.version>
50-
<flatlaf.version>1.0-rc1</flatlaf.version>
50+
<flatlaf.version>1.0</flatlaf.version>
5151
</properties>
5252

5353
<dependencies>
@@ -387,6 +387,10 @@
387387
<artifactId>slf4j-log4j12</artifactId>
388388
<groupId>org.slf4j</groupId>
389389
</exclusion>
390+
<exclusion>
391+
<artifactId>hbase-client</artifactId>
392+
<groupId>org.apache.hbase</groupId>
393+
</exclusion>
390394
</exclusions>
391395
</dependency>
392396

‎src/main/java/com/fangxuele/tool/push/App.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public static void main(String[] args) {
3939
mainFrame.init();
4040
JPanel loadingPanel = new LoadingForm().getLoadingPanel();
4141
mainFrame.add(loadingPanel);
42+
mainFrame.pack();
43+
mainFrame.setVisible(true);
4244
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
43-
if (screenSize.getWidth() <= 1366) {
45+
if (config.isDefaultMaxWindow() || screenSize.getWidth() <= 1366) {
4446
// 低分辨率下自动最大化窗口
4547
mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
4648
}
47-
mainFrame.pack();
48-
mainFrame.setVisible(true);
4949
UpgradeUtil.smoothUpgrade();
5050

5151
mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -56,7 +56,7 @@ public static void main(String[] args) {
5656
Init.initOthers();
5757
mainFrame.addListeners();
5858
mainFrame.remove(loadingPanel);
59-
Init.initFontSize();
59+
Init.fontSizeGuide();
6060
Init.initTray();
6161
}
6262
}

‎src/main/java/com/fangxuele/tool/push/bean/MailMsg.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import lombok.Setter;
55
import lombok.ToString;
66

7+
import java.io.File;
78
import java.io.Serializable;
9+
import java.util.List;
810

911
/**
1012
* <pre>
@@ -34,7 +36,7 @@ public class MailMsg implements Serializable {
3436
/**
3537
* 附件
3638
*/
37-
private String mailFiles;
39+
private List<File> mailFiles;
3840

3941
/**
4042
* 内容

‎src/main/java/com/fangxuele/tool/push/logic/PushControl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ static void savePushData() throws IOException {
282282
PushData.toSendList = new ArrayList<>(PushData.toSendConcurrentLinkedQueue);
283283
}
284284
MessageEditForm messageEditForm = MessageEditForm.getInstance();
285-
File pushHisDir = new File(SystemUtil.configHome + "data" + File.separator + "push_his");
285+
File pushHisDir = new File(SystemUtil.CONFIG_HOME + "data" + File.separator + "push_his");
286286
if (!pushHisDir.exists()) {
287287
boolean mkdirs = pushHisDir.mkdirs();
288288
}
@@ -295,7 +295,7 @@ static void savePushData() throws IOException {
295295
List<File> fileList = new ArrayList<>();
296296
// 保存已发送
297297
if (PushData.sendSuccessList.size() > 0) {
298-
File sendSuccessFile = new File(SystemUtil.configHome + "data" +
298+
File sendSuccessFile = new File(SystemUtil.CONFIG_HOME + "data" +
299299
File.separator + "push_his" + File.separator + MessageTypeEnum.getName(msgType) + "-" + msgName +
300300
"-发送成功-" + nowTime + ".csv");
301301
FileUtil.touch(sendSuccessFile);
@@ -334,7 +334,7 @@ static void savePushData() throws IOException {
334334
}
335335

336336
if (PushData.toSendList.size() > 0) {
337-
File unSendFile = new File(SystemUtil.configHome + "data" + File.separator +
337+
File unSendFile = new File(SystemUtil.CONFIG_HOME + "data" + File.separator +
338338
"push_his" + File.separator + MessageTypeEnum.getName(msgType) + "-" + msgName + "-未发送-" + nowTime +
339339
".csv");
340340
FileUtil.touch(unSendFile);
@@ -350,7 +350,7 @@ static void savePushData() throws IOException {
350350

351351
// 保存发送失败
352352
if (PushData.sendFailList.size() > 0) {
353-
File failSendFile = new File(SystemUtil.configHome + "data" + File.separator +
353+
File failSendFile = new File(SystemUtil.CONFIG_HOME + "data" + File.separator +
354354
"push_his" + File.separator + MessageTypeEnum.getName(msgType) + "-" + msgName + "-发送失败-" + nowTime + ".csv");
355355
FileUtil.touch(failSendFile);
356356
writer = new CSVWriter(new FileWriter(failSendFile));

‎src/main/java/com/fangxuele/tool/push/logic/msgmaker/MailMsgMaker.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import com.fangxuele.tool.push.util.TemplateUtil;
66
import org.apache.velocity.VelocityContext;
77

8+
import java.io.File;
9+
import java.util.List;
10+
811
/**
912
* <pre>
1013
* E-Mail加工器
@@ -17,7 +20,7 @@ public class MailMsgMaker extends BaseMsgMaker implements IMsgMaker {
1720

1821
public static String mailTitle;
1922
public static String mailCc;
20-
public static String mailFiles;
23+
public static List<File> mailFiles;
2124
public static String mailContent;
2225

2326
/**
@@ -27,7 +30,7 @@ public class MailMsgMaker extends BaseMsgMaker implements IMsgMaker {
2730
public void prepare() {
2831
mailTitle = MailMsgForm.getInstance().getMailTitleTextField().getText();
2932
mailCc = MailMsgForm.getInstance().getMailCcTextField().getText();
30-
mailFiles = MailMsgForm.getInstance().getMailFilesTextField().getText();
33+
mailFiles = MailMsgForm.getInstance().getAttachmentFiles();
3134
mailContent = MailMsgForm.getInstance().getMailContentPane().getText();
3235
}
3336

@@ -43,11 +46,10 @@ public MailMsg makeMsg(String[] msgData) {
4346
VelocityContext velocityContext = getVelocityContext(msgData);
4447
String title = TemplateUtil.evaluate(mailTitle, velocityContext);
4548
String cc = TemplateUtil.evaluate(mailCc, velocityContext);
46-
String files = TemplateUtil.evaluate(mailFiles, velocityContext);
4749
String content = TemplateUtil.evaluate(mailContent, velocityContext);
4850
mailMsg.setMailTitle(title);
4951
mailMsg.setMailCc(cc);
50-
mailMsg.setMailFiles(files);
52+
mailMsg.setMailFiles(mailFiles);
5153
mailMsg.setMailContent(content);
5254
return mailMsg;
5355
}

‎src/main/java/com/fangxuele/tool/push/logic/msgsender/MailMsgSender.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.fangxuele.tool.push.logic.msgsender;
22

3-
import cn.hutool.core.io.FileUtil;
43
import cn.hutool.extra.mail.MailAccount;
54
import cn.hutool.extra.mail.MailUtil;
65
import com.fangxuele.tool.push.App;
76
import com.fangxuele.tool.push.bean.MailMsg;
87
import com.fangxuele.tool.push.logic.PushControl;
98
import com.fangxuele.tool.push.logic.msgmaker.MailMsgMaker;
109
import lombok.extern.slf4j.Slf4j;
10+
import org.apache.commons.collections.CollectionUtils;
1111
import org.apache.commons.compress.utils.Lists;
1212
import org.apache.commons.lang3.StringUtils;
1313
import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -52,10 +52,10 @@ public SendResult send(String[] msgData) {
5252
ccList = Lists.newArrayList();
5353
ccList.add(mailMsg.getMailCc());
5454
}
55-
if (StringUtils.isEmpty(mailMsg.getMailFiles())) {
55+
if (CollectionUtils.isEmpty(mailMsg.getMailFiles())) {
5656
MailUtil.send(mailAccount, tos, ccList, null, mailMsg.getMailTitle(), mailMsg.getMailContent(), true);
5757
} else {
58-
MailUtil.send(mailAccount, tos, ccList, null, mailMsg.getMailTitle(), mailMsg.getMailContent(), true, FileUtil.file(mailMsg.getMailFiles()));
58+
MailUtil.send(mailAccount, tos, ccList, null, mailMsg.getMailTitle(), mailMsg.getMailContent(), true, mailMsg.getMailFiles().toArray(new File[0]));
5959
}
6060
sendResult.setSuccess(true);
6161
}

‎src/main/java/com/fangxuele/tool/push/ui/Init.java‎

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fangxuele.tool.push.ui.form.PushHisForm;
1919
import com.fangxuele.tool.push.ui.form.ScheduleForm;
2020
import com.fangxuele.tool.push.ui.form.SettingForm;
21-
import com.fangxuele.tool.push.ui.form.UserCaseForm;
2221
import com.fangxuele.tool.push.ui.listener.AboutListener;
2322
import com.fangxuele.tool.push.util.SystemUtil;
2423
import com.fangxuele.tool.push.util.UIUtil;
@@ -53,7 +52,7 @@ public class Init {
5352
/**
5453
* 字号初始化KEY
5554
*/
56-
private static final String FONT_SIZE_INIT_PROP = "fontSizeInit";
55+
public static final String FONT_SIZE_INIT_PROP = "fontSizeInit";
5756

5857
/**
5958
* 设置全局字体
@@ -74,6 +73,7 @@ public static void initGlobalFont() {
7473
fontSize = (int) (UIUtil.getScreenScale() * fontSize);
7574
}
7675
App.config.setFontSize(fontSize);
76+
App.config.save();
7777
}
7878

7979
Font font = new Font(App.config.getFont(), Font.PLAIN, App.config.getFontSize());
@@ -100,7 +100,7 @@ public static void initOthers() {
100100
* 初始化look and feel
101101
*/
102102
public static void initTheme() {
103-
if (SystemUtil.isMacM1()) {
103+
if (SystemUtil.isMacM1() || SystemUtil.isLinuxOs()) {
104104
try {
105105
UIManager.setLookAndFeel("com.formdev.flatlaf.FlatDarculaLaf");
106106
logger.warn("FlatDarculaLaf theme set.");
@@ -125,35 +125,69 @@ public static void initTheme() {
125125
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
126126
break;
127127
case "weblaf":
128-
case "Darcula(推荐)":
128+
case "Darcula":
129+
JFrame.setDefaultLookAndFeelDecorated(false);
130+
JDialog.setDefaultLookAndFeelDecorated(false);
129131
UIManager.setLookAndFeel("com.bulenkov.darcula.DarculaLaf");
130132
break;
131133
case "Flat Light":
134+
if (SystemUtil.isJBR()) {
135+
JFrame.setDefaultLookAndFeelDecorated(true);
136+
JDialog.setDefaultLookAndFeelDecorated(true);
137+
}
132138
FlatLightLaf.install();
133139
break;
134140
case "Flat IntelliJ":
141+
if (SystemUtil.isJBR()) {
142+
JFrame.setDefaultLookAndFeelDecorated(true);
143+
JDialog.setDefaultLookAndFeelDecorated(true);
144+
}
135145
UIManager.setLookAndFeel("com.formdev.flatlaf.FlatIntelliJLaf");
136146
break;
137147
case "Flat Dark":
148+
if (SystemUtil.isJBR()) {
149+
JFrame.setDefaultLookAndFeelDecorated(true);
150+
JDialog.setDefaultLookAndFeelDecorated(true);
151+
}
138152
UIManager.setLookAndFeel("com.formdev.flatlaf.FlatDarkLaf");
139153
break;
140-
case "Flat Darcula":
154+
case "Flat Darcula(推荐)":
155+
if (SystemUtil.isJBR()) {
156+
JFrame.setDefaultLookAndFeelDecorated(true);
157+
JDialog.setDefaultLookAndFeelDecorated(true);
158+
}
141159
UIManager.setLookAndFeel("com.formdev.flatlaf.FlatDarculaLaf");
142160
break;
143161
case "Dark purple":
162+
if (SystemUtil.isJBR()) {
163+
JFrame.setDefaultLookAndFeelDecorated(true);
164+
JDialog.setDefaultLookAndFeelDecorated(true);
165+
}
144166
IntelliJTheme.install(App.class.getResourceAsStream(
145167
"/theme/DarkPurple.theme.json"));
146168
break;
147169
case "IntelliJ Cyan":
170+
if (SystemUtil.isJBR()) {
171+
JFrame.setDefaultLookAndFeelDecorated(true);
172+
JDialog.setDefaultLookAndFeelDecorated(true);
173+
}
148174
IntelliJTheme.install(App.class.getResourceAsStream(
149175
"/theme/Cyan.theme.json"));
150176
break;
151177
case "IntelliJ Light":
178+
if (SystemUtil.isJBR()) {
179+
JFrame.setDefaultLookAndFeelDecorated(true);
180+
JDialog.setDefaultLookAndFeelDecorated(true);
181+
}
152182
IntelliJTheme.install(App.class.getResourceAsStream(
153183
"/theme/Light.theme.json"));
154184
break;
155185

156186
default:
187+
if (SystemUtil.isJBR()) {
188+
JFrame.setDefaultLookAndFeelDecorated(true);
189+
JDialog.setDefaultLookAndFeelDecorated(true);
190+
}
157191
UIManager.setLookAndFeel("com.formdev.flatlaf.FlatDarculaLaf");
158192
}
159193
} catch (Exception e) {
@@ -168,7 +202,7 @@ public static void initAllTab() {
168202
ThreadUtil.execute(AboutForm::init);
169203
MessageTypeForm.init();
170204
ThreadUtil.execute(HelpForm::init);
171-
ThreadUtil.execute(UserCaseForm::init);
205+
// ThreadUtil.execute(UserCaseForm::init);
172206
ThreadUtil.execute(() -> MessageEditForm.init(null));
173207
ThreadUtil.execute(MessageManageForm::init);
174208
ThreadUtil.execute(MemberForm::init);
@@ -191,7 +225,7 @@ public static void initAllTab() {
191225
/**
192226
* 引导用户调整字号
193227
*/
194-
public static void initFontSize() {
228+
public static void fontSizeGuide() {
195229
if (StringUtils.isEmpty(App.config.getProps(FONT_SIZE_INIT_PROP))) {
196230
FontSizeAdjustDialog fontSizeAdjustDialog = new FontSizeAdjustDialog();
197231
fontSizeAdjustDialog.pack();

‎src/main/java/com/fangxuele/tool/push/ui/UiConsts.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class UiConsts {
1616
* 软件名称,版本
1717
*/
1818
public final static String APP_NAME = "WePush";
19-
public final static String APP_VERSION = "v_4.3.0_210123";
19+
public final static String APP_VERSION = "v_4.4.0_210221";
2020

2121
/**
2222
* Logo-1024*1024
@@ -104,11 +104,6 @@ public class UiConsts {
104104
*/
105105
public final static String INTRODUCE_QRCODE_URL = "http://download.zhoubochina.com/qrcode/introduce-wepush-qrcode.png";
106106

107-
/**
108-
* 日志文件路径
109-
*/
110-
public final static String LOG_DIR = "./logs/";
111-
112107
/**
113108
* 多账号切换账号类型：公众号
114109
*/

‎src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.form‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,6 @@
161161
<border type="none"/>
162162
<children/>
163163
</grid>
164-
<grid id="eb537" binding="userCasePanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
165-
<margin top="0" left="0" bottom="10" right="0"/>
166-
<constraints>
167-
<tabbedpane title="他们都在用"/>
168-
</constraints>
169-
<properties>
170-
<minimumSize width="-1" height="-1"/>
171-
</properties>
172-
<border type="none"/>
173-
<children/>
174-
</grid>
175164
</children>
176165
</tabbedpane>
177166
</children>

0 commit comments

Comments
 (0)