From 1fa6ac89cec75db5b3b9f74b38c1f405b53a581c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 11:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            | 2 ++
 app/controllers/wechats_controller.rb | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0727a920a..38f29a661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,6 @@ vendor/cache
 /public/files
 /tags
 /config/initializers/gitlab_config.rb
+/config/wechat.yml
+/config/menu.yml
 1234567
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index e6f78bec7..a37b5aaa2 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -146,9 +146,10 @@ class WechatsController < ActionController::Base
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+      pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
-                   pic_url: 'https://test.course.trustie.net/images/weixin_pic.jpg',
+                   pic_url: pic_url,
                    url: url
     end
   end