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-04-08 21:46:56 +08:00
parent 9ae030ed9e 281fcf315f
commit 96dfeead0f
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/blog_comment.rb
View File

@ -84,7 +84,7 @@ class BlogComment < ActiveRecord::Base
data = { data = {
touser:uw.openid, touser:uw.openid,
template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c",
url:"http://weixin.qq.com/download", url:"http://www.trustie.net/",
topcolor:"#FF0000", topcolor:"#FF0000",
data:{ data:{
first: { first: {

2
app/models/homework_common.rb
View File

@ -109,7 +109,7 @@ class HomeworkCommon < ActiveRecord::Base
data = { data = {
touser:uw.openid, touser:uw.openid,
template_id:"3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI", template_id:"3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI",
url:"http://weixin.qq.com/download", url:"http://www.trustie.net/",
topcolor:"#FF0000", topcolor:"#FF0000",
data:{ data:{
first: { first: {

2
app/models/journal.rb
View File

@ -245,7 +245,7 @@ class Journal < ActiveRecord::Base
data = { data = {
touser:uw.openid, touser:uw.openid,
template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c",
url:"http://weixin.qq.com/download", url:"http://www.trustie.net/",
topcolor:"#FF0000", topcolor:"#FF0000",
data:{ data:{
first: { first: {

2
app/models/journals_for_message.rb
View File

@ -314,7 +314,7 @@ class JournalsForMessage < ActiveRecord::Base
data = { data = {
touser:uw.openid, touser:uw.openid,
template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c",
url:"http://weixin.qq.com/download", url:"http://www.trustie.net/",
topcolor:"#FF0000", topcolor:"#FF0000",
data:{ data:{
first: { first: {

2
app/models/mailer.rb
View File

@ -1128,7 +1128,7 @@ class Mailer < ActionMailer::Base
data = { data = {
touser:uw.openid, touser:uw.openid,
template_id:template_id, template_id:template_id,
url:"http://weixin.qq.com/download", url:"http://www.trustie.net/",
topcolor:"#FF0000", topcolor:"#FF0000",
data:{ data:{
first: { first: {

4
public/javascripts/wechat/app.js
View File

@ -1,6 +1,6 @@
var app = angular.module('wechat', ['ngRoute','ngCookies']); var app = angular.module('wechat', ['ngRoute','ngCookies']);
var apiUrl = 'http://wechat.trustie.net/api/v1/'; var apiUrl = 'http://wechat.trustie.net/api/v1/';
var debug = false; //调试标志,如果在本地请置为true var debug = true; //调试标志,如果在本地请置为true
if(debug===true){ if(debug===true){
apiUrl = 'http://localhost:3000/api/v1/'; apiUrl = 'http://localhost:3000/api/v1/';
@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
var _openid = ''; var _openid = '';
if(debug===true){ if(debug===true){
_openid = "1"; _openid = "6";
} }
var getOpenId = function() { var getOpenId = function() {