Merge pull request #251 from rememberber/develop

Release:v4.2.2_201208
rememberber · Dec 8, 2020 · 00be904 · 00be904
2 parents fb8eba1 + c601c91
commit 00be904
Show file tree

Hide file tree

Showing 98 changed files with 1,585 additions and 1,224 deletions.
diff --git a/download.md b/download.md
@@ -3,6 +3,7 @@
 <details>
 <summary>Windows</summary>
 
+[WePush-v4.2.2_201208-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.2_201208-x64-Setup.exe)  
 [WePush-v4.2.1_200308-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.1_200308-x64-Setup.exe)  
 [WePush-v4.2.0_191129-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.2.0_191129-x64-Setup.exe)  
 [WePush-v4.1.1_191027-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v4.1.1_191027-x64-Setup.exe)  
@@ -127,6 +128,7 @@
 <details>
 <summary>Portable(各系统通用绿色便携版32/64位)</summary>
 
+[v4.2.2_201208](http://download.zhoubochina.com/linux/WePush-4.2.2.zip)  
 [v4.2.1_200308](http://download.zhoubochina.com/linux/WePush-4.2.1.zip)  
 [v4.2.0_191129](http://download.zhoubochina.com/linux/WePush-4.2.0.zip)  
 [v4.1.1_191027](http://download.zhoubochina.com/linux/WePush-4.1.1.zip)  

diff --git a/pom.xml b/pom.xml
@@ -20,33 +20,33 @@
 
         <java.version>1.8</java.version>
         <logback.version>1.2.3</logback.version>
-        <weixin-java-mp.version>3.7.0</weixin-java-mp.version>
-        <weixin-java-cp.version>3.7.0</weixin-java-cp.version>
-        <weixin-java-miniapp.version>3.7.0</weixin-java-miniapp.version>
-        <emoji-java.version>4.0.0</emoji-java.version>
-        <hutool-all.version>4.6.2</hutool-all.version>
-        <opencsv.version>4.6</opencsv.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>
+        <emoji-java.version>5.1.1</emoji-java.version>
+        <hutool-all.version>5.4.4</hutool-all.version>
+        <opencsv.version>5.2</opencsv.version>
         <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
         <forms_rt.version>7.0.3</forms_rt.version>
-        <fastjson.version>1.2.58</fastjson.version>
+        <fastjson.version>1.2.74</fastjson.version>
         <sun-mail.version>1.6.2</sun-mail.version>
         <aliyun-java-sdk-core.version>4.4.2</aliyun-java-sdk-core.version>
-        <poi.version>4.1.0</poi.version>
+        <poi.version>4.1.2</poi.version>
         <AppleJavaExtensions.version>1.4</AppleJavaExtensions.version>
         <qcloudsms.version>1.0.6</qcloudsms.version>
         <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
-        <velocity-engine-core.version>2.1</velocity-engine-core.version>
-        <lombok.version>1.18.8</lombok.version>
-        <mybatis.version>3.5.3</mybatis.version>
-        <sqlite-jdbc.version>3.28.0</sqlite-jdbc.version>
-        <junit.version>4.12</junit.version>
+        <velocity-engine-core.version>2.2</velocity-engine-core.version>
+        <lombok.version>1.18.14</lombok.version>
+        <mybatis.version>3.5.6</mybatis.version>
+        <sqlite-jdbc.version>3.32.3.2</sqlite-jdbc.version>
+        <junit.version>4.13.1</junit.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
-        <HikariCP.version>3.3.1</HikariCP.version>
-        <quartz.version>2.3.1</quartz.version>
-        <okhttp.version>4.0.1</okhttp.version>
+        <HikariCP.version>3.4.5</HikariCP.version>
+        <quartz.version>2.3.2</quartz.version>
+        <okhttp.version>4.9.0</okhttp.version>
         <aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
-        <bce-java-sdk.version>0.10.75</bce-java-sdk.version>
-        <qiniu-java-sdk.version>7.2.25</qiniu-java-sdk.version>
+        <bce-java-sdk.version>0.10.134</bce-java-sdk.version>
+        <qiniu-java-sdk.version>7.3.0</qiniu-java-sdk.version>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/com/fangxuele/tool/push/dao/TMsgKefuMapper.java b/src/main/java/com/fangxuele/tool/push/dao/TMsgKefuMapper.java
@@ -25,4 +25,6 @@ public interface TMsgKefuMapper {
     List<TMsgKefu> selectByMsgType(int msgType);
 
     int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
+
+    List<TMsgKefu> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);
 }
diff --git a/src/main/java/com/fangxuele/tool/push/dao/TMsgKefuPriorityMapper.java b/src/main/java/com/fangxuele/tool/push/dao/TMsgKefuPriorityMapper.java
@@ -25,4 +25,6 @@ public interface TMsgKefuPriorityMapper {
     List<TMsgKefuPriority> selectByMsgType(int msgType);
 
     int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
+
+    List<TMsgKefuPriority> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);
 }
diff --git a/src/main/java/com/fangxuele/tool/push/dao/TMsgMaSubscribeMapper.java b/src/main/java/com/fangxuele/tool/push/dao/TMsgMaSubscribeMapper.java
@@ -25,4 +25,6 @@ public interface TMsgMaSubscribeMapper {
     List<TMsgMaSubscribe> selectByMsgType(int msgType);
 
     int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
+
+    List<TMsgMaSubscribe> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);
 }
diff --git a/src/main/java/com/fangxuele/tool/push/dao/TMsgMaTemplateMapper.java b/src/main/java/com/fangxuele/tool/push/dao/TMsgMaTemplateMapper.java
@@ -25,4 +25,6 @@ public interface TMsgMaTemplateMapper {
     List<TMsgMaTemplate> selectByMsgType(int msgType);
 
     int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
+
+    List<TMsgMaTemplate> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);
 }
diff --git a/src/main/java/com/fangxuele/tool/push/dao/TMsgMpTemplateMapper.java b/src/main/java/com/fangxuele/tool/push/dao/TMsgMpTemplateMapper.java
@@ -25,4 +25,6 @@ public interface TMsgMpTemplateMapper {
     List<TMsgMpTemplate> selectByMsgType(int msgType);
 
     int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
+
+    List<TMsgMpTemplate> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);
 }
diff --git a/src/main/java/com/fangxuele/tool/push/dao/TMsgWxUniformMapper.java b/src/main/java/com/fangxuele/tool/push/dao/TMsgWxUniformMapper.java
@@ -25,4 +25,6 @@ public interface TMsgWxUniformMapper {
     List<TMsgWxUniform> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);
 
     int updateByMsgTypeAndMsgName(TMsgWxUniform tMsgWxUniform);
+
+    List<TMsgWxUniform> selectByMsgTypeAndWxAccountId(@Param("msgType") int msgType, @Param("wxAccountId") Integer wxAccountId);
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgDing.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgDing.java
@@ -9,6 +9,8 @@ public class TMsgDing implements Serializable {
 
     private String msgName;
 
+    private String radioType;
+
     private String dingMsgType;
 
     private String agentId;
@@ -21,7 +23,7 @@ public class TMsgDing implements Serializable {
 
     private String modifiedTime;
 
-    private String radioType;
+    private String previewUser;
 
     private static final long serialVersionUID = 1L;
 
@@ -49,6 +51,14 @@ public void setMsgName(String msgName) {
         this.msgName = msgName == null ? null : msgName.trim();
     }
 
+    public String getRadioType() {
+        return radioType;
+    }
+
+    public void setRadioType(String radioType) {
+        this.radioType = radioType == null ? null : radioType.trim();
+    }
+
     public String getDingMsgType() {
         return dingMsgType;
     }
@@ -97,11 +107,11 @@ public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
 
-    public String getRadioType() {
-        return radioType;
+    public String getPreviewUser() {
+        return previewUser;
     }
 
-    public void setRadioType(String radioType) {
-        this.radioType = radioType == null ? null : radioType.trim();
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
     }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgHttp.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgHttp.java
@@ -21,11 +21,13 @@ public class TMsgHttp implements Serializable {
 
     private String body;
 
+    private String bodyType;
+
     private String createTime;
 
     private String modifiedTime;
 
-    private String bodyType;
+    private String previewUser;
 
     private static final long serialVersionUID = 1L;
 
@@ -101,6 +103,14 @@ public void setBody(String body) {
         this.body = body == null ? null : body.trim();
     }
 
+    public String getBodyType() {
+        return bodyType;
+    }
+
+    public void setBodyType(String bodyType) {
+        this.bodyType = bodyType == null ? null : bodyType.trim();
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -117,11 +127,11 @@ public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
 
-    public String getBodyType() {
-        return bodyType;
+    public String getPreviewUser() {
+        return previewUser;
     }
 
-    public void setBodyType(String bodyType) {
-        this.bodyType = bodyType == null ? null : bodyType.trim();
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
     }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgKefu.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgKefu.java
@@ -25,6 +25,10 @@ public class TMsgKefu implements Serializable {
 
     private String modifiedTime;
 
+    private String previewUser;
+
+    private Integer wxAccountId;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -114,4 +118,20 @@ public String getModifiedTime() {
     public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
+
+    public String getPreviewUser() {
+        return previewUser;
+    }
+
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
+    }
+
+    public Integer getWxAccountId() {
+        return wxAccountId;
+    }
+
+    public void setWxAccountId(Integer wxAccountId) {
+        this.wxAccountId = wxAccountId;
+    }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgKefuPriority.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgKefuPriority.java
@@ -33,6 +33,10 @@ public class TMsgKefuPriority implements Serializable {
 
     private String modifiedTime;
 
+    private String previewUser;
+
+    private Integer wxAccountId;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -154,4 +158,20 @@ public String getModifiedTime() {
     public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
+
+    public String getPreviewUser() {
+        return previewUser;
+    }
+
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
+    }
+
+    public Integer getWxAccountId() {
+        return wxAccountId;
+    }
+
+    public void setWxAccountId(Integer wxAccountId) {
+        this.wxAccountId = wxAccountId;
+    }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgMaSubscribe.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgMaSubscribe.java
@@ -17,6 +17,10 @@ public class TMsgMaSubscribe implements Serializable {
 
     private String modifiedTime;
 
+    private String previewUser;
+
+    private Integer wxAccountId;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -74,4 +78,20 @@ public String getModifiedTime() {
     public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
+
+    public String getPreviewUser() {
+        return previewUser;
+    }
+
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
+    }
+
+    public Integer getWxAccountId() {
+        return wxAccountId;
+    }
+
+    public void setWxAccountId(Integer wxAccountId) {
+        this.wxAccountId = wxAccountId;
+    }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgMaTemplate.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgMaTemplate.java
@@ -19,6 +19,10 @@ public class TMsgMaTemplate implements Serializable {
 
     private String modifiedTime;
 
+    private String previewUser;
+
+    private Integer wxAccountId;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -84,4 +88,20 @@ public String getModifiedTime() {
     public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
+
+    public String getPreviewUser() {
+        return previewUser;
+    }
+
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
+    }
+
+    public Integer getWxAccountId() {
+        return wxAccountId;
+    }
+
+    public void setWxAccountId(Integer wxAccountId) {
+        this.wxAccountId = wxAccountId;
+    }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/domain/TMsgMail.java b/src/main/java/com/fangxuele/tool/push/domain/TMsgMail.java
@@ -11,6 +11,8 @@ public class TMsgMail implements Serializable {
 
     private String title;
 
+    private String cc;
+
     private String files;
 
     private String content;
@@ -19,7 +21,7 @@ public class TMsgMail implements Serializable {
 
     private String modifiedTime;
 
-    private String cc;
+    private String previewUser;
 
     private static final long serialVersionUID = 1L;
 
@@ -55,6 +57,14 @@ public void setTitle(String title) {
         this.title = title == null ? null : title.trim();
     }
 
+    public String getCc() {
+        return cc;
+    }
+
+    public void setCc(String cc) {
+        this.cc = cc == null ? null : cc.trim();
+    }
+
     public String getFiles() {
         return files;
     }
@@ -87,11 +97,11 @@ public void setModifiedTime(String modifiedTime) {
         this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
     }
 
-    public String getCc() {
-        return cc;
+    public String getPreviewUser() {
+        return previewUser;
     }
 
-    public void setCc(String cc) {
-        this.cc = cc == null ? null : cc.trim();
+    public void setPreviewUser(String previewUser) {
+        this.previewUser = previewUser == null ? null : previewUser.trim();
     }
 }