From c3cd7517cffb3cab9589054afe7d8b09b6ecc7be Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Nov 2019 20:30:42 +0800 Subject: [PATCH 1/5] 1 --- app/controllers/hack_user_lastest_codes_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/hack_user_lastest_codes_controller.rb b/app/controllers/hack_user_lastest_codes_controller.rb index fcbecec0d..9602673e5 100644 --- a/app/controllers/hack_user_lastest_codes_controller.rb +++ b/app/controllers/hack_user_lastest_codes_controller.rb @@ -136,7 +136,9 @@ class HackUserLastestCodesController < ApplicationController if @my_hack.hack_user_debug.present? @my_hack.hack_user_debug.update_attributes!(debug_params) else - @my_hack.hack_user_debug.create!(debug_params) + debug = HackUserDebug.new(debug_params) + debug.hack_user_lastest_code_id = @my_hack.id + debug.save! end end From 1d93038691f5129147e56ae1c26c737dac449a52 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Nov 2019 20:34:49 +0800 Subject: [PATCH 2/5] 1 --- db/migrate/20191120123353_add_code_forhack_user_debugs.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20191120123353_add_code_forhack_user_debugs.rb diff --git a/db/migrate/20191120123353_add_code_forhack_user_debugs.rb b/db/migrate/20191120123353_add_code_forhack_user_debugs.rb new file mode 100644 index 000000000..d3285f26b --- /dev/null +++ b/db/migrate/20191120123353_add_code_forhack_user_debugs.rb @@ -0,0 +1,5 @@ +class AddCodeForhackUserDebugs < ActiveRecord::Migration[5.2] + def change + add_column :hack_user_debugs, :code, :text + end +end From 7401bff48cf4db144cf6b8910ca7cb3b321f4388 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 21 Nov 2019 09:37:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E3=80=81=E8=81=8C=E4=B8=9A=E8=AE=A4=E8=AF=81=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 7 +++++++ app/services/admins/identity_auths/refuse_apply_service.rb | 1 + .../admins/professional_auths/refuse_apply_service.rb | 1 + app/services/users/apply_authentication_service.rb | 2 +- app/services/users/apply_professional_auth_service.rb | 4 ++-- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1bc2bad7d..f04d126f4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -45,6 +45,13 @@ class ApplicationController < ActionController::Base check_account tip_exception(@course.excellent ? 410 : 409, "您没有权限进入") end + if @user_course_identity == Course::STUDENT + # 实名认证和职业认证的身份判断 + tip_exception(-2, "你的实名认证和职业认证审核未通过") if @course.authentication && + @course.professional_certification && (!current_user.authentication && !current_user.professional_certification) + tip_exception(-2, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication + tip_exception(-2, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification + end uid_logger("###############user_course_identity:#{@user_course_identity}") end diff --git a/app/services/admins/identity_auths/refuse_apply_service.rb b/app/services/admins/identity_auths/refuse_apply_service.rb index 7ac2e6c38..dfc9168a9 100644 --- a/app/services/admins/identity_auths/refuse_apply_service.rb +++ b/app/services/admins/identity_auths/refuse_apply_service.rb @@ -10,6 +10,7 @@ class Admins::IdentityAuths::RefuseApplyService < ApplicationService def call ActiveRecord::Base.transaction do apply.update!(status: 2, remarks: reason) + user.update!(authentication: false) deal_tiding! apply.attachment&.destroy diff --git a/app/services/admins/professional_auths/refuse_apply_service.rb b/app/services/admins/professional_auths/refuse_apply_service.rb index a055488c3..014fbab0b 100644 --- a/app/services/admins/professional_auths/refuse_apply_service.rb +++ b/app/services/admins/professional_auths/refuse_apply_service.rb @@ -10,6 +10,7 @@ class Admins::ProfessionalAuths::RefuseApplyService < ApplicationService def call ActiveRecord::Base.transaction do apply.update!(status: 2, remarks: reason) + user.update!(professional_certification: false) deal_tiding! apply.attachment&.destroy diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb index 1b9b02c91..b4aa8f496 100644 --- a/app/services/users/apply_authentication_service.rb +++ b/app/services/users/apply_authentication_service.rb @@ -18,7 +18,7 @@ class Users::ApplyAuthenticationService < ApplicationService user.show_realname = params[:show_realname].to_s == 'true' if params[:show_realname].to_s.present? ActiveRecord::Base.transaction do - user.authentication = false + user.authentication = true user.save! user.user_extension.update!(gender: params[:gender].to_i) if params[:gender].present? diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb index 81cd11a4c..074f1cee7 100644 --- a/app/services/users/apply_professional_auth_service.rb +++ b/app/services/users/apply_professional_auth_service.rb @@ -14,13 +14,13 @@ class Users::ApplyProfessionalAuthService < ApplicationService Users::ApplyProfessionalAuthForm.new(params).validate! raise Error, '您已经申请过职业认证了' if ApplyUserAuthentication.professional_auth.processing.exists?(user_id: user.id) - user.professional_certification = false - extension = user.user_extension extension.school_id = params[:school_id] extension.department_id = params[:department_id] extension.identity = params[:identity] + user.professional_certification = extension.identity != 0 + extra = params[:extra].to_s.strip.presence if extension.identity.to_s == 'student' extension.technical_title = nil From 2f9700266804998416dfd547c2c0d4c4d28269eb Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 21 Nov 2019 09:55:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/apply_teachers.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/courses/apply_teachers.json.jbuilder b/app/views/courses/apply_teachers.json.jbuilder index bd88d5fbe..b81f5d77b 100644 --- a/app/views/courses/apply_teachers.json.jbuilder +++ b/app/views/courses/apply_teachers.json.jbuilder @@ -9,6 +9,7 @@ json.application_list do json.name_link user_path(application.application_user) json.login application.application_user.login json.image_url url_to_avatar(application.application_user) + json.school_name application.application_user.school_name json.role application.content.to_i == 3 || application.content.to_i == 7 ? "助教" : application.content.to_i == 2 || application.content.to_i == 9 ? "教师" : "" end end \ No newline at end of file From 61db2576b21314db0d4f1c70a4763cb900b8d954 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 21 Nov 2019 11:03:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?oj=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...20191121025552_modify_execute_time_for_hack_user_code.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20191121025552_modify_execute_time_for_hack_user_code.rb diff --git a/db/migrate/20191121025552_modify_execute_time_for_hack_user_code.rb b/db/migrate/20191121025552_modify_execute_time_for_hack_user_code.rb new file mode 100644 index 000000000..c66e13a03 --- /dev/null +++ b/db/migrate/20191121025552_modify_execute_time_for_hack_user_code.rb @@ -0,0 +1,6 @@ +class ModifyExecuteTimeForHackUserCode < ActiveRecord::Migration[5.2] + def change + change_column :hack_user_debugs, :execute_time, :float + change_column :hack_user_codes, :execute_time, :float + end +end