From 084b545be97c9d436a1be66107791eda31535c1b Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 24 Jun 2016 17:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb |  2 +-
 config/wechat.yml                     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 2afb85ace..912d92c70 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -4,7 +4,7 @@ class WechatsController < ActionController::Base
 
   include ApplicationHelper
   # ROOT_URL = "#{Setting.protocol}://#{Setting.host_name}/"
-  ROOT_URL = "http://wechat.trustie.net"
+  ROOT_URL = "http://www.trustie.net"
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
diff --git a/config/wechat.yml b/config/wechat.yml
index 711f2f1f8..1e3389837 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -5,14 +5,14 @@ default: &default
 # Or if using public account, only need above two line
 
   # guange test
-  appid: "wxf694495398c7d470"
-  secret: "743e038392f1d89540e95f8f7645849a"
+  #appid: "wxf694495398c7d470"
+  #secret: "743e038392f1d89540e95f8f7645849a"
 
-#  appid: "wx8e1ab05163a28e37"
-#  secret: "beb4d3bc4b32b3557811680835357841"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
 
   token:    "123456"
-  access_token: "1234567"
+  access_token: ".access_token"
   encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
@@ -30,4 +30,4 @@ development:
   <<: *default
 
 test:
-  <<: *default
\ No newline at end of file
+  <<: *default