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

app/controllers/myshixuns_controller.rb

@@ -247,7 +247,7 @@ class MyshixunsController < ApplicationController
   def update_file
     begin
       @hide_code = Shixun.where(id: @myshixun.shixun_id).pluck(:hide_code).first
-      tip_exception("技术平台为空!") if @myshixun.mirror_name.blank?
+      tip_exception("实验环境不能为空，请查看实训模板的环境配置项是否正确!") if (@myshixun.mirror_name.blank? || @myshixun.mirror_name.first.to_s == "-1")
       path = params[:path].strip unless params[:path].blank?
       game_id = params[:game_id]
       game = Game.find(game_id)

public/react/src/App.js

@@ -71,6 +71,11 @@ const Otherlogin=Loadable({
 	loader: () => import('./modules/login/Otherlogin'),
 	loading: Loading,
 })
+// 学院统计
+const College = Loadable({
+	loader: () => import('./college/College'),
+	loading: Loading
+})
 
 const Otherloginstart=Loadable({
 	loader: () => import('./modules/login/Otherloginstart'),