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

# Conflicts:
#	app/models/user.rb

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

app/controllers/subjects_controller.rb

@@ -368,7 +368,7 @@ class SubjectsController < ApplicationController
         @schools.map do |s|
           school_courses = Course.where(id: course_ids, school_id: s.id)
           course_count = school_courses.count
-          student_count = StudentsForCourse.where(course_id: school_courses.pluck(:id)).count
+          student_count = CourseMember.where(course_id: school_courses.pluck(:id), role: 4).count
           homework_count = HomeworkCommon.find_by_sql("select count(*) cnt from homework_commons hc join courses c on hc.course_id = c.id
                                            where c.school_id = #{s.id} and hc.id in(#{homework_common_id})").first.try(:cnt)
           s.attributes.dup.merge({name: s.name, course_count: course_count, student_count: student_count,homework_count: homework_count})

app/services/users/apply_professional_auth_service.rb

@@ -40,8 +40,8 @@ class Users::ApplyProfessionalAuthService < ApplicationService
 
       # sms_cache = Rails.cache.read("apply_pro_certification")
       # if sms_cache.nil?
-      #   sms_notify_admin
-        Rails.cache.write("apply_pro_certification", 1)
+         sms_notify_admin
+      #   Rails.cache.write("apply_pro_certification", 1)
       # end
     end
   end