From e297d65aa6a080fc7dab81594ffa7b5af523d9db Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 3 Aug 2019 17:53:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index c36ad09b6..7ae9df5e3 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -265,10 +265,10 @@ class MyshixunsController < ApplicationController
# params[:evaluate] 实训评测时更新必须给的参数，需要依据该参数做性能统计，其它类型的更新可以跳过
# 自动保存的时候evaluate为0；点评测的时候为1
if params[:evaluate] == 1
- exec_time = game.challenge.try(:exec_time)
+ #exec_time = game.challenge.try(:exec_time)
@sec_key = generate_identifier(EvaluateRecord, 12)
record = EvaluateRecord.create!(:user_id => current_user.id, :shixun_id => @myshixun.shixun_id, :game_id => game_id,
- :identifier => @sec_key, :exec_time => exec_time)
+ :identifier => @sec_key)
uid_logger("-- game build: file update #{@sec_key}, record id is #{record.id}, time is **** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
end
unless @hide_code
From 7dfc2baaf49516e35de17537d335237fd306db7b Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Mon, 5 Aug 2019 08:45:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
db/migrate/20190730024112_add_index_to_user.rb | 7 -------
db/migrate/20190805004505_sync_index_to_users.rb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 db/migrate/20190730024112_add_index_to_user.rb
create mode 100644 db/migrate/20190805004505_sync_index_to_users.rb
diff --git a/db/migrate/20190730024112_add_index_to_user.rb b/db/migrate/20190730024112_add_index_to_user.rb
deleted file mode 100644
index fa198cffa..000000000
--- a/db/migrate/20190730024112_add_index_to_user.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIndexToUser < ActiveRecord::Migration[5.2]
- def change
- # add_index :users, :login, unique: true
- # add_index :users, :mail, unique: true
- # add_index :users, :phone, unique: true
- end
-end
diff --git a/db/migrate/20190805004505_sync_index_to_users.rb b/db/migrate/20190805004505_sync_index_to_users.rb
new file mode 100644
index 000000000..33adca30c
--- /dev/null
+++ b/db/migrate/20190805004505_sync_index_to_users.rb
@@ -0,0 +1,7 @@
+class SyncIndexToUsers < ActiveRecord::Migration[5.2]
+ def change
+ add_index :users, :login, unique: true
+ add_index :users, :mail, unique: true
+ add_index :users, :phone, unique: true
+ end
+end
From 864498d598c2abf93e3f044c16f9a4de9fbdb9c6 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Mon, 5 Aug 2019 09:32:23 +0800
Subject: [PATCH 3/3] ..
---
db/migrate/20190805004505_sync_index_to_users.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/db/migrate/20190805004505_sync_index_to_users.rb b/db/migrate/20190805004505_sync_index_to_users.rb
index 33adca30c..28393f4b6 100644
--- a/db/migrate/20190805004505_sync_index_to_users.rb
+++ b/db/migrate/20190805004505_sync_index_to_users.rb
@@ -1,6 +1,6 @@
class SyncIndexToUsers < ActiveRecord::Migration[5.2]
def change
- add_index :users, :login, unique: true
+ # add_index :users, :login, unique: true
add_index :users, :mail, unique: true
add_index :users, :phone, unique: true
end