班级主页相关缓存增加

app/views/courses/_course_activity_users.html.erb

@@ -23,7 +23,7 @@
           总得分为以上得分之和</div>
       </div>
       <% contributor_course_scor(course.id).each do |contributor_score| %>
-          <% cache [:user_contributor_score,contributor_score.id.to_s+"-"+contributor_score.updated_at.to_i.to_s+"-"+contributor_score.user.updated_on.to_i.to_s] do%>
+          <%# cache [:user_contributor_score,contributor_score.id.to_s+"-"+contributor_score.updated_at.to_i.to_s+"-"+contributor_score.user.updated_on.to_i.to_s] do%>
               <% total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 +
                       contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 +
                       + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
@@ -62,7 +62,7 @@
                     </div>
                   </li>
               <% end %>
-          <% end %>
+          <%# end %>
       <% end %>
       <div class="cl"></div>
       </ul>

app/views/files/_course_file.html.erb

@@ -70,6 +70,7 @@
 </script>
 
 <div class="homepageRight mt0 ml10">
+  <% cache [:course_resource_right_menu,@course.id.to_s] do%>
       <div class="homepageRightBanner">
         <div class="NewsBannerName">资源库</div>
         <ul class="resourcesSelect">
@@ -86,6 +87,7 @@
           </li>
         </ul>
       </div>
+  <% end %>
   <div class="cl"></div>
   <% unless User.current.logged? %>
       <div class="syllabusbox_tishi mt10">
@@ -95,6 +97,7 @@
       </div>
   <% end %>
   <div class="resources mt10 pr" style="padding-bottom:5px;">
+    <% cache [:course_resource_head,@course.id.to_s] do%>
         <div class="reTop mb5">
           <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
               <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
@@ -123,6 +126,7 @@
             </p>
           </div>
         </div>
+    <% end %>
     <div class="cl"></div>
     <% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %>
         <div class="resource_tip_box fontGrey2">

app/views/files/_resource_detail.html.erb

@@ -27,6 +27,7 @@
             <span class="grey_homework_btn_cir ml5"><%=file.publish_time %>&nbsp;&nbsp;0点发布</span>
         <% end %>
       </div>
+      <% cache [:resource_detail,file.id.to_s] do%>
           <div class="mt5">
             <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
             <% if file.tag_list.length > 0%>
@@ -35,9 +36,10 @@
             <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
             <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
           </div>
+      <% end %>
       <%# unless file.description.blank? %>
           <div class="cl"></div>
-          <% if User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course")) %>
+          <% if (User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"))) %>
             <div>
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>

app/views/layouts/_course_base_info.html.erb

@@ -1,7 +1,7 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
-<% teacher_num = TeacherAndAssistantCount(@course) %>
+<%# teacher_num = TeacherAndAssistantCount(@course) %>
-<% student_num = studentCount(@course) %>
+<%# student_num = studentCount(@course) %>
-<% course_file_num = visable_attachemnts_incourse(@course).count %>
+<%# course_file_num = visable_attachemnts_incourse(@course).count %>
 <p class="sy_cgrey mb10 mr20">
   <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cgrey') %>
   &nbsp;&gt;&nbsp;
@@ -29,6 +29,8 @@
 <% end %>
 
 <div class="cl"></div>
+<!-- logo 根据是否是老师显示不同-->
+<% cache [:course_logo,@course.id.to_s+"-"+is_teacher.to_s] do%>
 <div class="sy_class_logo fl">
   <div class="pr" style="width: 96px; height:96px;">
      <% if is_teacher%>
@@ -41,6 +43,9 @@
   <% end %>
   </div>
 </div>
+<% end %>
+<!--邀请码根据是否是成员显示不同-->
+<% cache [:course_invite,@course.id.to_s+"-"+(User.current.admin? || User.current.member_of_course?(@course)).to_s] do%>
 <div class="sy_class_id fl">
   <p>邀 请 码<br />
     <span class="sy_corange">
@@ -52,18 +57,20 @@
     </span>
   </p>
 </div>
+<% end %>
 <div class="sy_class_info fl ml15">
+  <!--中间的头部-->
+  <% cache [:course_righthead,@course.id.to_s] do%>
       <div  class="sy_class_titbox">
         <h3 class="fl sy_class_title"><%=@course.name %></h3>
         <span class="<%= @course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
         <p class="sy_cgrey fl mt3">
-      <span class=" mr15">教师：<%= course_teacher_link teacher_num %></span>
+          <span class=" mr15">教师：<%= course_teacher_link TeacherAndAssistantCount(@course) %></span>
-      <span class=" mr15">学生：<%= course_student_link student_num %></span>
+          <span class=" mr15">学生：<%= course_student_link studentCount(@course) %></span>
-      <span class=" mr15">资源：<%= link_to course_file_num, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %></span>
+          <span class=" mr15">资源：<%= link_to visable_attachemnts_incourse(@course).count, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %></span>
         </p>
         <div class="cl"></div>
       </div>
-  <% cache [:course_title,@course.id,@course.updated_at.to_i] do%>
       <p class="sy_cgrey mb5">
         <span class=" mr15">主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %></span>
         <span class=" mr15">学时：<span  class="sy_cblack"><%= @course.class_period %>学时</span></span>

app/views/layouts/base_courses.html.erb

@@ -56,6 +56,7 @@
 
   <div class="sy_content">
     <div class="sy_class_l fl" id="courseLSide">
+      <% cache [:course_leftmenu,@course.id.to_s+"-"+@course.updated_at.to_i.to_s] do%>
           <div class="sy_class_leftnav mb12">
             <ul class="accordion">
               <% unless show_nav?(@course.course_activities.count) %>
@@ -127,14 +128,21 @@
               <% end %>
             </ul>
           </div><!--sy_class_leftnav end-->
+      <% end %>
       <%# 课程活跃度 %>
+      <% cache [:course_activity_users,@course.id.to_s] do%>
         <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
+      <% end %>
       <%# 课程英雄榜 %>
+      <% cache [:course_heroes,@course.id.to_s] do%>
         <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
+      <% end %>
+      <% cache [:course_recommendation] do%>
           <div class="sy_class_leftbox" >
             <h3 class="fontGrey7">班级推荐</h3>
             <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
           </div>
+      <% end %>
       <%# 更新访问数,刷新的时候更新访问次数 %>
       <%  update_visiti_count @course %>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>

app/views/users/_user_homework_detail.html.erb

@@ -1,5 +1,6 @@
 <% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %>
 <div class="HomeWork mb10" id="homework_common_<%= homework_common.id %>">
+  <% cache [:user_homework_detail,@course.id.to_s+"-"+homework_common.id.to_s+"-"+is_teacher.to_s+"-"+(User.current.member_of_course?(homework_common.course) || User.current.admin? || homework_common.is_open == 1).to_s+"-"+homework_common.updated_at.to_i.to_s] do%>
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
@@ -302,6 +303,7 @@
     </div>
     <div class="cl"></div>
   </div>
+  <% end %>
 
   <% count=homework_common.journals_for_messages.count %>
   <div class="homepagePostReply">

config/environments/development.rb

@@ -13,7 +13,7 @@ RedmineApp::Application.configure do
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = true
   # config.cache_store = :file_store,  "#{Rails.root }/files/cache_store/"
-  config.cache_store = :redis_store, 'redis://127.0.0.1:6379/0/cache', { expires_in: 90.minutes  }
+  config.cache_store = :redis_store, 'redis://127.0.0.1:6379/0/cache', { expires_in: 1.minutes  }
   #config.cache_store = :dalli_store
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true