jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

This commit is contained in:
guange 2016-08-13 15:25:07 +08:00
parent 70d58ccf85 e06f09406c
commit c9d32ca69b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/mobile/apis/users.rb
View File

@ -47,7 +47,7 @@ module Mobile
end end
ws = WechatService.new ws = WechatService.new
ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.login, Time.now.strftime("%Y-%m-%d")) ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.login+"("+user.show_name+")", Time.now.strftime("%Y-%m-%d"))
present status: 0, message: '您已成功绑定Trustie平台' present status: 0, message: '您已成功绑定Trustie平台'
end end
@ -79,7 +79,7 @@ module Mobile
end end
ws = WechatService.new ws = WechatService.new
ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.login, Time.now.strftime("%Y-%m-%d")) ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.login+"("+user.show_name+")", Time.now.strftime("%Y-%m-%d"))
present :data, user, with: Mobile::Entities::User present :data, user, with: Mobile::Entities::User
present :status, 0 present :status, 0
end end

2
app/controllers/wechats_controller.rb
View File

@ -383,7 +383,7 @@ class WechatsController < ActionController::Base
user: user user: user
) )
ws = WechatService.new ws = WechatService.new
ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台！", user.login, format_time(Time.now)) ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台！", user.login+"("+user.show_name+")", format_time(Time.now))
render :json => {status:0, msg: "绑定成功"} render :json => {status:0, msg: "绑定成功"}
rescue Exception=>e rescue Exception=>e
render :json => {status: -1, msg: e.message} render :json => {status: -1, msg: e.message}