项目首页缓存设置

Signed-off-by: alan <547533434@qq.com>

Gemfile

@@ -28,7 +28,7 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-gem "rmagick", ">= 2.0.0"
+#gem "rmagick", ">= 2.0.0"
 
 group :development do
   gem 'grape-swagger'

app/controllers/welcome_controller.rb

@@ -19,13 +19,14 @@ class WelcomeController < ApplicationController
   include ApplicationHelper
   include WelcomeHelper
   helper :project_score
-  caches_action :robots, :course, :contest, :index, expires_in: 2.hours, layout: false
+  caches_action :robots, :course, :contest,  expires_in: 2.hours, layout: false
   #before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
     # 企业版定制: params[:project]为传过来的参数
+
       unless params[:organization].nil?
         @organization = Organization.find params[:organization]
         # @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
@@ -84,6 +85,7 @@ class WelcomeController < ApplicationController
             @projects = @projects_all.order("score desc")
         end
       end
+
   rescue Exception => e
     render_404
   end

app/views/layouts/_base_header.html.erb

@@ -1,11 +1,13 @@
 <%= render :partial => "layouts/base_feedback" %>
 <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">
+
 	<div class="welcome_logo">
 		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px")%>
 	</div>
 	<div id="account">
 		<%= render_menu :account_menu -%>
 	</div>
+
   <% if User.current.logged? -%>
 	<div id="loggedas">
 	<ul style="padding:0 0; margin:0 0;display:inline;">

app/views/layouts/_user_courses_list.html.erb

@@ -3,12 +3,14 @@
       <%=link_to l(:label_my_course), user_courses_user_path(User.current.id) %>
       <ul class="course_sub_menu">
         <% course_index = 0 %>
-        <% cache User.current.courses.each do |course| %>
+        <% cache User.current.courses.count do%>
+        <%  User.current.courses.each do |course| %>
             <% if !course_endTime_timeout?(course) %>
                 <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
                 <% course_index += 1 %>
             <% end %>
         <% end %>
+       <% end %>
       </ul>
     </li>
 <% end %>

app/views/layouts/_user_project_list.html.erb

@@ -2,11 +2,13 @@
     <li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name} %>
       <ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
+        <% cache User.current.projects.count do%>
         <% User.current.projects.each do |project| %>
             <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
             </li>
         <% end %>
+        <% end %>
       </ul>
     </li>
 <% end %>

app/views/welcome/index.html.erb

@@ -68,7 +68,7 @@
 </div>
 
 <div style="clear:both"></div>
-
+<% cache :expire_in => 2.hours do%>
 <div id="J_Slide" class="d-p-index-box d-p-index-hot">
 	<h3 style="margin-left: 5px; color: #e8770d;"><strong> <%= l(:lable_hot_projects)%> </strong></h3>
 	<span style="margin-top: -20px;float: right; display: block;"> <% if User.current.logged? %>
@@ -113,7 +113,7 @@
 		</ul>
 	</div>
 </div>
-
+<% end %>
 <div class="right" style="float: right; width: 48%; padding-top: 8px;">
 	<ul class="welcome-message-list">
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
@@ -123,6 +123,7 @@
 		</div>
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(12) %>
+            <% cache topics.maximum(:created_at) do%>
 		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
                 <li class="message-brief-intro" style="line-height:1.4em;">
                     <div class='memo_title text_nowrap'>
@@ -151,7 +152,8 @@
                         </span>
                     </div>
                 </li>
-              <%end %>
+              <% end %>
+            <% end %>
 		</div>
 	</ul>
 </div>

db/schema.rb

@@ -438,13 +438,6 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -659,16 +652,6 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"