Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/constraint/admin_constraint.rb

@@ -1,7 +1,7 @@
 class AdminConstraint
   def matches?(request)
-    return false unless request.session[:user_id]
-    user = User.find request.session[:user_id]
+    return false unless request.session[:newweb_user_id]
+    user = User.find request.session[:newweb_user_id]
     user && user.admin?
   end
 end

app/controllers/weapps/courses_controller.rb

@@ -150,13 +150,13 @@ class Weapps::CoursesController < Weapps::BaseController
           new_student.is_active = 0 if correspond_teacher_exist
           new_student.save!
 
-          CourseAddStudentCreateWorksJob.perform_later(@course.id, user_id)
+          CourseAddStudentCreateWorksJob.perform_later(@course.id, [user_id])
           # StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
         elsif !params[:roles].include?("STUDENT") && student_member.present?
           # 删除学生身份时激活老师身份
           teacher_member.update_attributes!(is_active: 1) if student_member.is_active && teacher_member.present?
           student_member.destroy!
-          CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, user_id)
+          CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [user_id])
           # CourseDeleteStudentNotifyJob.perform_later(@course.id, [params[:user_id]], current_user.id)
         elsif params[:roles].include?("STUDENT") && student_member.present? && !params[:roles].include?("PROFESSOR") && !params[:roles].include?("ASSISTANT_PROFESSOR")
           # 学生身份存在且学生没有教师身份时更新is_active

app/services/admins/check_shixun_mirrors_service.rb

@@ -75,13 +75,12 @@ class Admins::CheckShixunMirrorsService < ApplicationService
 
   def bridge_images
     @_bridge_images ||= begin
-      url = EduSetting.get('cloud_bridge')
+      url = "#{EduSetting.get('cloud_bridge')}/bridge/docker/images"
       res = Faraday.get(url)
-      res_body = JSON.parse(res.body)
+      res = JSON.parse(res.body)
+      raise Error, '拉取镜像信息异常' if res && res['code'] != 0
 
-      raise Error, '拉取镜像信息异常' if res_body && res_body['code'].to_i != 0
-
-      res_body
+      res
     rescue => e
       Rails.logger.error("get response failed ! #{e.message}")
       raise Error, '实训云平台繁忙（繁忙等级：84）'