Merge branch 'develop' into standalone_develop

app/controllers/project_rank_controller.rb

@@ -1,10 +1,10 @@
 class ProjectRankController < ApplicationController
   # 根据时间获取热门项目
   def index 
-    $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names)
+    $redis_cache.zunionstore("recent-days-project-rank-#{time}", get_timeable_key_names)
     deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
-    $redis_cache.zrem("recent-days-project-rank", deleted_data) unless deleted_data.blank?
-    @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 9, withscores: true)
+    $redis_cache.zrem("recent-days-project-rank-#{time}", deleted_data) unless deleted_data.blank?
+    @project_rank = $redis_cache.zrevrange("recent-days-project-rank-#{time}", 0, 9, withscores: true)
   rescue Exception => e
     @project_rank = []
   end