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

config/menu.yml

@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "最新动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.course.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见返馈"

public/javascripts/wechat/app.js

@@ -1,5 +1,5 @@
 var app = angular.module('wechat', ['ngRoute','ngCookies']);
-var apiUrl = 'http://test.course.trustie.net/api/v1/';
+var apiUrl = '/api/v1/';
 var debug = false; //调试标志,如果在本地请置为true
 
 if(debug===true){