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

app/views/stages/_stage.json.jbuilder

@@ -18,6 +18,6 @@ json.shixuns_list do
         json.challenges_count shixun.challenges_count
         json.complete_status stage_myshixun_status(myshixuns.select{|ms| ms.shixun_id == shixun.id}.first)
         json.shixun_status stage_shixun_status(subject.status, shixun.status, shixun.hidden)
-        json.allow_visit shixun.has_manager?(User.current)
+        json.allow_visit User.current.shixun_permission(shixun)
     end
 end