From 8c2ae92d310da606e2fa136e364e75d86ce6314f Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 15 Jul 2016 14:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=80=A7=E8=83=BD=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile              | 2 +-
 config/menu.yml.test | 9 +++------
 config/oneapm.yml    | 4 ++--
 config/wechat.yml    | 8 ++++----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3bea83669..03dbb5785 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ gem 'elasticsearch-rails'
 
 
 ### profile
-#gem 'oneapm_rpm'
+gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'
diff --git a/config/menu.yml.test b/config/menu.yml.test
index a163bac61..a43d72816 100644
--- a/config/menu.yml.test
+++ b/config/menu.yml.test
@@ -2,21 +2,18 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_b
-ase&state=activities#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://ucloudtest.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
  -
   name: "我的课程"
   sub_button:
   -
     type: "view"
     name: "课程"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi
-_base&state=class_list#wechat_redirect"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://ucloudtest.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
   -
     type: "view"
     name: "资源"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi
-_base&state=myresource#wechat_redirect"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://ucloudtest.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
 
  -
   name: "更多"
diff --git a/config/oneapm.yml b/config/oneapm.yml
index 7e85a3c65..3ab2385f5 100644
--- a/config/oneapm.yml
+++ b/config/oneapm.yml
@@ -11,7 +11,7 @@ common: &default_settings
   # 如果您修改了此处的app_name，一个新的应用会出现在后台，
   # 数据会上传到这个新应用，并停止向旧的应用上传数据。
   #
-  app_name: trustie
+  app_name: trustie_wechat
 
 #
 # 环境相关配置
@@ -25,7 +25,7 @@ development:
   <<: *default_settings
   # development模式下，探针开启并上传性能数据
   monitor_mode: true
-  app_name: trustie(Development)
+  app_name: My Application (Development)
 
 test:
   <<: *default_settings
diff --git a/config/wechat.yml b/config/wechat.yml
index d243ca44c..5740be9a6 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -8,12 +8,12 @@ default: &default
   #secret: "743e038392f1d89540e95f8f7645849a"
 
   #production
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+  #appid: "wx8e1ab05163a28e37"
+  #secret: "beb4d3bc4b32b3557811680835357841"
 
   #test
-  #appid: "wxc09454f171153c2d"
-  #secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
 
   token:    "123456"
   access_token: "1234567"