Skip to content

Commit

Permalink
Merge branch '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 c6bbfda + 10e7808 commit 55b6bef
Show file tree
Hide file tree
Showing 43 changed files with 1,761 additions and 297 deletions.
Binary file added assets/linux/WePush.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/mac/WePush.icns
View file
Binary file not shown.
Binary file added assets/windows/WePush.ico
View file
Binary file not shown.
157 changes: 69 additions & 88 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 @@ -36,8 +36,8 @@
<qcloudsms.version>1.0.6</qcloudsms.version>
<yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
<velocity-engine-core.version>2.2</velocity-engine-core.version>
<lombok.version>1.18.20</lombok.version>
<mybatis.version>3.5.7</mybatis.version>
<lombok.version>1.18.22</lombok.version>
<mybatis.version>3.5.6</mybatis.version>
<sqlite-jdbc.version>3.36.0.1</sqlite-jdbc.version>
<junit.version>4.13.1</junit.version>
<httpasyncclient.version>4.1.4</httpasyncclient.version>
Expand All @@ -47,7 +47,7 @@
<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.2</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 All @@ -410,50 +402,69 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId>
<version>1.6.2</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>com.fangxuele.tool.push.App</mainClass>
</manifest>
</archive>
<bundleJre>true</bundleJre>
<mainClass>com.fangxuele.tool.push.App</mainClass>
<generateInstaller>true</generateInstaller>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<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-linux</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>linux</platform>-->
<!-- <createTarball>true</createTarball>-->
<!-- <jdkPath>X:\\path\to\linux\jdk</jdkPath>-->
<!-- </configuration>-->
<!-- </execution>-->
<execution>
<id>copy-dependencies</id>
<id>bundling-for-mac</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>package</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<platform>mac</platform>
<createTarball>true</createTarball>
<!-- <customizedJre>false</customizedJre>-->
<!-- <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
</configuration>
</execution>
</executions>
Expand All @@ -464,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
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 55b6bef

Please sign in to comment.