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

app/controllers/live_links_controller.rb

@@ -1,8 +1,7 @@
 class LiveLinksController < ApplicationController
   before_action :require_login
   before_action :find_course, only: [:index, :create]
-  before_action :user_course_identity
-  before_action :teacher_allowed, only: [:create]
+  before_action :user_course_identity, :teacher_allowed, only: [:create]
 
   def index
     lives = @course.live_links.order("id desc")

app/services/admins/import_course_member_service.rb

@@ -36,10 +36,10 @@ class Admins::ImportCourseMemberService < ApplicationService
 
     member = course.course_members.find_by(user_id: user.id, role: data.role.to_i)
     # 如果已是课堂成员且是学生身份and不在指定的分班则移动到该分班
-    if member.present? && member.role == 'STUDENT' && course_group && member.course_group_id != course_group&.id
-      member.update!(course_group_id: course_group&.id)
+    if member.present? && member.role == 'STUDENT' && course_group && member.course_group_id != course_group&.id.to_i
+      member.update!(course_group_id: course_group&.id.to_i)
     elsif member.blank?
-      course.course_members.create!(user_id: user.id, role: data.role.to_i, course_group_id: course_group&.id)
+      course.course_members.create!(user_id: user.id, role: data.role.to_i, course_group_id: course_group&.id.to_i)
       extra =
         case data.role.to_i
         when 2 then 9

app/views/live_links/index.json.jbuilder

@@ -1,5 +1,6 @@
 json.lives @lives do |live|
-  json.(live, :id, :url, :description, :on_status)
+  json.(live, :id, :description, :on_status)
+  json.url live.on_status ? live.url : ""
   json.author_name live.user.show_real_name
   json.author_login live.user.login
   json.author_img url_to_avatar(live.user)

config/locales/zh-CN.yml

@@ -170,7 +170,7 @@ zh-CN:
         name: '名称'
       tag_discipline:
         name: '名称'
-      live:
+      live_link:
         description: '说明'
         url: '链接'