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 @@
<%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %>
<% end %>
<%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
-
- <%=render :partial => 'layouts/message_loading' %>
-
+
@@ -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