diff --git a/src/main/java/work/sajor/wechatpush/service/Pusher.java b/src/main/java/work/sajor/wechatpush/service/Pusher.java index 8945cc38bc162fb20a5cb8bf2fe3ed6fb9e75211..273f01bc183e809fe8d378898fac97b628596e0c 100644 --- a/src/main/java/work/sajor/wechatpush/service/Pusher.java +++ b/src/main/java/work/sajor/wechatpush/service/Pusher.java @@ -81,14 +81,16 @@ public class Pusher { templateMessage.addData(new WxMpTemplateData("tianqi",todayWeather.getString("text_day"),"#00FFFF")); templateMessage.addData(new WxMpTemplateData("low",todayWeather.getString("low") + "","#173177")); templateMessage.addData(new WxMpTemplateData("high",todayWeather.getString("high")+ "","#FF6347" )); + templateMessage.addData(new WxMpTemplateData("city",todayWeather.getString("city")+ "","#FF6347" )); + templateMessage.addData(new WxMpTemplateData("caihongpi", CaiHongPi.getCaiHongPi(key),"#FF69B4")); - templateMessage.addData(new WxMpTemplateData("lianai", JiNianRi.getLianAi(lianAi)+"","#FF1493")); templateMessage.addData(new WxMpTemplateData("shengri",JiNianRi.getShengRi(shengRi)+"","#FFA500")); - templateMessage.addData(new WxMpTemplateData("jinju",CaiHongPi.getJinJu()+"","#C71585")); + //templateMessage.addData(new WxMpTemplateData("lianai", JiNianRi.getLianAi(lianAi)+"","#FF1493")); + //templateMessage.addData(new WxMpTemplateData("jinju",CaiHongPi.getJinJu()+"","#C71585")); //templateMessage.addData(new WxMpTemplateData("jiehun",JiNianRi.getJieHun()+"")); - templateMessage.addData(new WxMpTemplateData("linzhen",JiNianRi.getLinZhen(linZheng)+"","#FF6347")); + //templateMessage.addData(new WxMpTemplateData("linzhen",JiNianRi.getLinZhen(linZheng)+"","#FF6347")); String beizhu = ""; - if(JiNianRi.getJieHun(jieHun) % 365 == 0){ + /* if(JiNianRi.getJieHun(jieHun) % 365 == 0){ beizhu = "今天是结婚纪念日!"; } if(JiNianRi.getLianAi(lianAi) % 365 == 0){ @@ -96,8 +98,8 @@ public class Pusher { } if(JiNianRi.getLinZhen(linZheng) % 365 == 0){ beizhu = "今天是领证纪念日!"; - } - templateMessage.addData(new WxMpTemplateData("beizhu",beizhu,"#FF0000")); + }*/ + // templateMessage.addData(new WxMpTemplateData("beizhu",beizhu,"#FF0000")); try {