-
Notifications
You must be signed in to change notification settings - Fork 981
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #226 from rememberber/develop
Develop
- Loading branch information
Showing
26 changed files
with
816 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ | |
| + 模板消息-小程序 | ||
| + 微信客服消息 | ||
| + 微信企业号/企业微信消息 | ||
| + 小程序统一服务消息 | ||
| + 钉钉 | ||
| + 阿里云短信 | ||
| + 阿里大于模板短信 | ||
|
|
||
28 changes: 28 additions & 0 deletions
28
src/main/java/com/fangxuele/tool/push/dao/TMsgWxUniformMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.TMsgWxUniform; | ||
| import org.apache.ibatis.annotations.Param; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public interface TMsgWxUniformMapper { | ||
| int deleteByPrimaryKey(Integer id); | ||
|
|
||
| int insert(TMsgWxUniform record); | ||
|
|
||
| int insertSelective(TMsgWxUniform record); | ||
|
|
||
| TMsgWxUniform selectByPrimaryKey(Integer id); | ||
|
|
||
| int updateByPrimaryKeySelective(TMsgWxUniform record); | ||
|
|
||
| int updateByPrimaryKey(TMsgWxUniform record); | ||
|
|
||
| List<TMsgWxUniform> selectByMsgType(int msgType); | ||
|
|
||
| int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName); | ||
|
|
||
| List<TMsgWxUniform> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName); | ||
|
|
||
| int updateByMsgTypeAndMsgName(TMsgWxUniform tMsgWxUniform); | ||
| } |
127 changes: 127 additions & 0 deletions
127
src/main/java/com/fangxuele/tool/push/domain/TMsgWxUniform.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| package com.fangxuele.tool.push.domain; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| public class TMsgWxUniform implements Serializable { | ||
| private Integer id; | ||
|
|
||
| private Integer msgType; | ||
|
|
||
| private String msgName; | ||
|
|
||
| private String mpTemplateId; | ||
|
|
||
| private String maTemplateId; | ||
|
|
||
| private String mpUrl; | ||
|
|
||
| private String maAppid; | ||
|
|
||
| private String maPagePath; | ||
|
|
||
| private String page; | ||
|
|
||
| private String emphasisKeyword; | ||
|
|
||
| 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 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 getMpTemplateId() { | ||
| return mpTemplateId; | ||
| } | ||
|
|
||
| public void setMpTemplateId(String mpTemplateId) { | ||
| this.mpTemplateId = mpTemplateId == null ? null : mpTemplateId.trim(); | ||
| } | ||
|
|
||
| public String getMaTemplateId() { | ||
| return maTemplateId; | ||
| } | ||
|
|
||
| public void setMaTemplateId(String maTemplateId) { | ||
| this.maTemplateId = maTemplateId == null ? null : maTemplateId.trim(); | ||
| } | ||
|
|
||
| public String getMpUrl() { | ||
| return mpUrl; | ||
| } | ||
|
|
||
| public void setMpUrl(String mpUrl) { | ||
| this.mpUrl = mpUrl == null ? null : mpUrl.trim(); | ||
| } | ||
|
|
||
| public String getMaAppid() { | ||
| return maAppid; | ||
| } | ||
|
|
||
| public void setMaAppid(String maAppid) { | ||
| this.maAppid = maAppid == null ? null : maAppid.trim(); | ||
| } | ||
|
|
||
| public String getMaPagePath() { | ||
| return maPagePath; | ||
| } | ||
|
|
||
| public void setMaPagePath(String maPagePath) { | ||
| this.maPagePath = maPagePath == null ? null : maPagePath.trim(); | ||
| } | ||
|
|
||
| public String getPage() { | ||
| return page; | ||
| } | ||
|
|
||
| public void setPage(String page) { | ||
| this.page = page == null ? null : page.trim(); | ||
| } | ||
|
|
||
| public String getEmphasisKeyword() { | ||
| return emphasisKeyword; | ||
| } | ||
|
|
||
| public void setEmphasisKeyword(String emphasisKeyword) { | ||
| this.emphasisKeyword = emphasisKeyword == null ? null : emphasisKeyword.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(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
src/main/java/com/fangxuele/tool/push/logic/msgsender/WxUniformMsgSender.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package com.fangxuele.tool.push.logic.msgsender; | ||
|
|
||
| import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; | ||
| import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; | ||
| import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage.MiniProgram; | ||
| import com.fangxuele.tool.push.App; | ||
| import com.fangxuele.tool.push.logic.PushControl; | ||
| import com.fangxuele.tool.push.logic.msgmaker.WxMaTemplateMsgMaker; | ||
| import com.fangxuele.tool.push.logic.msgmaker.WxMpTemplateMsgMaker; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage; | ||
|
|
||
| /** | ||
| * <pre> | ||
| * 微信统一服务消息发送器 | ||
| * </pre> | ||
| * | ||
| * @author <a href="https://github.com/rememberber">RememBerBer</a> | ||
| * @since 2019/9/29. | ||
| */ | ||
| @Slf4j | ||
| public class WxUniformMsgSender implements IMsgSender { | ||
|
|
||
| private WxMpTemplateMsgMaker wxMpTemplateMsgMaker; | ||
|
|
||
| private WxMaTemplateMsgMaker wxMaTemplateMsgMaker; | ||
|
|
||
| public WxUniformMsgSender() { | ||
| wxMpTemplateMsgMaker = new WxMpTemplateMsgMaker(); | ||
| wxMaTemplateMsgMaker = new WxMaTemplateMsgMaker(); | ||
| } | ||
|
|
||
| @Override | ||
| public SendResult send(String[] msgData) { | ||
| SendResult sendResult = new SendResult(); | ||
|
|
||
| try { | ||
| String openId = msgData[0]; | ||
| WxMaTemplateMessage wxMaTemplateMessage = wxMaTemplateMsgMaker.makeMsg(msgData); | ||
| WxMpTemplateMessage wxMpTemplateMessage = wxMpTemplateMsgMaker.makeMsg(msgData); | ||
|
|
||
| WxMaUniformMessage wxMaUniformMessage = new WxMaUniformMessage(); | ||
| wxMaUniformMessage.setMpTemplateMsg(true); | ||
| wxMaUniformMessage.setToUser(openId); | ||
| wxMaUniformMessage.setAppid(App.config.getMiniAppAppId()); | ||
| wxMaUniformMessage.setTemplateId(wxMpTemplateMessage.getTemplateId()); | ||
| wxMaUniformMessage.setUrl(wxMpTemplateMessage.getUrl()); | ||
| wxMaUniformMessage.setPage(wxMaTemplateMessage.getPage()); | ||
| wxMaUniformMessage.setFormId(msgData[1]); | ||
| MiniProgram miniProgram = new MiniProgram(); | ||
| miniProgram.setAppid(App.config.getMiniAppAppId()); | ||
| miniProgram.setPagePath(wxMaTemplateMessage.getPage()); | ||
|
|
||
| wxMaUniformMessage.setMiniProgram(miniProgram); | ||
| wxMaUniformMessage.setData(wxMaTemplateMessage.getData()); | ||
| wxMaUniformMessage.setEmphasisKeyword(wxMaTemplateMessage.getEmphasisKeyword()); | ||
|
|
||
| if (PushControl.dryRun) { | ||
| sendResult.setSuccess(true); | ||
| return sendResult; | ||
| } else { | ||
| WxMaTemplateMsgSender.getWxMaService().getMsgService().sendUniformMsg(wxMaUniformMessage); | ||
| } | ||
| } catch (Exception e) { | ||
| sendResult.setSuccess(false); | ||
| sendResult.setInfo(e.getMessage()); | ||
| log.error(e.toString()); | ||
| return sendResult; | ||
| } | ||
|
|
||
| sendResult.setSuccess(true); | ||
| return sendResult; | ||
| } | ||
|
|
||
| @Override | ||
| public SendResult asyncSend(String[] msgData) { | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.