From ae080314408e0e672fd79a1b087aba265ebc1f14 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Apr 2016 15:54:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E6=94=BE=E8=B7=A8=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile               | 1 +
 config/application.rb | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index 9fe511a59..a74d883fa 100644
--- a/Gemfile
+++ b/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"
diff --git a/config/application.rb b/config/application.rb
index 0c55fc75f..a1e14e0d9 100644
--- a/config/application.rb
+++ b/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
 

From bb5a527f9e73f16fa4d9218667ba0b4fb25f9492 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Apr 2016 15:57:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/menu.yml                  | 2 +-
 public/javascripts/wechat/app.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/menu.yml b/config/menu.yml
index afb2ef0f7..99c0cf583 100644
--- a/config/menu.yml
+++ b/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: "意见返馈"
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index cb77c6b0f..b9e0e1958 100644
--- a/public/javascripts/wechat/app.js
+++ b/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";