Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/libs/user_online.rb

@@ -11,7 +11,7 @@ module UserOnline
     def set_bit(user_id, flag)
       if !Rails.cache.data.exists(cache_key)
         Rails.cache.data.setbit(cache_key, user_id, flag)
-        Rails.cache.data.expire(cache_key, 20 * 60 + 10)
+        Rails.cache.data.expire(cache_key, 2 * 60 + 10)
       else
         Rails.cache.data.setbit(cache_key, user_id, flag)
       end
@@ -27,11 +27,11 @@ module UserOnline
 
     def cache_key
       if Rails.cache.is_a?(ActiveSupport::Cache::RedisStore)
-        # 10分钟为一段记录用户在线, 统计范围为20分钟内的线用户
+        # 如设置2分钟内即120秒有请求的用户视为在线, 则最大会统计到4分钟内有活动用户
         # TODO 更精确时长
         begin_hour = Time.now.beginning_of_hour
-        minutes_piece = (Time.now - begin_hour) / 600
-        time = begin_hour.since((minutes_piece.to_i - 1) * 600).strftime("%H-%M")
+        minutes_piece = (Time.now - begin_hour) / 120
+        time = begin_hour.since((minutes_piece.to_i - 1) * 120).strftime("%H-%M")
         "online_user_#{time}"
       else
         raise '请配置config.cache_store = redis_store'