From 89fa1200b22d73ce22a457c1b8493d0494ec9b31 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 19 Jul 2019 14:45:19 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0mem=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20190718100242_add_ts_mem_to_outputs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20190718100242_add_ts_mem_to_outputs.rb b/db/migrate/20190718100242_add_ts_mem_to_outputs.rb index 8a603d7be..70b593a35 100644 --- a/db/migrate/20190718100242_add_ts_mem_to_outputs.rb +++ b/db/migrate/20190718100242_add_ts_mem_to_outputs.rb @@ -1,5 +1,5 @@ class AddTsMemToOutputs < ActiveRecord::Migration[5.2] def change - # add_column :outputs, :ts_mem, :float + add_column :outputs, :ts_mem, :float end end From d34817834cdfd584e3799449d246bbf4f992885b Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 19 Jul 2019 14:47:54 +0800 Subject: [PATCH 2/7] modify apply add school valid --- app/forms/add_school_apply_form.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/forms/add_school_apply_form.rb b/app/forms/add_school_apply_form.rb index c0b767f06..f98e8b05b 100644 --- a/app/forms/add_school_apply_form.rb +++ b/app/forms/add_school_apply_form.rb @@ -4,7 +4,7 @@ class AddSchoolApplyForm attr_accessor :name, :province, :city, :address, :remarks validates :name, presence: true - validates :province, presence: true - validates :city, presence: true - validates :address, presence: true + # validates :province, presence: true + # validates :city, presence: true + # validates :address, presence: true end \ No newline at end of file From eaacad16c014e9906cce7700eeaaa7ad40749422 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 19 Jul 2019 15:08:54 +0800 Subject: [PATCH 3/7] search api shixun add identifier column --- app/models/searchable/shixun.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/searchable/shixun.rb b/app/models/searchable/shixun.rb index 7abd76ec6..bc19967a2 100644 --- a/app/models/searchable/shixun.rb +++ b/app/models/searchable/shixun.rb @@ -43,6 +43,7 @@ module Searchable::Shixun def to_searchable_json { id: id, + identifier: identifier, author_name: user.real_name, author_school_name: user.school_name, visits_count: visits, @@ -55,4 +56,4 @@ module Searchable::Shixun { user: { user_extension: :school } } end end -end \ No newline at end of file +end From 45a3a17d8776eee76824662feffe0283b775bd65 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 19 Jul 2019 15:43:40 +0800 Subject: [PATCH 4/7] fix register verify code expire bug --- app/controllers/accounts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 6ac62f887..288cf2acc 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -35,7 +35,7 @@ class AccountsController < ApplicationController # todo 上线前请删除万能验证码"513231" if code != "513231" tip_exception(-2, "验证码不正确") if verifi_code.try(:code) != code.strip - tip_exception(-2, "验证码已失效") if (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60 + tip_exception(-2, "验证码已失效") if (Time.now.to_i - verifi_code.created_at.to_i) > 10*60 end code = generate_identifier User, 8 From 635e0ad2e541154f8d768def7cbca6ed3f672e44 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 19 Jul 2019 15:49:38 +0800 Subject: [PATCH 5/7] mem --- app/views/games/_testset_list.json.jbuilder | 2 +- app/views/games/game_status.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/games/_testset_list.json.jbuilder b/app/views/games/_testset_list.json.jbuilder index cef29997b..86bf2de1b 100644 --- a/app/views/games/_testset_list.json.jbuilder +++ b/app/views/games/_testset_list.json.jbuilder @@ -8,7 +8,7 @@ json.test_sets @qurey_test_sets do |test_set| end json.compile_success test_set.try(:compile_success) json.ts_time test_set.try(:ts_time) - json.ts_time test_set.try(:ts_mem) + json.ts_mem test_set.try(:ts_mem) end json.allowed_unlock @shixun.test_set_permission diff --git a/app/views/games/game_status.json.jbuilder b/app/views/games/game_status.json.jbuilder index aecbf9d42..73de75598 100644 --- a/app/views/games/game_status.json.jbuilder +++ b/app/views/games/game_status.json.jbuilder @@ -1,4 +1,4 @@ json.(@base_date, :grade, :gold, :experience, :status, :had_done, :position, :port, :record_consume_time, :mirror_name, - :picture, :web_route, :star, :next_game, :prev_game, :max_mem) + :picture, :web_route, :star, :next_game, :prev_game) # # 测试集相关 json.partial! 'games/testset_list' \ No newline at end of file From 155152acb1f9442967ee198d43cf45ed4a8b0b76 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 19 Jul 2019 15:58:50 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/accounts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 288cf2acc..d81195598 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -91,7 +91,7 @@ class AccountsController < ApplicationController user = User.find_by_mail(email) #这里有问题，应该是为email,而不是mail 6.13-hs end tip_exception(-2, "验证码不正确") if verifi_code.try(:code) != code.strip - tip_exception(-2, "验证码已失效") if (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60 + tip_exception(-2, "验证码已失效") if (Time.now.to_i - verifi_code.created_at.to_i) > 10*60 user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation] if user.save! From 526a6d47028efc07a9ff01743d8a7f9fb9dd45d8 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 19 Jul 2019 16:54:36 +0800 Subject: [PATCH 7/7] change es highlight tag --- app/services/concerns/elasticsearch_able.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/concerns/elasticsearch_able.rb b/app/services/concerns/elasticsearch_able.rb index e1c33ed4a..c08aab029 100644 --- a/app/services/concerns/elasticsearch_able.rb +++ b/app/services/concerns/elasticsearch_able.rb @@ -20,7 +20,7 @@ module ElasticsearchAble def highlight_options { fragment_size: EduSetting.get('es_highlight_fragment_size') || 30, - tag: '' + tag: '' } end