Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

db/migrate/20190730024112_add_index_to_user.rb

@@ -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

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