Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

merge oj

app/controllers/application_controller.rb

@@ -26,7 +26,7 @@ class ApplicationController < ActionController::Base
 		unless Rails.env.development?
 			Rails.logger.info("66666  #{params}")
 			suffix = request.url.split(".").last.split("?").first
-			suffix_arr = ["xls", "xlsx", "pdf"] # excel文件先注释
+			suffix_arr = ["xls", "xlsx", "pdf", "zip"] # excel文件先注释
 			unless suffix_arr.include?(suffix)
 				if params[:client_key].present?
 					randomcode = params[:randomcode]

app/controllers/shixuns_controller.rb

@@ -147,7 +147,7 @@ class ShixunsController < ApplicationController
 	## 实训详情
 	def show
 		# 当前用户开启的实训
-		can_fork = current_user.is_certification_teacher || current_user.admin?
+		can_fork = current_user.is_certification_teacher || current_user.admin_or_business?
 		unless can_fork
 			@can_fork = {can_fork: "已经职业认证的教师才能fork实训",
 									 certi_url: "/account/certification"}