From 881acd24804aeabdf8ec599e9cd777804e3fb936 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 20 Apr 2023 11:31:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AD=BE=E7=BD=B2cla=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/users_controller.rb | 5 +++++ config/routes/api.rb | 1 + db/migrate/20230420031926_add_sign_cla_to_users.rb | 5 +++++ 3 files changed, 11 insertions(+) create mode 100644 db/migrate/20230420031926_add_sign_cla_to_users.rb diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 3f7b49f99..2204ff89f 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -8,6 +8,11 @@ class Api::V1::UsersController < Api::V1::BaseController render_ok end + def check_user_login + return tip_exception(-1, "用户标识不存在") unless params[:login].present? && User.exists?(login: params[:login]) + render_ok + end + def send_email_vefify_code code = %W(0 1 2 3 4 5 6 7 8 9) verification_code = code.sample(6).join diff --git a/config/routes/api.rb b/config/routes/api.rb index 77ff5d03b..20c56138c 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -5,6 +5,7 @@ defaults format: :json do resources :users, only: [:index] do collection do post :check_user_id + post :check_user_login end end diff --git a/db/migrate/20230420031926_add_sign_cla_to_users.rb b/db/migrate/20230420031926_add_sign_cla_to_users.rb new file mode 100644 index 000000000..36a849bfb --- /dev/null +++ b/db/migrate/20230420031926_add_sign_cla_to_users.rb @@ -0,0 +1,5 @@ +class AddSignClaToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :sign_cla, :boolean, default: false + end +end From c91b986bec8f30af56c5c962b631e78adc503e90 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 20 Apr 2023 11:39:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AD=BE=E7=BD=B2cla=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/get_user_info.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 68bfa6589..a1d689f44 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -28,3 +28,4 @@ json.message_unread_total @message_unread_total json.has_trace_user @user.trace_user.present? json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}") json.nps EduSetting.get("nps-on-off-switch").to_s == 'true' && UserNp.where(user_id: current_user.id).where("created_at >= ?", (Time.now - 30.days).beginning_of_day ).blank? +json.sign_cla @user.sign_cla \ No newline at end of file