From 67e1cae3b4c32d003f5a731feff25159b67e5a10 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 19 Sep 2019 14:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E8=AF=BE=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 26 ++++++++++++++++++++++-
 app/models/user.rb                        | 23 --------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8797c4074..daea45169 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -250,8 +250,9 @@ class ApplicationController < ActionController::Base
 		# 开放课程通过链接访问的用户
 		if !User.current.logged? && !params[:chinaoocTimestamp].blank? && !params[:websiteName].blank? && !params[:chinaoocKey].blank?
 			content = "#{OPENKEY}#{params[:websiteName]}#{params[:chinaoocTimestamp]}"
+
 			if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
-				user = User.open_class_user
+				user = open_class_user
 				start_user_session(user) if user
 				User.current = user
 			end
@@ -615,4 +616,27 @@ class ApplicationController < ActionController::Base
 	def set_export_cookies
 		cookies[:fileDownload] = true
 	end
+
+	# 149课程的评审用户数据创建（包含创建课堂学生）
+	def open_class_user
+		user = User.find_by(login: "OpenClassUser")
+		unless user
+			ActiveRecord::Base.transaction do
+				user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
+											 nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
+											 password: "12345678", phone: "11122223333", profile_completed: 1}
+				user = User.create!(user_params)
+
+				UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396
+
+				subject = Subject.find_by(id: 149)
+				if subject
+					subject.courses.each do |course|
+						CourseMember.create!(course_id: course.id, role: 4, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
+					end
+				end
+			end
+		end
+		user
+	end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index ebf68cce6..12759ea4d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -610,29 +610,6 @@ class User < ApplicationRecord
     admin? || business?
   end
 
-  # 149课程的评审用户数据创建（包含创建课堂学生）
-  def open_class_user
-    user = User.find_by(login: "OpenClassUser")
-    unless user
-      ActiveRecord::Base.transaction do
-        user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
-                       nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
-                       password: "12345678", phone: "11122223333", profile_completed: 1}
-        user = User.create!(user_params)
-
-        UserExtension.create!(user_id: user.id, gender: 0, school_id: 117, :identity => 1, :student_id => "openclassuser")
-
-        subject = Subject.find_by(id: 149)
-        if subject
-          subject.courses.each do |course|
-            CourseMember.create!(course_id: course.id, role: 4, user_id: user.id) if !course.course_students.exists?(user_id: user.id)
-          end
-        end
-      end
-    end
-    user
-  end
-
   protected
   def validate_password_length
     # 管理员的初始密码是5位