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

Gemfile

@@ -17,6 +17,7 @@ gem 'delayed_job_active_record'#, :group => :production
 gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
+gem 'rack-cors', :require => 'rack/cors'
 gem 'seems_rateable', '~> 1.0.13'
 gem 'rails', '~> 3.2'
 gem "jquery-rails", "~> 2.0.2"

config/application.rb

@@ -71,6 +71,14 @@ module RedmineApp
 
     config.action_view.sanitized_allowed_tags = 'div', 'p', 'span', 'img', 'embed'
 
+    config.middleware.use Rack::Cors do
+      allow do
+        origins '*'
+        # location of your API
+        resource '/api/*', :headers => :any, :methods => [:get, :post, :options, :put]
+      end
+    end
+
     config.before_initialize do
     end
 

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://wechat.trustie.net/assets/wechat/activities.html&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://wechat.trustie.net/assets/wechat/app.html&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见返馈"

public/javascripts/wechat/app.js

@@ -2,7 +2,7 @@ var app = angular.module('wechat', ['ngRoute']);
 var apiUrl = 'http://wechat.trustie.net/api/v1/';
 //var openid= "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
 var openid = '';
-var debug = true; //调试标志,如果在本地请置为true
+var debug = false; //调试标志,如果在本地请置为true
 
 if(debug){
     openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";