From 2791de431372437a004bff2248550c7f2e3a8362 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 26 Jul 2019 09:35:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb    |  4 +--
 app/controllers/application_controller.rb | 36 ++++++++++++++---------
 app/controllers/courses_controller.rb     |  1 +
 app/controllers/shixuns_controller.rb     |  2 ++
 app/controllers/subjects_controller.rb    |  1 +
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 324e5bde3..d1357d43f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/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)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bf8a0651e..af0158cfd 100644
--- a/app/controllers/application_controller.rb
+++ b/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)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index faad02173..99f942146 100644
--- a/app/controllers/courses_controller.rb
+++ b/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,
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 7a2db0666..9585ddc12 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/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]
+
 	before_action :check_auth, except: [:download_file, :index, :menus]
 
 	before_action :find_shixun, :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns,
diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 5cbb2a462..586b7352f 100644
--- a/app/controllers/subjects_controller.rb
+++ b/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,