From ee12b3540bd88b1806133498eea8eba78637c235 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Jun 2016 11:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97=E7=9A=84?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F=E3=80=81=E5=BE=AE=E4=BF=A1=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                 |  2 ++
 app/views/layouts/_logined_header.html.erb | 14 +++++++-------
 config/menu.yml                            |  6 +++---
 config/wechat.yml                          | 14 +++++++-------
 4 files changed, 19 insertions(+), 17 deletions(-)

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/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 7ba0a23be..a87e83238 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -84,9 +84,9 @@
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
-    <div class="shadowbox_news undis" id="user_messages_list">
-      <%=render :partial => 'layouts/message_loading' %>
-    </div>
+    <!--<div class="shadowbox_news undis" id="user_messages_list">
+      <%#=render :partial => 'layouts/message_loading' %>
+    </div>-->
   </div>
 </div>
 
@@ -98,15 +98,15 @@
         $("#navHomepageSearchType").hide();
     });
 
-    $("#user_messages").mouseenter(function(){
+    /*$("#user_messages").mouseenter(function(){
         $("#user_messages_list").show();
-        $.get('<%=user_messages_unviewed_users_path %>');
+        $.get('<%#=user_messages_unviewed_users_path %>');
         $("#ajax-indicator").hide();
     }).mouseleave(function(){
         $("#user_messages_list").hide();
-        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+        $("#user_messages_list").html("<%#=escape_javascript(render :partial => 'layouts/message_loading') %>");
 
-    });
+    });*/
 
     $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
diff --git a/config/menu.yml b/config/menu.yml
index 79659fb90..56966cb5f 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=https://test.course.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   type: "click"
   name: "意见反馈"
@@ -13,8 +13,8 @@ button:
   -
     type: "view"
     name: "进入网站"
-    url:  "https://test.course.trustie.net/"
+    url:  "https://www.trustie.net/"
   -
     type: "view"
     name: "使用手册"
-    url:  "https://test.course.trustie.net/organizations/1/downloads"
\ No newline at end of file
+    url:  "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
diff --git a/config/wechat.yml b/config/wechat.yml
index 3d679c4ce..d9a091db9 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,19 +3,19 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wxc09454f171153c2d"
-  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
-  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
-  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
-  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
+  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
+  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
+  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
 
 production:
   <<: *default