This commit is contained in:
parent
f8dfe85156
commit
bd3911c072
|
@ -190,13 +190,13 @@ class IssuesController < ApplicationController
|
|||
@issue.project_issues_index = @issue.project.issues.last.nil? ? 1 : @issue.project.issues.last.project_issues_index + 1
|
||||
if @issue.save
|
||||
|
||||
senduser = User.find(params[:issue][:assigned_to_id])
|
||||
issue_id = @issue.id
|
||||
issue_title = params[:issue][:subject]
|
||||
priority_id = params[:issue][:priority_id]
|
||||
|
||||
ps = ProjectsService.new
|
||||
ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
|
||||
# senduser = User.find(params[:issue][:assigned_to_id])
|
||||
# issue_id = @issue.id
|
||||
# issue_title = params[:issue][:subject]
|
||||
# priority_id = params[:issue][:priority_id]
|
||||
#
|
||||
# ps = ProjectsService.new
|
||||
# ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
|
||||
|
||||
call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
|
||||
respond_to do |format|
|
||||
|
@ -591,16 +591,16 @@ class IssuesController < ApplicationController
|
|||
end
|
||||
@issue.safe_attributes = issue_attributes
|
||||
|
||||
senduser = User.find(params[:issue][:assigned_to_id])
|
||||
|
||||
if senduser.id != User.current.id
|
||||
issue_id = @issue.id
|
||||
issue_title = params[:issue][:subject]
|
||||
priority_id = params[:issue][:priority_id]
|
||||
|
||||
ps = ProjectsService.new
|
||||
ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
|
||||
end
|
||||
# senduser = User.find(params[:issue][:assigned_to_id])
|
||||
#
|
||||
# if senduser.id != User.current.id
|
||||
# issue_id = @issue.id
|
||||
# issue_title = params[:issue][:subject]
|
||||
# priority_id = params[:issue][:priority_id]
|
||||
#
|
||||
# ps = ProjectsService.new
|
||||
# ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
|
||||
# end
|
||||
|
||||
@priorities = IssuePriority.active
|
||||
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
||||
|
|
|
@ -331,28 +331,28 @@ class ProjectsService
|
|||
{:status => status,:message => message}
|
||||
end
|
||||
|
||||
def send_wechat_project_issue_notice user,project,issue_id,issue_title,priority_id
|
||||
count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count
|
||||
if count == 0
|
||||
title = "您有新的issue需要解决"
|
||||
remark = "点击详情查看issue"
|
||||
|
||||
case priority_id
|
||||
when 1
|
||||
priority = "低"
|
||||
when
|
||||
priority = "正常"
|
||||
when
|
||||
priority = "高"
|
||||
when
|
||||
priority = "紧急"
|
||||
when
|
||||
priority = "立刻"
|
||||
end
|
||||
|
||||
ws = WechatService.new
|
||||
ws.project_issue_notice user.id, "issues", issue_id,title, issue_title,priority, remark
|
||||
end
|
||||
end
|
||||
# def send_wechat_project_issue_notice user,project,issue_id,issue_title,priority_id
|
||||
# count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count
|
||||
# if count == 0
|
||||
# title = "您有新的issue需要解决"
|
||||
# remark = "点击详情查看issue"
|
||||
#
|
||||
# case priority_id
|
||||
# when 1
|
||||
# priority = "低"
|
||||
# when
|
||||
# priority = "正常"
|
||||
# when
|
||||
# priority = "高"
|
||||
# when
|
||||
# priority = "紧急"
|
||||
# when
|
||||
# priority = "立刻"
|
||||
# end
|
||||
#
|
||||
# ws = WechatService.new
|
||||
# ws.project_issue_notice user.id, "issues", issue_id,title, issue_title,priority, remark
|
||||
# end
|
||||
# end
|
||||
|
||||
end
|
||||
|
|
|
@ -419,17 +419,17 @@ class WechatService
|
|||
end
|
||||
end
|
||||
|
||||
def project_issue_notice(user_id, type, id, first, key1, key2,remark="")
|
||||
uw = UserWechat.where(user_id: user_id).first
|
||||
unless uw.nil?
|
||||
data = two_keys_template uw.openid,Wechat.config.project_issue_notice, type, id, first, key1, key2,remark
|
||||
begin
|
||||
req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
|
||||
rescue Exception => e
|
||||
Rails.logger.error "[project_issue_notice] ===> #{e}"
|
||||
end
|
||||
Rails.logger.info "send over. #{req}"
|
||||
end
|
||||
end
|
||||
# def project_issue_notice(user_id, type, id, first, key1, key2,remark="")
|
||||
# uw = UserWechat.where(user_id: user_id).first
|
||||
# unless uw.nil?
|
||||
# data = two_keys_template uw.openid,Wechat.config.project_issue_notice, type, id, first, key1, key2,remark
|
||||
# begin
|
||||
# req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
|
||||
# rescue Exception => e
|
||||
# Rails.logger.error "[project_issue_notice] ===> #{e}"
|
||||
# end
|
||||
# Rails.logger.info "send over. #{req}"
|
||||
# end
|
||||
# end
|
||||
|
||||
end
|
|
@ -24,7 +24,6 @@ default: &default
|
|||
create_project_notice: "R2ZaQKJfDJgujPcHWPzadKHIRkIyj2CjX2o_qIuRqig"
|
||||
project_review_notice: "ip192wVXTav3qchgUn9_7B6lFfTlCZjwL7A1tncTOuc"
|
||||
join_project_notice: "3KnMQEMUCmQWkB5JvzrpmguEwnN8bvUHUdpOTudxv_M"
|
||||
project_issue_notice: "HAF2aCta7BtnaOd_cotGvU4tErGWwCd9I9aiClFN7w8"
|
||||
|
||||
auto_openid_url_1: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities"
|
||||
auto_openid_url_2: "&response_type=code&scope=snsapi_base&state="
|
||||
|
|
Loading…
Reference in New Issue