|
@ -100,7 +100,6 @@ public class PushMsgTask {
|
|
|
json.put("name", name);
|
|
|
json.put("data", data);
|
|
|
queue.put(json);
|
|
|
String str = "";
|
|
|
} catch (Exception e) {
|
|
|
logger.error("添加到微信消息列队列失败!", e);
|
|
|
e.printStackTrace();
|
|
@ -438,6 +437,11 @@ public class PushMsgTask {
|
|
|
m.put("remark", keyword4);
|
|
|
} else if (type == 9) {
|
|
|
temp.setUrl(url + "jkjy/html/article.html?openid=" + openid + "&dataId=" + json.getString("article") + "&toUser=" + json.getString("toUser") + "&toName=" + name + "&represented=" + json.getString("represented"));
|
|
|
//默认是推送本地数据库文章,如有传url说明是集美宣教系统推送文章
|
|
|
String articleUrl = json.has("articleUrl") ? json.getString("articleUrl") : null;
|
|
|
if(StringUtils.isNotEmpty(articleUrl)){
|
|
|
temp.setUrl(articleUrl+"?openid=" + openid + "&dataId=" + json.getString("article") + "&toUser=" + json.getString("toUser") + "&toName=" + name + "&represented=" + json.getString("represented"));
|
|
|
}
|
|
|
temp_id = template_healthy_article;
|
|
|
temp.setTemplate_id(temp_id);
|
|
|
WechatTemplateData keyword1 = new WechatTemplateData();
|