Skip to content

Commit ee7e57c

Browse files
rememberberrememberber
authored
Merge pull request #288 from rememberber/develop
Develop
2 parents 2e87693 + 6e3b4f2 commit ee7e57c

32 files changed

Lines changed: 1238 additions & 124 deletions

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ language: java
22

33
before_install:
44
- mvn install:install-file -Dfile=./lib/antlr-2.7.4.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=antlr -Dpackaging=jar -Dversion=2.7.4 -DgeneratePom=true -DcreateChecksum=true
5-
- mvn install:install-file -Dfile=./lib/beautyeye_lnf.jar -DgroupId=com.beautyeye -DartifactId=beautyeye-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
65
- mvn install:install-file -Dfile=./lib/chardet-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=chardet -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
76
- mvn install:install-file -Dfile=./lib/cpdetector_1.0.10.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=cpdetector -Dpackaging=jar -Dversion=1.0.10 -DgeneratePom=true -DcreateChecksum=true
8-
- mvn install:install-file -Dfile=./lib/darcula.jar -DgroupId=com.darcula -DartifactId=darcula-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
97
- mvn install:install-file -Dfile=./lib/jargs-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=jargs -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
108
- mvn install:install-file -Dfile=./lib/taobao-sdk-java-auto.jar -DgroupId=com.taobao -DartifactId=taobao-sdk-java-auto -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
11-
- mvn install:install-file -Dfile=./lib/weblaf-1.29.jar -DgroupId=com.weblaf -DartifactId=weblaf-lnf -Dpackaging=jar -Dversion=1.2.9 -DgeneratePom=true -DcreateChecksum=true
129

1310
jdk:
1411
- openjdk8

‎assets/screen_shoot/theme.png‎

948 KB
Loading

‎lib/beautyeye_lnf.jar‎

-524 KB
Binary file not shown.

‎lib/darcula.jar‎

-358 KB
Binary file not shown.

‎lib/weblaf-1.29.jar‎

-3.68 MB
Binary file not shown.

‎pom.xml‎

Lines changed: 54 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.fangxuele.tool</groupId>
88
<artifactId>WePush</artifactId>
9-
<version>5.0.1</version>
9+
<version>5.0.2</version>
1010
<packaging>jar</packaging>
1111

1212
<name>WePush</name>
@@ -37,8 +37,8 @@
3737
<yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
3838
<velocity-engine-core.version>2.3</velocity-engine-core.version>
3939
<lombok.version>1.18.20</lombok.version>
40-
<mybatis.version>3.5.7</mybatis.version>
41-
<sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
40+
<mybatis.version>3.5.13</mybatis.version>
41+
<sqlite-jdbc.version>3.42.0.1</sqlite-jdbc.version>
4242
<junit.version>4.13.1</junit.version>
4343
<httpasyncclient.version>4.1.4</httpasyncclient.version>
4444
<HikariCP.version>3.4.5</HikariCP.version>
@@ -51,6 +51,7 @@
5151
<flatlaf-extras.version>3.2</flatlaf-extras.version>
5252
<flatlaf-intellij-themes.version>3.2</flatlaf-intellij-themes.version>
5353
<json-path.version>2.6.0</json-path.version>
54+
<tencentcloud-sdk-java.version>3.1.847</tencentcloud-sdk-java.version>
5455
</properties>
5556

5657
<dependencies>
@@ -425,6 +426,12 @@
425426
</exclusions>
426427
</dependency>
427428

429+
<dependency>
430+
<groupId>com.tencentcloudapi</groupId>
431+
<artifactId>tencentcloud-sdk-java</artifactId>
432+
<version>${tencentcloud-sdk-java.version}</version>
433+
</dependency>
434+
428435
</dependencies>
429436

430437
<build>
@@ -440,36 +447,36 @@
440447
<generateInstaller>true</generateInstaller>
441448
</configuration>
442449
<executions>
443-
<!-- <execution>-->
444-
<!-- <id>bundling-for-windows</id>-->
445-
<!-- <phase>package</phase>-->
446-
<!-- <goals>-->
447-
<!-- <goal>package</goal>-->
448-
<!-- </goals>-->
449-
<!-- <configuration>-->
450-
<!-- <platform>windows</platform>-->
451-
<!-- <createZipball>true</createZipball>-->
452-
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
453-
<!-- &lt;!&ndash; <administratorRequired>true</administratorRequired>&ndash;&gt;-->
454-
<!-- <winConfig>-->
455-
456-
<!-- &lt;!&ndash; general properties &ndash;&gt;-->
457-
<!-- <generateSetup>true</generateSetup>-->
458-
<!-- <generateMsi>true</generateMsi>-->
459-
<!-- <generateMsm>true</generateMsm>-->
460-
461-
<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
462-
<!-- <setupMode>installForAllUsers</setupMode>-->
463-
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
464-
<!-- <disableDirPage>false</disableDirPage>-->
465-
<!-- <disableFinishedPage>false</disableFinishedPage>-->
466-
<!-- <setupLanguages>-->
467-
<!-- <english>compiler:Default.isl</english>-->
468-
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
469-
<!-- </setupLanguages>-->
470-
<!-- </winConfig>-->
471-
<!-- </configuration>-->
472-
<!-- </execution>-->
450+
<execution>
451+
<id>bundling-for-windows</id>
452+
<phase>package</phase>
453+
<goals>
454+
<goal>package</goal>
455+
</goals>
456+
<configuration>
457+
<platform>windows</platform>
458+
<createZipball>true</createZipball>
459+
<additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
460+
<!-- <administratorRequired>true</administratorRequired>-->
461+
<winConfig>
462+
463+
<!-- general properties -->
464+
<generateSetup>true</generateSetup>
465+
<generateMsi>true</generateMsi>
466+
<generateMsm>true</generateMsm>
467+
468+
<!-- setup generation properties -->
469+
<setupMode>installForAllUsers</setupMode>
470+
<createDesktopIconTask>true</createDesktopIconTask>
471+
<disableDirPage>false</disableDirPage>
472+
<disableFinishedPage>false</disableFinishedPage>
473+
<setupLanguages>
474+
<english>compiler:Default.isl</english>
475+
<!-- <spanish>compiler:Languages\Chinese.isl</spanish>-->
476+
</setupLanguages>
477+
</winConfig>
478+
</configuration>
479+
</execution>
473480
<!-- <execution>-->
474481
<!-- <id>bundling-for-linux</id>-->
475482
<!-- <phase>package</phase>-->
@@ -483,20 +490,20 @@
483490
<!-- <jdkPath>X:\\path\to\linux\jdk</jdkPath>-->
484491
<!-- </configuration>-->
485492
<!-- </execution>-->
486-
<execution>
487-
<id>bundling-for-mac</id>
488-
<phase>package</phase>
489-
<goals>
490-
<goal>package</goal>
491-
</goals>
492-
<configuration>
493-
<platform>mac</platform>
494-
<createTarball>true</createTarball>
495-
<additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
496-
<customizedJre>false</customizedJre>
497-
<!-- <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
498-
</configuration>
499-
</execution>
493+
<!-- <execution>-->
494+
<!-- <id>bundling-for-mac</id>-->
495+
<!-- <phase>package</phase>-->
496+
<!-- <goals>-->
497+
<!-- <goal>package</goal>-->
498+
<!-- </goals>-->
499+
<!-- <configuration>-->
500+
<!-- <platform>mac</platform>-->
501+
<!-- <createTarball>true</createTarball>-->
502+
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
503+
<!-- <customizedJre>false</customizedJre>-->
504+
<!-- &lt;!&ndash; <jdkPath>X:\\path\to\mac\jdk</jdkPath>&ndash;&gt;-->
505+
<!-- </configuration>-->
506+
<!-- </execution>-->
500507
</executions>
501508
</plugin>
502509

@@ -505,36 +512,6 @@
505512
<artifactId>maven-install-plugin</artifactId>
506513
<version>2.5.2</version>
507514
<executions>
508-
<execution>
509-
<id>install-beautyeye</id>
510-
<phase>clean</phase>
511-
<configuration>
512-
<file>lib/beautyeye_lnf.jar</file>
513-
<groupId>com.beautyeye</groupId>
514-
<artifactId>beautyeye-lnf</artifactId>
515-
<version>1.0</version>
516-
<packaging>jar</packaging>
517-
<generatePom>true</generatePom>
518-
</configuration>
519-
<goals>
520-
<goal>install-file</goal>
521-
</goals>
522-
</execution>
523-
<execution>
524-
<id>install-darcula</id>
525-
<phase>clean</phase>
526-
<configuration>
527-
<file>lib/darcula.jar</file>
528-
<groupId>com.darcula</groupId>
529-
<artifactId>darcula-lnf</artifactId>
530-
<version>1.0</version>
531-
<packaging>jar</packaging>
532-
<generatePom>true</generatePom>
533-
</configuration>
534-
<goals>
535-
<goal>install-file</goal>
536-
</goals>
537-
</execution>
538515
<execution>
539516
<id>install-taobao-sdk-auto</id>
540517
<phase>clean</phase>

‎readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Windows • Linux • macOS
6464
![Overview](assets/screen_shoot/5.png)
6565
![Overview](assets/screen_shoot/7.png)
6666
![Overview](assets/screen_shoot/6.png)
67+
![Overview](assets/screen_shoot/theme.png)
6768
### 安装文件下载
6869

6970
[WePush下载地址](https://gitee.com/zhoubochina/WePush/releases)

‎src/main/java/com/fangxuele/tool/push/bean/account/TxYun3AccountConfig.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.fangxuele.tool.push.bean.account;
2+
3+
import lombok.Data;
4+
5+
/**
6+
* 腾讯云3.0账号配置
7+
*/
8+
@Data
9+
public class TxYun3AccountConfig {
10+
private String secretId;
11+
private String secretKey;
12+
private String endPoint;
13+
private String region;
14+
private String sign;
15+
private String sdkAppId;
16+
}

‎src/main/java/com/fangxuele/tool/push/bean/account/WxCpAccountConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ public class WxCpAccountConfig {
1111
private String appName;
1212
private String agentId;
1313
private String secret;
14+
private Boolean privateDep;
15+
private String baseApiUrl;
1416
}

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public enum MessageTypeEnum {
3030
WX_UNIFORM_MESSAGE(17, "小程序-统一服务消息"),
3131
MA_SUBSCRIBE(18, "小程序-订阅消息"),
3232
MP_SUBSCRIBE(19, "公众号-订阅通知"),
33-
WX_MP(20, "微信公众号"),
34-
WX_MA(21, "微信小程序");
33+
TX_YUN_3(20, "腾讯云短信3.0");
3534

3635
private int code;
3736

@@ -55,6 +54,7 @@ public enum MessageTypeEnum {
5554
public static final int WX_UNIFORM_MESSAGE_CODE = 17;
5655
public static final int MA_SUBSCRIBE_CODE = 18;
5756
public static final int MP_SUBSCRIBE_CODE = 19;
57+
public static final int TX_YUN_3_CODE = 20;
5858

5959
MessageTypeEnum(int code, String name) {
6060
this.code = code;
@@ -123,10 +123,7 @@ public static String getName(int code) {
123123
name = MP_SUBSCRIBE.name;
124124
break;
125125
case 20:
126-
name = WX_MP.name;
127-
break;
128-
case 21:
129-
name = WX_MA.name;
126+
name = TX_YUN_3.name;
130127
break;
131128
default:
132129
name = "";

0 commit comments

Comments
 (0)