Skip to content

Commit

Permalink
Merge branch '4.5.0' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	pom.xml
  • Loading branch information
@rememberber
rememberber committed Jan 9, 2022
2 parents 84b2e07 + cddce77 commit 10e7808
Show file tree
Hide file tree
Showing 41 changed files with 1,740 additions and 279 deletions.
1 change: 1 addition & 0 deletions _config.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-slate
152 changes: 57 additions & 95 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.fangxuele.tool</groupId>
<artifactId>WePush</artifactId>
<version>1.0</version>
<version>4.5.0</version>
<packaging>jar</packaging>

<name>WePush</name>
Expand All @@ -20,9 +20,9 @@

<java.version>1.8</java.version>
<logback.version>1.2.3</logback.version>
<weixin-java-mp.version>4.0.0</weixin-java-mp.version>
<weixin-java-cp.version>4.0.0</weixin-java-cp.version>
<weixin-java-miniapp.version>4.0.0</weixin-java-miniapp.version>
<weixin-java-mp.version>4.1.0</weixin-java-mp.version>
<weixin-java-cp.version>4.1.0</weixin-java-cp.version>
<weixin-java-miniapp.version>4.1.0</weixin-java-miniapp.version>
<emoji-java.version>5.1.1</emoji-java.version>
<hutool-all.version>5.4.4</hutool-all.version>
<opencsv.version>5.2</opencsv.version>
Expand All @@ -43,11 +43,11 @@
<httpasyncclient.version>4.1.4</httpasyncclient.version>
<HikariCP.version>3.4.5</HikariCP.version>
<quartz.version>2.3.2</quartz.version>
<okhttp.version>4.9.0</okhttp.version>
<okhttp.version>4.9.1</okhttp.version>
<aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
<bce-java-sdk.version>0.10.134</bce-java-sdk.version>
<qiniu-java-sdk.version>7.3.0</qiniu-java-sdk.version>
<flatlaf.version>1.6.4</flatlaf.version>
<flatlaf.version>2.0-rc1</flatlaf.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -221,18 +221,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.darcula</groupId>
<artifactId>darcula-lnf</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>com.beautyeye</groupId>
<artifactId>beautyeye-lnf</artifactId>
<version>1.0</version>
</dependency>

<!--文件字符集格式检测-->
<dependency>
<groupId>net.sourceforge.cpdetector</groupId>
Expand Down Expand Up @@ -285,11 +273,11 @@
<artifactId>httpasyncclient</artifactId>
<version>${httpasyncclient.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>${HikariCP.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.zaxxer</groupId>-->
<!-- <artifactId>HikariCP</artifactId>-->
<!-- <version>${HikariCP.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
Expand Down Expand Up @@ -391,6 +379,10 @@
<artifactId>hbase-client</artifactId>
<groupId>org.apache.hbase</groupId>
</exclusion>
<exclusion>
<artifactId>bcprov-jdk15on</artifactId>
<groupId>org.bouncycastle</groupId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -421,35 +413,35 @@
<generateInstaller>true</generateInstaller>
</configuration>
<executions>
<!-- <execution>-->
<!-- <id>bundling-for-windows</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>windows</platform>-->
<!-- <createZipball>true</createZipball>-->
<!-- &lt;!&ndash; <administratorRequired>true</administratorRequired>&ndash;&gt;-->
<!-- <winConfig>-->

<!-- &lt;!&ndash; general properties &ndash;&gt;-->
<!-- <generateSetup>true</generateSetup>-->
<!-- <generateMsi>true</generateMsi>-->
<!-- <generateMsm>true</generateMsm>-->

<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
<!-- <setupMode>installForAllUsers</setupMode>-->
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
<!-- <disableDirPage>false</disableDirPage>-->
<!-- <disableFinishedPage>false</disableFinishedPage>-->
<!-- <setupLanguages>-->
<!-- <english>compiler:Default.isl</english>-->
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
<!-- </setupLanguages>-->
<!-- </winConfig>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-windows</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>windows</platform>-->
<!-- <createZipball>true</createZipball>-->
<!-- &lt;!&ndash; <administratorRequired>true</administratorRequired>&ndash;&gt;-->
<!-- <winConfig>-->

<!-- &lt;!&ndash; general properties &ndash;&gt;-->
<!-- <generateSetup>true</generateSetup>-->
<!-- <generateMsi>true</generateMsi>-->
<!-- <generateMsm>true</generateMsm>-->

<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
<!-- <setupMode>installForAllUsers</setupMode>-->
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
<!-- <disableDirPage>false</disableDirPage>-->
<!-- <disableFinishedPage>false</disableFinishedPage>-->
<!-- <setupLanguages>-->
<!-- <english>compiler:Default.isl</english>-->
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
<!-- </setupLanguages>-->
<!-- </winConfig>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-linux</id>-->
<!-- <phase>package</phase>-->
Expand All @@ -462,19 +454,19 @@
<!-- <jdkPath>X:\\path\to\linux\jdk</jdkPath>-->
<!-- </configuration>-->
<!-- </execution>-->
<execution>
<id>bundling-for-mac</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>mac</platform>
<createTarball>true</createTarball>
<customizedJre>false</customizedJre>
<!-- <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
</configuration>
</execution>
<execution>
<id>bundling-for-mac</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>mac</platform>
<createTarball>true</createTarball>
<!-- <customizedJre>false</customizedJre>-->
<!-- <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
</configuration>
</execution>
</executions>
</plugin>

Expand All @@ -483,36 +475,6 @@
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<executions>
<execution>
<id>install-beautyeye</id>
<phase>clean</phase>
<configuration>
<file>lib/beautyeye_lnf.jar</file>
<groupId>com.beautyeye</groupId>
<artifactId>beautyeye-lnf</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-darcula</id>
<phase>clean</phase>
<configuration>
<file>lib/darcula.jar</file>
<groupId>com.darcula</groupId>
<artifactId>darcula-lnf</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-taobao-sdk-auto</id>
<phase>clean</phase>
Expand Down
Binary file modified screen_shoot/wx-zanshang.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/main/java/com/fangxuele/tool/push/App.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.fangxuele.tool.push;

import com.fangxuele.tool.push.ui.Init;
import com.fangxuele.tool.push.ui.UiConsts;
import com.fangxuele.tool.push.ui.form.LoadingForm;
import com.fangxuele.tool.push.ui.form.MainWindow;
import com.fangxuele.tool.push.ui.frame.MainFrame;
import com.fangxuele.tool.push.util.ConfigUtil;
import com.fangxuele.tool.push.util.MybatisUtil;
import com.fangxuele.tool.push.util.UpgradeUtil;
import com.formdev.flatlaf.util.SystemInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSession;

Expand Down Expand Up @@ -34,6 +36,15 @@ public class App {
public static TrayIcon trayIcon;

public static void main(String[] args) {
if (SystemInfo.isMacOS) {
// java -Xdock:name="WePush" -Xdock:icon=WePush.jpg ... (whatever else you normally specify here)
// java -Xms64m -Xmx256m -Dapple.awt.application.name="WePush" -Dcom.apple.mrj.application.apple.menu.about.name="WePush" -cp "./lib/*" com.luoboduner.moo.tool.App
System.setProperty("apple.laf.useScreenMenuBar", "true");
System.setProperty("apple.awt.application.name", UiConsts.APP_NAME);
System.setProperty("com.apple.mrj.application.apple.menu.about.name", UiConsts.APP_NAME);
System.setProperty("apple.awt.application.appearance", "system");
}

Init.initTheme();
mainFrame = new MainFrame();
mainFrame.init();
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/TMsgMpSubscribeMapper.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TMsgMpSubscribe;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TMsgMpSubscribeMapper {
int deleteByPrimaryKey(Integer id);

int insert(TMsgMpSubscribe record);

int insertSelective(TMsgMpSubscribe record);

TMsgMpSubscribe selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TMsgMpSubscribe record);

int updateByPrimaryKey(TMsgMpSubscribe record);

List<TMsgMpSubscribe> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);

int deleteByMsgTypeAndName(int msgType, String msgName);

List<TMsgMpSubscribe> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);

int updateByMsgTypeAndMsgName(TMsgMpSubscribe tMsgMpSubscribe);
}
Loading

0 comments on commit 10e7808

Please sign in to comment.