diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f5689ef64..88a524d1e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -123,6 +123,20 @@ class UsersController < ApplicationController
 
   end
 
+  #未读消息弹窗
+  def user_messages_unviewed
+    @message_alls = []
+    messages = MessageAll.where("user_id =?", User.current.id).includes(:message).order("created_at desc")
+    onclick_time = User.current.onclick_time.onclick_time
+    messages.each do |message_all|
+      # 未读的消息存放在数组
+      if (message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0) || (message_all.message_type == "SystemMessage"&& !message_all.message.nil? && message_all.message.created_at > onclick_time)
+        @message_alls << message_all.message
+        break if @message_alls.length == 5
+      end
+    end
+  end
+
   # 用户消息
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复,exercise:课程测验
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index ef59e0ed4..3ccdc3257 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -121,7 +121,7 @@ class WechatsController < ActionController::Base
   on :fallback, respond: 'fallback message'
 
   on :click, with: 'FEEDBACK' do |request, key|
-    request.reply.text "如有反馈问题,请直接切入至输入框,发微信给我们即可"
+    request.reply.text "如有反馈问题，请直接切换至输入框，发微信给我们即可"
   end
 
   on :click, with: 'MY_NEWS' do |request, key|
diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb
index eb2e83ba2..7c5ab571e 100644
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@@ -4,7 +4,7 @@
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
       <li class="fl"><a href="https://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
-      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
         <select class="languageBox">
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 1db3091d7..a639e1203 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -4,7 +4,7 @@
       <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
       <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
       <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index f5b421f62..a87e83238 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -78,12 +78,15 @@
     </ul>
   </div>
 
-  <div class="navHomepageNews">
+  <div class="navHomepageNews" id="user_messages">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target =>"_Blank", :title => "您的所有消息" %>
     <% if User.current.count_new_message.to_i >0 %>
         <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>
 </div>
 
@@ -95,6 +98,16 @@
         $("#navHomepageSearchType").hide();
     });
 
+    /*$("#user_messages").mouseenter(function(){
+        $("#user_messages_list").show();
+        $.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') %>");
+
+    });*/
+
     $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
         $("#topnav_login_list").show();
diff --git a/app/views/layouts/_message_loading.html.erb b/app/views/layouts/_message_loading.html.erb
new file mode 100644
index 000000000..aae55205c
--- /dev/null
+++ b/app/views/layouts/_message_loading.html.erb
@@ -0,0 +1,6 @@
+<font></font>
+<div style="margin: 5px auto;width:150px;">
+  <img class="mr5 fl mt2" src="/images/loading.gif">
+  <span class="fl">正在加载中，请稍后...</span>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
new file mode 100644
index 000000000..27e1d8896
--- /dev/null
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -0,0 +1,74 @@
+<font></font>
+<h4 class="shadowbox_news_title">未读消息</h4>
+<ul class="shadowbox_news_list">
+  <%# user_messages = User.current.user_messages_unviewed %>
+  <% messages.each do |ma| %>
+    <% if ma.class == SystemMessage %>
+      <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
+    <% elsif ma.class == CourseMessage %>
+      <% if ma.course_message_type == "News" %>
+        <li><a href="<%=news_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 发布了通知：<%= ma.course_message.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>发布了通知：<%= ma.course_message.title%></a></li>
+      <% elsif ma.course_message_type == "Comment" %>
+        <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
+          <li><a href="<%= (!User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil?) ? new_student_work_path(:homework => ma.course_message.id) : student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程作业：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程作业：作业标题：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了</a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动了作业匿评：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动了作业匿评：作业标题：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)</a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=User.find(ma.apply_user_id).show_name %> 申请引用作业：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=User.find(ma.apply_user_id).show_name %> </span>申请引用作业：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
+          <li><a href="<%= (User.current.member_of_course?(ma.course_message.course) || User.current.admin? || (ma.course_message.is_open == 1 && ma.course_message.course.is_public == 1)) ? student_work_index_path(:homework => ma.course_message.id) : 'javascript:void(0)' %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "ApplyResource" && ma.status == 0 %>
+          <% if ma.course_message.container_type == "Course" %>
+              <% href = course_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "Project" %>
+              <% href = project_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "OrgSubfield" %>
+              <% href = org_subfield_files_path(ma.course_message.container_id) %>
+          <% else %>
+              <% href = 'javascript:void(0)' %>
+          <% end %>
+          <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.user.show_name %> 申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
+          <% elsif ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+              <% if ma.course_message.container_type == "Course" %>
+                  <% href = course_files_path(ma.course_message.container_id) %>
+              <% elsif ma.course_message.container_type == "Project" %>
+                  <% href = project_files_path(ma.course_message.container_id) %>
+              <% elsif ma.course_message.container_type == "OrgSubfield" %>
+                  <% href = org_subfield_files_path(ma.course_message.container_id) %>
+              <% else %>
+                  <% href = 'javascript:void(0)' %>
+              <% end %>
+              <li><a href="<%= href %>" target="_blank" title="<%=User.find(ma.course_message.apply_user_id).show_name %> <%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=User.find(ma.course_message.apply_user_id).show_name %> </span><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
+          <% elsif ma.course_message_type == "Poll" %>
+              <li><a href="<%= poll_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name%></a></li>
+          <% elsif ma.course_message_type == "Message" %>
+              <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
+              <% href = course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id) %>
+              <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %><%= content%></a></li>
+          <% elsif ma.course_message_type == "StudentWorksScore" %>
+              <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
+          <% elsif ma.course_message_type == "JournalsForMessage" %>
+              <% if ma.course_message.jour_type == 'Course' %>
+                  <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
+              <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+                  <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
+              <% else %>
+                  <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
+              <% end %>
+          <% end %>
+    <% end %>
+  <% end %>
+  <!--<li><span class="shadowbox_news_user">教辅测试老师</span><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试辅测试老辅测试老老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank"><span class="c_red">【课程通知】</span>发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
+-->
+</ul>
+<%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
\ No newline at end of file
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 3524de0c8..ca179f9fc 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -95,7 +95,7 @@
       </div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= reply.content.html_safe%></div>
+        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= h reply.content%></div>
       </div>
       <script type="text/javascript">
           $(function(){
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 60d5b6ed8..0c18dbcc3 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -259,7 +259,7 @@
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
             :
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || ma.course_message.is_open == 1 %>
+            <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || (ma.course_message.is_open == 1 && ma.course_message.course.is_public == 1) %>
                 <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
             <% else %>
                 <span title='<%=link_str %>' style="color:#4b4b4b; cursor: default;" class="<%= ma.viewed == 0 ? 'newsBlack' : 'newsGrey'%>"><%=link_str %></span>
@@ -399,7 +399,7 @@
                   <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                 </ul>
             <% end %>
-            <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+        <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl">
                     <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
diff --git a/app/views/users/user_messages_unviewed.js.erb b/app/views/users/user_messages_unviewed.js.erb
new file mode 100644
index 000000000..1019050c9
--- /dev/null
+++ b/app/views/users/user_messages_unviewed.js.erb
@@ -0,0 +1 @@
+$("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/show_messages_list', :locals => {:messages => @message_alls}) %>");
\ No newline at end of file
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index b45587ae0..79e2e05e2 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="wechat">
 <head>
-  <title>最新动态</title>
+  <title>我的动态</title>
   <meta charset='utf-8' />
   <meta name="keywords" content="" />
   <meta name="description" content="" />
diff --git a/config/menu.yml b/config/menu.yml
index 79659fb90..155553bc2 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -1,8 +1,8 @@
 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"
+  name: "我的动态"
+  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/routes.rb b/config/routes.rb
index 74b4e09aa..3a34f0a6b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -546,6 +546,7 @@ RedmineApp::Application.routes.draw do
       get  'new_user_commit_homework'
       get 'reply_to'
       get 'show_all_replies'
+      get 'user_messages_unviewed'
       post "user_commit_homework"
       post 'user_select_homework'
     end
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
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 63e88490f..b4920838a 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="wechat">
 <head>
-    <title>最新动态</title>
+    <title>我的动态</title>
     <meta charset='utf-8' />
     <meta name="keywords" content="" />
     <meta name="description" content="" />
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 063e2b301..240b7e9ac 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1619,3 +1619,15 @@ ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 /*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/
 .wlist_select a{background-color: #64bdd9;cursor: default;}
+
+/*消息弹框*/
+.shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
+.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_list a{ color:#999;}
+.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:hover{ background-color:#eee;}
+span.shadowbox_news_user{ color:#3b94d6;}
+a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
+
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 0919d8ae0..c44b58b76 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1149,3 +1149,14 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 
 /*弹框*/
 .apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+
+/*消息弹框*/
+.shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
+.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_list a{ color:#999;}
+.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:hover{ background-color:#eee;}
+span.shadowbox_news_user{ color:#3b94d6;}
+a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}