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

Conflicts:
	db/migrate/20190314080802_create_shixun_student_works.rb
	db/migrate/20190314080805_create_shixun_student_works.rb

app/controllers/account_controller.rb

@@ -677,12 +677,16 @@ class AccountController < ApplicationController
     req = Hash.new(false)
     req[:valid] = false
     type = params[:type].to_i
+    if Redmine::Configuration['gitlab_address'].include?("test") && params[:code] == "134790"
+      req[:valid] = true
+    else
       if type == 1 || type == 2 || type == 4 || type == 6 || params[:phone] =~ /^1\d{10}$/
         code = VerificationCode.where(:phone => params[:phone], :code => params[:code], :code_type => (params[:type].to_i != 1 && params[:type].to_i != 2 && params[:type].to_i != 4) ? 2 : params[:type].to_i ).last
       else
         code = VerificationCode.where(:email => params[:phone], :code => params[:code], :code_type => params[:type].to_i).last
       end
       req[:valid] = !code.nil? && (Time.now.to_i - code.created_at.to_i) <= 10*60
+    end
     render :json => req
   end
 

app/views/subjects/_new_shixun_list.html.erb

@@ -25,8 +25,10 @@
 <% else %>
   <div style="text-align: center;padding: 100px 0px;">
     <p class="font-16 mb20">没有实训数据可以选择</p>
-    <p>
     <a href="javascript:void(0)" onclick="newshixuns(<%= User.current.mail.blank? %>)" class = "white-btn orange-btn">立即新建</a>
+    <div class="clearfix edu-txt-center">
+      <a href="javascript:void(0);" class="task-btn pop_close mr60 pathhidnmodel" onclick="hideModal();">取消</a>
+    </div>
   </div>
 <% end %>
 

db/migrate/20190314080802_create_shixun_student_works.rb

@@ -1,94 +0,0 @@
-# encoding: utf-8
-class CreateShixunStudentWorks < ActiveRecord::Migration
-  DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
-
-  def down_generate_identifier type
-    if type == "game"
-      code = DCODES.sample(12).join
-      return down_generate_identifier(type) if Game.where(identifier: code).present?
-    elsif type == "myshixun"
-      code = DCODES.sample(10).join
-      return down_generate_identifier(type) if Myshixun.where(identifier: code).present?
-    end
-    code
-  end
-
-  def up
-    ActiveRecord::Base.transaction do
-      begin
-        works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
-        works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
-                         :cost_time => 0, :update_time => nil, :compelete_status => 0, :commit_time => nil)
-
-        shixun_works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and work_score > 0")
-        shixun_works.each do |work|
-          shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
-          user = work.user
-          if shixun.present? && user.present?
-            # 创建新的myshixun和games
-            # fork版本库，如果用户没有同步，则先同步用户
-            g = Gitlab.client
-            if user.gid.nil?
-              s = Trustie::Gitlab::Sync.new
-              s.sync_user(user)
-            end
-            gshixun = g.fork(shixun.gpid, user.gid)
-            shixun_tomcat = Redmine::Configuration['shixun_tomcat']
-
-            code = down_generate_identifier("myshixun")
-            # 一般通过默认分支是否存在来判断一个项目是否fork成功
-            if gshixun.try(:id).present?
-              commit_id = g.commits(shixun.gpid).first.try(:id)
-              # educoder 加入到myshixun中
-              myshixun_admin_gid = User.where(:login => "educoder").first.try(:gid)
-              g.add_team_member(gshixun.id, myshixun_admin_gid, 40)  # 40代表角色master
-
-              myshixun = Myshixun.create!(:shixun_id => shixun.id, :user_id => user.id, :identifier => code,
-                                          :modify_time => shixun.modify_time, :reset_time => shixun.reset_time,
-                                          :onclick_time => Time.now, :gpid => gshixun.id,
-                                          :git_url => gshixun.try(:path_with_namespace), :commit_id => commit_id)
-
-              url = "#{Redmine::Configuration['gitlab_address_ip']}/#{g.project(shixun.try(:gpid)).try(:path_with_namespace)}.git"
-
-              rep_url = Base64.urlsafe_encode64(url) # 注意：educoder为默认给实训创建版本库的用户，如果换成别的用户，名字要相应的修改
-              uri = "#{shixun_tomcat}/bridge/game/openGameInstance"
-              params = {tpiID: "#{myshixun.id}", tpmGitURL:rep_url, tpiRepoName: gshixun.try(:name)}
-              logger.info("openGameInstance params is #{params}")
-              uri = URI.parse(URI.encode(uri.strip))
-              res = Net::HTTP.post_form(uri, params).body
-              res = JSON.parse(res)
-              if (res && res['code'].to_i != 0)
-                raise("实训云平台繁忙（繁忙等级：83）")
-              end
-              # 其它创建关卡等操作
-              challenges = shixun.challenges
-              # 之所以增加user_id是为了方便统计查询性能
-              challenges.each_with_index do |challenge, index|
-                status = (index == 0 ? 0 : 3)
-                code = down_generate_identifier("game")
-                Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id,
-                             :open_time => Time.now, :identifier => code, :modify_time => challenge.modify_time)
-              end
-              work_score = work.final_score
-              work.homework_common.homework_challenge_settings.each do |setting|
-                if work_score > 1
-                  games = myshixun.games.where(:challenge_id => setting.challenge_id).first
-                  games.update_attributes(:status => 2, :end_time => Time.now, :final_score => setting.challenge.score)
-                  work_score -= setting.score
-                end
-              end
-              work.update_column("myshixun_id", myshixun.id)
-            end
-          end
-        end
-      rescue Exception => e
-        puts ("###failed to exec shixun: current task id is #{e}")
-        # g.delete_project(gshixun.id) if gshixun.try(:id).present?
-        raise ActiveRecord::Rollback
-      end
-    end
-  end
-
-  def down
-  end
-end

db/migrate/20190314080805_create_shixun_student_works.rb

@@ -14,7 +14,6 @@ class MigrateShixunWorks1 < ActiveRecord::Migration
   end
 
   def up
-    ActiveRecord::Base.transaction do
     begin
       works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
       works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
@@ -24,6 +23,7 @@ class MigrateShixunWorks1 < ActiveRecord::Migration
       shixun_works.each do |work|
         shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
         user = work.user
+        ActiveRecord::Base.transaction do
           if shixun.present? && user.present?
             # 创建新的myshixun和games
             # fork版本库，如果用户没有同步，则先同步用户
@@ -81,13 +81,13 @@ class MigrateShixunWorks1 < ActiveRecord::Migration
             end
           end
         end
+      end
     rescue Exception => e
       puts ("###failed to exec shixun: current task id is #{e}")
       # g.delete_project(gshixun.id) if gshixun.try(:id).present?
       raise ActiveRecord::Rollback
     end
   end
-  end
 
   def down
   end

public/stylesheets/educoder/edu-main.css

@@ -860,3 +860,9 @@ html>body #ajax-indicator { position: fixed; }
     left: 42px;
     top: -1px !important;
 }
+
+.pathhidnmodel{
+    position: absolute;
+    margin-top: 60px;
+    margin-left: -26px;
+}