From 4df5f3114d291879511cc25b1f41c6346e6ed744 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 8 Apr 2016 14:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/blog_comment.rb | 75 ++++++++++++++---------------- app/models/homework_common.rb | 11 ++--- app/models/journal.rb | 15 ++---- app/models/journals_for_message.rb | 15 ++---- app/models/mailer.rb | 10 ++-- 5 files changed, 52 insertions(+), 74 deletions(-) diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb index 3775523b3..0abb6d3d8 100644 --- a/app/models/blog_comment.rb +++ b/app/models/blog_comment.rb @@ -77,47 +77,40 @@ class BlogComment < ActiveRecord::Base #博客回复微信模板消息 def blog_wechat_message - unless self.parent_id == nil - uw = UserWechat.where(user_id: self.parent.author_id).first - #unless uw.nil? && self.parent.author_id != User.current.id - unless uw.nil? - data = { - touser:uw.openid, - template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", - url:"http://weixin.qq.com/download", - topcolor:"#FF0000", - data:{ - first: { - value:"您的博客有新回复了", - color:"#173177" - }, - keyword1:{ - value:self.author.try(:realname), - color:"#173177" - }, - keyword2:{ - value:self.created_at, - color:"#173177" - }, - keyword3:{ - value:h(truncate(" - #{self.content.html_safe}", length:50, omission: '...')), - color:"#173177" - }, - remark:{ - value:"具体内容请点击详情查看网站", - color:"#173177" - } - } - } - uri = URI("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=1234567") - body = data.to_json - res = Net::HTTP.new(uri.host, uri.port).start do |client| - request = Net::HTTP::Post.new(uri.path) - request.body = body - request["Content-Type"] = "application/json" - client.request(request) - end - end + uw = UserWechat.where(user_id: self.parent.author_id).first + #unless uw.nil? && self.parent.author_id != User.current.id + unless uw.nil? + data = { + touser:uw.openid, + template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", + url:"http://weixin.qq.com/download", + topcolor:"#FF0000", + data:{ + first: { + value:"您的博客有新回复了", + color:"#173177" + }, + keyword1:{ + value:self.author.try(:realname), + color:"#173177" + }, + keyword2:{ + value:format_time(self.created_at), + color:"#173177" + }, + keyword3:{ + value:h(truncate(key3, :length=>50, :omission=> '...')), + color:"#173177" + }, + remark:{ + value:"具体内容请点击详情查看网站", + color:"#173177" + } + } + } + logger.info "start send template message: #{data}" + req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data) + logger.info "send over. #{req}" end end end diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index e1f4766de..670a8341b 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -133,14 +133,9 @@ class HomeworkCommon < ActiveRecord::Base } } } - uri = URI("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=1234567") - body = data.to_json - res = Net::HTTP.new(uri.host, uri.port).start do |client| - request = Net::HTTP::Post.new(uri.path) - request.body = body - request["Content-Type"] = "application/json" - client.request(request) - end + logger.info "start send template message: #{data}" + req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data) + logger.info "send over. #{req}" end end end diff --git a/app/models/journal.rb b/app/models/journal.rb index ed76c65a7..8c0bb8f46 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -256,11 +256,11 @@ class Journal < ActiveRecord::Base color:"#173177" }, keyword2:{ - value:self.created_on, + value:format_time(self.created_on), color:"#173177" }, keyword3:{ - value:h(truncate(" - #{self.description.html_safe}", length:50, omission: '...')), + value:h(truncate(key3, :length=>50, :omission=> '...')), color:"#173177" }, remark:{ @@ -269,14 +269,9 @@ class Journal < ActiveRecord::Base } } } - uri = URI("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=1234567") - body = data.to_json - res = Net::HTTP.new(uri.host, uri.port).start do |client| - request = Net::HTTP::Post.new(uri.path) - request.body = body - request["Content-Type"] = "application/json" - client.request(request) - end + logger.info "start send template message: #{data}" + req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data) + logger.info "send over. #{req}" end end end diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 33dcc78af..739ef9d8f 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -326,11 +326,11 @@ class JournalsForMessage < ActiveRecord::Base color:"#173177" }, keyword2:{ - value:self.created_on, + value:format_time(self.created_on), color:"#173177" }, keyword3:{ - value:h(truncate(" - #{self.notes.html_safe}", length:50, omission: '...')), + value:h(truncate(key3, :length=>50, :omission=> '...')), color:"#173177" }, remark:{ @@ -339,14 +339,9 @@ class JournalsForMessage < ActiveRecord::Base } } } - uri = URI("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=1234567") - body = data.to_json - res = Net::HTTP.new(uri.host, uri.port).start do |client| - request = Net::HTTP::Post.new(uri.path) - request.body = body - request["Content-Type"] = "application/json" - client.request(request) - end + logger.info "start send template message: #{data}" + req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data) + logger.info "send over. #{req}" end end diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 597a2301e..fe6e7d0f2 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -710,7 +710,7 @@ class Mailer < ActionMailer::Base :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}", :filter => true - mail_wechat_message news.author_id, "3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI", "您的课程通知有新回复了", @author.try(:realname), comment.created_on, comment.comments.html_safe + mail_wechat_message news.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的课程通知有新回复了", @author.try(:realname), format_time(comment.created_on), comment.comments.html_safe end end @@ -737,10 +737,10 @@ class Mailer < ActionMailer::Base :filter => true if message.parent_id == nil message.project.members.each do |member| - mail_wechat_message member.user_id, "oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", "项目讨论区有新帖子发布了", message.subject, @author.try(:realname), message.created_on + mail_wechat_message member.user_id, "oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", "项目讨论区有新帖子发布了", message.subject, @author.try(:realname), format_time(message.created_on) end else - mail_wechat_message member.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), message.created_on, message.content.html_safe + mail_wechat_message member.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), format_time(message.created_on), message.content.html_safe end elsif message.course redmine_headers 'Course' => message.course.id, @@ -759,10 +759,10 @@ class Mailer < ActionMailer::Base :filter => true if message.parent_id == nil message.course.members.each do |member| - mail_wechat_message member.user_id, "oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", "课程问答区有新帖子发布了", message.subject, @author.try(:realname), message.created_on + mail_wechat_message member.user_id, "oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", "课程问答区有新帖子发布了", message.subject, @author.try(:realname), format_time(message.created_on) end else - mail_wechat_message member.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), message.created_on, message.content.html_safe + mail_wechat_message member.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), format_time(message.created_on), message.content.html_safe end end end