Merge pull request #218 from rememberber/develop

Develop

.gitignore

@@ -1,3 +1,4 @@
 # Project exclude paths
 /target/
 /.idea/
+/logs/

download.md

@@ -3,6 +3,7 @@
 <details>
 <summary>Windows</summary>
 
+[WePush-v3.8.0_190909-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.8.0_190909-x64-Setup.exe)  
 [WePush-v3.7.0_190904-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.7.0_190904-x64-Setup.exe)  
 [WePush-v3.6.3_190825-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.6.3_190825-x64-Setup.exe)  
 [WePush-v3.6.2_190811-x64-Setup.exe](http://download.zhoubochina.com/exe/WePush-v3.6.2_190811-x64-Setup.exe)  
@@ -108,6 +109,7 @@
 <details>
 <summary>Linux</summary>
 
+[v3.8.0_190909](http://download.zhoubochina.com/linux/WePush-3.8.0.zip)  
 [v3.7.0_190904](http://download.zhoubochina.com/linux/WePush-3.7.0.zip)  
 [v3.6.3_190825](http://download.zhoubochina.com/linux/WePush-3.6.3.zip)  
 [v3.6.2_190811](http://download.zhoubochina.com/linux/WePush-3.6.2.zip)  

src/main/java/com/fangxuele/tool/push/bean/DingMsg.java

@@ -0,0 +1,34 @@
+package com.fangxuele.tool.push.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * <pre>
+ * 钉钉消息
+ * </pre>
+ *
+ * @author <a href="https://github.com/rememberber">RememBerBer</a>
+ * @since 2019/9/5.
+ */
+@Getter
+@Setter
+@ToString
+public class DingMsg implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String content;
+
+    private String title;
+
+    private String picUrl;
+
+    private String url;
+
+    private String btnTxt;
+
+    private String btnUrl;
+}

src/main/java/com/fangxuele/tool/push/dao/TDingAppMapper.java

@@ -0,0 +1,25 @@
+package com.fangxuele.tool.push.dao;
+
+import com.fangxuele.tool.push.domain.TDingApp;
+
+import java.util.List;
+
+public interface TDingAppMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TDingApp record);
+
+    int insertSelective(TDingApp record);
+
+    TDingApp selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TDingApp record);
+
+    int updateByPrimaryKey(TDingApp record);
+
+    List<TDingApp> selectByAppName(String appName);
+
+    List<TDingApp> selectAll();
+
+    TDingApp selectByAgentId(String agentId);
+}

src/main/java/com/fangxuele/tool/push/dao/TMsgDingMapper.java

@@ -0,0 +1,26 @@
+package com.fangxuele.tool.push.dao;
+
+import com.fangxuele.tool.push.domain.TMsgDing;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TMsgDingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TMsgDing record);
+
+    int insertSelective(TMsgDing record);
+
+    TMsgDing selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TMsgDing record);
+
+    int updateByPrimaryKey(TMsgDing record);
+
+    List<TMsgDing> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);
+
+    int updateByMsgTypeAndMsgName(TMsgDing tMsgDing);
+
+    List<TMsgDing> selectByMsgType(int msgType);
+}

src/main/java/com/fangxuele/tool/push/domain/TDingApp.java

@@ -0,0 +1,77 @@
+package com.fangxuele.tool.push.domain;
+
+import java.io.Serializable;
+
+public class TDingApp implements Serializable {
+    private Integer id;
+
+    private String appName;
+
+    private String agentId;
+
+    private String appKey;
+
+    private String appSecret;
+
+    private String createTime;
+
+    private String modifiedTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName == null ? null : appName.trim();
+    }
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId == null ? null : agentId.trim();
+    }
+
+    public String getAppKey() {
+        return appKey;
+    }
+
+    public void setAppKey(String appKey) {
+        this.appKey = appKey == null ? null : appKey.trim();
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret == null ? null : appSecret.trim();
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    public String getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(String modifiedTime) {
+        this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
+    }
+}

src/main/java/com/fangxuele/tool/push/domain/TMsgDing.java

@@ -0,0 +1,107 @@
+package com.fangxuele.tool.push.domain;
+
+import java.io.Serializable;
+
+public class TMsgDing implements Serializable {
+    private Integer id;
+
+    private Integer msgType;
+
+    private String msgName;
+
+    private String dingMsgType;
+
+    private String agentId;
+
+    private String webHook;
+
+    private String content;
+
+    private String createTime;
+
+    private String modifiedTime;
+
+    private String radioType;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(Integer msgType) {
+        this.msgType = msgType;
+    }
+
+    public String getMsgName() {
+        return msgName;
+    }
+
+    public void setMsgName(String msgName) {
+        this.msgName = msgName == null ? null : msgName.trim();
+    }
+
+    public String getDingMsgType() {
+        return dingMsgType;
+    }
+
+    public void setDingMsgType(String dingMsgType) {
+        this.dingMsgType = dingMsgType == null ? null : dingMsgType.trim();
+    }
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId == null ? null : agentId.trim();
+    }
+
+    public String getWebHook() {
+        return webHook;
+    }
+
+    public void setWebHook(String webHook) {
+        this.webHook = webHook == null ? null : webHook.trim();
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    public String getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(String modifiedTime) {
+        this.modifiedTime = modifiedTime == null ? null : modifiedTime.trim();
+    }
+
+    public String getRadioType() {
+        return radioType;
+    }
+
+    public void setRadioType(String radioType) {
+        this.radioType = radioType == null ? null : radioType.trim();
+    }
+}

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

@@ -23,7 +23,8 @@ public enum MessageTypeEnum {
     HW_YUN(10, "华为云短信"),
     EMAIL(11, "E-Mail"),
     WX_CP(12, "微信企业号/企业微信"),
-    HTTP(13, "HTTP请求");
+    HTTP(13, "HTTP请求"),
+    DING(14, "钉钉");
 
     private int code;
 
@@ -41,6 +42,7 @@ public enum MessageTypeEnum {
     public static final int EMAIL_CODE = 11;
     public static final int WX_CP_CODE = 12;
     public static final int HTTP_CODE = 13;
+    public static final int DING_CODE = 14;
 
     MessageTypeEnum(int code, String name) {
         this.code = code;
@@ -86,6 +88,9 @@ public static String getName(int code) {
             case 13:
                 name = HTTP.name;
                 break;
+            case 14:
+                name = DING.name;
+                break;
             default:
         }
         return name;