Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/accounts_controller.rb

@@ -125,8 +125,8 @@ class AccountsController < ApplicationController
     set_autologin_cookie(user)
     UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
 
-    # 注册完成后有一天的试用申请
-    UserDayCertification.create(user_id: user.id, status: 1)
+    # 注册完成后有一天的试用申请(先去掉)
+    # UserDayCertification.create(user_id: user.id, status: 1)
   end
 
   def set_autologin_cookie(user)

app/controllers/application_controller.rb

@@ -185,21 +185,29 @@ class ApplicationController < ActionController::Base
 		render :json => { status: status, message: message }
 	end
 
-	# 系统全局认证
-	def check_auth
-		day_cer = UserDayCertification.find_by(user_id: current_user.id)
-		# 如果注册超过24小时则需要完善资料及授权
-		if (Time.now.to_i - day_cer.try(:created_at).to_i) > 86400
-			if !current_user.profile_completed?
-				info_url = '/account/profile'
-				tip_exception(402, info_url)
-			elsif current_user.certification != 1
-				if current_user.apply_actions.exists?(container_type: 'TrialAuthorization', status: 0)
-					tip_exception(408, "您的试用申请正在审核中，请耐心等待")
-				end
-				tip_exception(407, "系统未授权")
-			end
+	# 资料是否完善
+	def check_account
+		if !current_user.profile_completed?
+			info_url = '/account/profile'
+			tip_exception(402, info_url)
 		end
+	end
+
+	# 系统全局认证(暂时隐藏试用申请的判断)
+	def check_auth
+		# day_cer = UserDayCertification.find_by(user_id: current_user.id)
+		# # 如果注册超过24小时则需要完善资料及授权
+		# if (Time.now.to_i - day_cer.try(:created_at).to_i) > 86400
+		# 	if !current_user.profile_completed?
+		# 		info_url = '/account/profile'
+		# 		tip_exception(402, info_url)
+		# 	elsif current_user.certification != 1
+		# 		if current_user.apply_actions.exists?(container_type: 'TrialAuthorization', status: 0)
+		# 			tip_exception(408, "您的试用申请正在审核中，请耐心等待")
+		# 		end
+		# 		tip_exception(407, "系统未授权")
+		# 	end
+		# end
 
 
 		# if current_user.certification != 1 && current_user.apply_actions.exists?(container_type: 'TrialAuthorization', status: 0)

app/controllers/courses_controller.rb

@@ -13,6 +13,7 @@ class CoursesController < ApplicationController
 
   before_action :require_login, except: [:index, :show, :students, :teachers, :board_list, :mine, :all_course_groups,
                                                       :left_banner, :top_banner]
+  before_action :check_account, only: [:new, :apply_to_join_course]
   before_action :check_auth, except: [:index, :show, :students, :teachers, :board_list, :mine, :all_course_groups,
                                                       :left_banner, :top_banner, :apply_to_join_course, :exit_course]
   before_action :set_course, :user_course_identity, only: [:show, :update, :destroy, :settings, :set_invite_code_halt,

app/controllers/homework_commons_controller.rb

@@ -113,6 +113,15 @@ class HomeworkCommonsController < ApplicationController
     else
       if @user_course_identity == Course::STUDENT
         @work = @homework.user_work(current_user.id)
+        work = @homework.student_works.find_by(user_id: current_user.id)
+
+        # 学生访问列表时计算个人成绩
+        myshixun = Myshixun.find_by(shixun_id: @shixun.id, user_id: current_user.id)
+        if work && myshixun
+          challenge_settings = @homework.homework_challenge_settings
+          games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
+          HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
+        end
 
         # 学生已提交作品且补交（提交）已截止、作品公开、非匿评阶段
         if @work&.work_status.to_i > 0 && (@homework.work_public || @homework.score_open) &&

app/controllers/shixuns_controller.rb

@@ -3,6 +3,8 @@ class ShixunsController < ApplicationController
 	include ApplicationHelper
 
 	before_action :require_login, :check_auth, except: [:download_file, :index, :menus]
+	before_action :check_account, only: [:new, :shixun_exec]
+
 	before_action :check_auth, except: [:download_file, :index, :menus]
 
 	before_action :find_shixun, :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns,

app/controllers/subjects_controller.rb

@@ -1,6 +1,7 @@
 class SubjectsController < ApplicationController
   before_action :require_login, :check_auth, except: [:index]
   # before_action :check_auth, except: [:index]
+  before_action :check_account, only: [:new]
   before_action :find_subject, except: [:index, :create, :new, :append_to_stage]
   before_action :allowed, only: [:update, :edit, :destroy, :publish, :cancel_publish, :cancel_has_publish,
                         :search_members, :add_subject_members, :statistics, :shixun_report, :school_report,

app/views/courses/search_users.json.jbuilder

@@ -2,8 +2,8 @@ json.users do
   json.array! @users do |user|
     json.id user.id
     json.name user.real_name
-    json.student_id user.user_extension.try(:student_id)
-    json.school_name user.user_extension.school.name
+    json.student_id user&.student_id
+    json.school_name user&.school_name
     json.added @course.course_member?(user.id, 4)
   end
 end

app/views/users/get_user_info.json.jbuilder

@@ -7,6 +7,7 @@ json.is_teacher @user.user_extension&.teacher?
 json.user_identity @user.identity
 json.tidding_count 0
 json.user_phone_binded @user.phone.present?
+json.profile_completed @user.profile_completed?
 if @course
   json.course_identity @course_identity
   json.course_name @course.name