Merge branch 'pre_trustie_server' into trustie_server
This commit is contained in:
commit
c6461de871
|
@ -359,6 +359,17 @@ class AccountsController < ApplicationController
|
||||||
Register::LoginCheckColumnsForm.new(check_params.merge(user: current_user)).validate!
|
Register::LoginCheckColumnsForm.new(check_params.merge(user: current_user)).validate!
|
||||||
render_ok
|
render_ok
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def check_keywords
|
||||||
|
text = params[:text].to_s.each_char.select { |c| c.bytes.first < 240 }.join('')
|
||||||
|
data = ! ReversedKeyword.check_exists?(text)
|
||||||
|
result = {
|
||||||
|
status: 0,
|
||||||
|
data: data,
|
||||||
|
message: data ? "" : "无法使用以下关键词:#{text},请重新命名"
|
||||||
|
}
|
||||||
|
render_ok(result)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
|
|
@ -261,6 +261,7 @@ Rails.application.routes.draw do
|
||||||
post :remote_password
|
post :remote_password
|
||||||
post :change_password
|
post :change_password
|
||||||
post :check
|
post :check
|
||||||
|
post :check_keywords
|
||||||
post :login_check
|
post :login_check
|
||||||
post :simple_update
|
post :simple_update
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue