From 595e4bcf6441ffcb004ba593052acc346c89511b Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Thu, 27 Jun 2019 09:02:20 +0800
Subject: [PATCH 01/15] modify shixun exec method

---
 app/controllers/shixuns_controller.rb       | 20 +++++++++++---------
 app/jobs/update_myshixun_work_status_job.rb | 10 ++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 app/jobs/update_myshixun_work_status_job.rb

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 360732120..3b14eea84 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -539,16 +539,21 @@ class ShixunsController < ApplicationController
 					# 其它创建关卡等操作
 					challenges = @shixun.challenges
 					# 之所以增加user_id是为了方便统计查询性能
-					challenges.each_with_index do |challenge, index|
-						status = (index == 0 ? 0 : 3)
-						game_identifier = generate_identifier(Game, 12)
-						Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id,
-												 :open_time => Time.now, :identifier => game_identifier, :modify_time => challenge.modify_time)
+					game_attrs = %i[challenge_id myshixun_id status user_id open_time identifier modify_time created_at updated_at]
+					Game.bulk_insert(*game_attrs) do |worker|
+						base_attr = { myshixun_id: myshixun.id, user_id: myshixun.user_id }
+						challenges.each_with_index do |challenge, index|
+							status = (index == 0 ? 0 : 3)
+							game_identifier = generate_identifier(Game, 12)
+							worker.add(base_attr.merge(challenge_id: challenge.id, status: status, open_time: Time.now,
+																				 identifier: game_identifier, modify_time: challenge.modify_time))
+						end
 					end
 
 					# REDO:开启实训时更新关联作品的状态
 					# TODO:这个可以异步。或者放到课程里面取，不要在开启实训这边做
-					HomeworksService.new.update_myshixun_work_status myshixun
+					# HomeworksService.new.update_myshixun_work_status myshixun
+					UpdateMyshixunWorkStatusJob.perform_later(myshixun.id)
 
 					@current_task = myshixun.current_task
 					uid_logger("## shixun exec: myshixun id is #{myshixun.id}")
@@ -559,9 +564,6 @@ class ShixunsController < ApplicationController
 				end
 			end
 		end
-
-
-
 	end
 	# gameID 及实训ID
 	# status:  0 , 1 申请过， 2，实训关卡路径未填， 3 实训标签未填, 4 实训未创建关卡
diff --git a/app/jobs/update_myshixun_work_status_job.rb b/app/jobs/update_myshixun_work_status_job.rb
new file mode 100644
index 000000000..27a53408f
--- /dev/null
+++ b/app/jobs/update_myshixun_work_status_job.rb
@@ -0,0 +1,10 @@
+class UpdateMyshixunWorkStatusJob < ApplicationJob
+  queue_as :default
+
+  def perform(myshixun_id)
+    myshixun = Myshixun.find_by(id: myshixun_id)
+    return if myshixun.blank?
+
+    HomeworksService.new.update_myshixun_work_status myshixun
+  end
+end

From bc3291d00bef43ef32645de2f85ffcdf2cad59e7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 09:23:04 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/graduation_topics_controller.rb             | 4 ++--
 app/controllers/question_banks_controller.rb                | 2 +-
 db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb

diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb
index ce4488ffd..7a61613da 100644
--- a/app/controllers/graduation_topics_controller.rb
+++ b/app/controllers/graduation_topics_controller.rb
@@ -173,7 +173,7 @@ class GraduationTopicsController < ApplicationController
         member = @course.course_members.where(:user_id => @graduation_topic.tea_id).first
         tip_exception("分班名称不能为空") if params[:course_group_name].blank?
         course_group = CourseGroup.create(:name => params[:course_group_name], :course_id => @course.id)
-        teacher_group = TeacherCourseGroup.create(:course_id => @course.id, :member_id => member.try(:id),
+        teacher_group = TeacherCourseGroup.create(:course_id => @course.id, :course_member_id => member.try(:id),
                                                   :user_id => @graduation_topic.tea_id,
                                                   :course_group_id => course_group.try(:id))
       end
@@ -195,7 +195,7 @@ class GraduationTopicsController < ApplicationController
     user_unaccept_topics = @course.student_graduation_topics.where(user_id: current_user.id, status: [0, 1])
     if user_unaccept_topics.size == 0
       member_id = @course.course_members.find_by_user_id(current_user.id)
-      StudentGraduationTopic.create(course_id: @course.id, user_id: current_user.id, member_id: member_id,
+      StudentGraduationTopic.create(course_id: @course.id, user_id: current_user.id, course_member_id: member_id,
                                     graduation_topic_id: @graduation_topic.id)
       @graduation_topic.update_attribute(:status, 1)
       normal_status("选题成功")
diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb
index 740e3a993..4df392257 100644
--- a/app/controllers/question_banks_controller.rb
+++ b/app/controllers/question_banks_controller.rb
@@ -266,7 +266,7 @@ class QuestionBanksController < ApplicationController
   def quote_gtopic_bank topic, course
     ActiveRecord::Base.transaction do
       new_topic = GraduationTopic.new
-      new_topic.attributes = topic.attributes.dup.except("id", "course_id", "user_id", "graduation_topic_id",
+      new_topic.attributes = topic.attributes.dup.except("id", "course_id", "user_id", "graduation_topic_id", "quotes",
                                                          "course_list_id", "gtopic_bank_id", "created_at", "updated_at")
       new_topic.course_id = course.id
       new_topic.gtopic_bank_id = topic.id
diff --git a/db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb b/db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb
new file mode 100644
index 000000000..4c475fd8f
--- /dev/null
+++ b/db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb
@@ -0,0 +1,5 @@
+class ModifyQuotesForGtopicBanks < ActiveRecord::Migration[5.2]
+  def change
+    change_column :gtopic_banks, :quotes, :integer, :default => 0
+  end
+end

From 0b1049e319f1eb78c3f2b1b741c82f234e45a8d7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 09:26:42 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...banks.rb => 20190627012118_modify_quotes_for_gtopic_banks.rb} | 1 +
 1 file changed, 1 insertion(+)
 rename db/migrate/{20190627012117_modify_quotes_for_gtopic_banks.rb => 20190627012118_modify_quotes_for_gtopic_banks.rb} (70%)

diff --git a/db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb b/db/migrate/20190627012118_modify_quotes_for_gtopic_banks.rb
similarity index 70%
rename from db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb
rename to db/migrate/20190627012118_modify_quotes_for_gtopic_banks.rb
index 4c475fd8f..a47157414 100644
--- a/db/migrate/20190627012117_modify_quotes_for_gtopic_banks.rb
+++ b/db/migrate/20190627012118_modify_quotes_for_gtopic_banks.rb
@@ -1,5 +1,6 @@
 class ModifyQuotesForGtopicBanks < ActiveRecord::Migration[5.2]
   def change
+    GtopicBank.where("quotes is null").update_all(:quotes => 0)
     change_column :gtopic_banks, :quotes, :integer, :default => 0
   end
 end

From 26919424e09a72f7c24fd377494eb7759f1838bc Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 09:33:53 +0800
Subject: [PATCH 04/15] fix bug

---
 app/controllers/exercises_controller.rb | 12 ++++++------
 app/helpers/polls_helper.rb             |  4 ++--
 app/models/poll.rb                      | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 5fa5296d5..44b694239 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -32,13 +32,13 @@ class ExercisesController < ApplicationController
         @exercises_all = @course.exercises
         member_show_exercises = @exercises_all.is_exercise_published  #已发布的或已截止的试卷
         @current_user_ = current_user
-        @exercises_count = @exercises_all.count   # 全部页面，需返回
-        @exercises_unpublish_counts = @exercises_all.exercise_by_status(1).count #未发布的试卷数
-        @exercises_published_counts = @exercises_all.exercise_by_status([2,3]).count  # 已发布的试卷数,包含已截止的
-        @exercises_ended_counts = @exercises_all.exercise_by_status(3).count #已截止的试卷数
+        @exercises_count = @exercises_all.size   # 全部页面，需返回
+        @exercises_unpublish_counts = @exercises_all.exercise_by_status(1).size #未发布的试卷数
+        @exercises_published_counts = @exercises_all.exercise_by_status([2,3]).size  # 已发布的试卷数,包含已截止的
+        @exercises_ended_counts = @exercises_all.exercise_by_status(3).size #已截止的试卷数
         # 课堂的学生人数
         @course_all_members = @course.students #当前课堂的全部学生
-        @course_all_members_count = @course_all_members.count  #当前课堂的学生数
+        @course_all_members_count = @course_all_members.size  #当前课堂的学生数
         @current_student = @course_all_members.course_find_by_ids("user_id",current_user.id)  #当前用户是否为课堂的学生
 
         # exercises的不同用户群体的显示
@@ -64,7 +64,7 @@ class ExercisesController < ApplicationController
           @is_teacher_or = 0
           @exercises = member_show_exercises.present? ? member_show_exercises.unified_setting : []
         end
-        if @exercises.count > 0
+        if @exercises.size > 0
           if params[:type].present?
             choose_type = params[:type].to_i
             member_group_id = @current_student.first.try(:course_group_id).to_i
diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb
index 56bbb9b77..b5ba79dcc 100644
--- a/app/helpers/polls_helper.rb
+++ b/app/helpers/polls_helper.rb
@@ -3,8 +3,8 @@ module PollsHelper
   #获取试卷的已答/未答人数
   def get_poll_answers(poll_users)
     @commit_poll_users = poll_users.commit_by_status(1)  #当前老师的全部学生中已提交的
-    @poll_answers = @commit_poll_users.present? ? @commit_poll_users.count : 0   #表示已经提交了的用户
-    course_all_members_count = poll_users.present? ? poll_users.count : 0
+    @poll_answers = @commit_poll_users.present? ? @commit_poll_users.size : 0   #表示已经提交了的用户
+    course_all_members_count = poll_users.present? ? poll_users.size : 0
     @poll_unanswers = (course_all_members_count - @poll_answers)
   end
 
diff --git a/app/models/poll.rb b/app/models/poll.rb
index ce5da17dd..1cead3291 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -137,17 +137,17 @@ class Poll < ApplicationRecord
   #判断当前用户的答题状态
   def check_user_votes_status(user)
     poll_answer_user = poll_users.find_by(user_id: user.id)
-    user_poll_status = get_poll_status(user.id)
+    # user_poll_status = get_poll_status(user.id)
     user_status = 2
 
     if poll_answer_user.present? && (poll_answer_user.start_at.present? || poll_answer_user.end_at.present?)   #学生有过答题的,或者立即截止，但学生未做试卷的
       user_status = poll_answer_user.commit_status
     end
-
-    if poll_answer_user.present? && poll_answer_user.start_at.blank? && user_poll_status == 3
-      # user_status = 4
-      user_status = 5    #问卷用户存在，且未开始答题，且问卷已截止时，返回未提交标示
-    end
+    #
+    # if poll_answer_user.present? && poll_answer_user.start_at.blank? && user_poll_status == 3
+    #   # user_status = 4
+    #   user_status = 2    #问卷用户存在，且未开始答题，且问卷已截止时，返回未提交标示
+    # end
 
     user_status
   end

From 0e32e63b7b836c3792b1f340af584327d39c9314 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 09:34:33 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/graduation_topics_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb
index 7a61613da..521aaffc6 100644
--- a/app/controllers/graduation_topics_controller.rb
+++ b/app/controllers/graduation_topics_controller.rb
@@ -24,8 +24,7 @@ class GraduationTopicsController < ApplicationController
     end
 
     # 当前用户是否已经选过题
-    user_graduation_topics = @course.student_graduation_topics.where(user_id: current_user.id, status: [0, 1])  #6.12 -hs
-    @user_selected = user_graduation_topics.size > 0
+    @user_selected = @course.student_graduation_topics.where(user_id: current_user.id, status: [0, 1]).count  > 0 #6.12 -hs
     ## 分页参数
     page  = params[:page]  || 1
     limit = params[:limit] || 15

From da719e500fa9a6330674911bcce6eb6ff6ceb694 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 09:59:56 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E8=80=81=E5=B8=88=E6=89=BE=E4=B8=8D?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/question_banks_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb
index 4df392257..22650f2d3 100644
--- a/app/controllers/question_banks_controller.rb
+++ b/app/controllers/question_banks_controller.rb
@@ -271,6 +271,7 @@ class QuestionBanksController < ApplicationController
       new_topic.course_id = course.id
       new_topic.gtopic_bank_id = topic.id
       new_topic.user_id = current_user.id
+      new_topic.tea_id = current_user.id
       new_topic.save
 
       topic.attachments.each.try(:each) do |attachment|

From a58bd2552a405d20c1e08e4bca06f1af2107a7b7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 11:26:27 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=89=A3=E5=88=86=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 5fe230d32..32175ec2f 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -270,7 +270,8 @@ class GamesController < ApplicationController
         if @game.status == 2
           @game.update_attributes!(:answer_open => @answer.level)
         else
-          @game.update_attributes!(:answer_open => @answer.level, :answer_deduction => deduct_score)
+          answer_deduction = challenge.challenge_answers.where("level <= #{@answer.level}").sum(:score)
+          @game.update_attributes!(:answer_open => @answer.level, :answer_deduction => answer_deduction)
         end
 
       rescue Exception => e

From b7023c4c8e10c1cc4cad5b7a2d1ca541eb1b7aa6 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Thu, 27 Jun 2019 11:27:47 +0800
Subject: [PATCH 08/15] new git check

---
 lib/gitcheck/myshixun_update_error.txt |   0
 lib/gitcheck/readme_test.txt           |   4 +-
 lib/gitcheck/shixun_update.txt         | 563 +++++++++++++++++++++++++
 lib/gitcheck/shixun_update_error.txt   |  72 ++++
 lib/tasks/git_check.rake               |  43 +-
 5 files changed, 677 insertions(+), 5 deletions(-)
 create mode 100644 lib/gitcheck/myshixun_update_error.txt
 create mode 100644 lib/gitcheck/shixun_update_error.txt

diff --git a/lib/gitcheck/myshixun_update_error.txt b/lib/gitcheck/myshixun_update_error.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/gitcheck/readme_test.txt b/lib/gitcheck/readme_test.txt
index 03f757f18..317af632c 100644
--- a/lib/gitcheck/readme_test.txt
+++ b/lib/gitcheck/readme_test.txt
@@ -22,7 +22,7 @@
    http://121.199.19.206:9000/api/fork_repository
    参数：
    {repo_path: 'Hjqreturn/aaass1.git', fork_repository_path: 'educoder/ca9fvobr.git'}
-   说明：fork_repository_path是源项目的repo_path, repo_path是新项目的
+   说明：fork_repository_path是新项目的repo_path, repo_path是源项目的
 
 
 4、更新文件
@@ -41,7 +41,7 @@
 5、获取文件内容
     访问地址：http://121.199.19.206:9000/api/file_content
     参数：
-    {repo_path: "educoder/ca9fvobr.git", file_path: 'step1/main.py',}
+    {repo_path: "educoder/ca9fvobr.git", path: 'step1/main.py',}
 
 6、获取提交记录
     访问地址：http://121.199.19.206:9000/api/commits
diff --git a/lib/gitcheck/shixun_update.txt b/lib/gitcheck/shixun_update.txt
index e69de29bb..ff5e54236 100644
--- a/lib/gitcheck/shixun_update.txt
+++ b/lib/gitcheck/shixun_update.txt
@@ -0,0 +1,563 @@
+http://testbdgit2.educoder.net/educoder/mqex9s82.git
+http://testbdgit2.educoder.net/educoder/nf9ja46l.git
+http://testbdgit2.educoder.net/educoder/qmeb65oa.git
+http://testbdgit2.educoder.net/educoder/748fkcya.git
+http://testbdgit2.educoder.net/educoder/o7pr4f6v.git
+http://testbdgit2.educoder.net/educoder/tjxnyuv6.git
+http://testbdgit2.educoder.net/educoder/fp6cmstz.git
+http://testbdgit2.educoder.net/educoder/eh5oxkm9.git
+http://testbdgit2.educoder.net/educoder/uznmbg54.git
+http://testbdgit2.educoder.net/educoder/i8utopmc.git
+http://testbdgit2.educoder.net/educoder/f9ly35vz.git
+http://testbdgit2.educoder.net/educoder/vnw2fg5r.git
+http://testbdgit2.educoder.net/educoder/pcfhzue5.git
+http://testbdgit2.educoder.net/educoder/zlg2nmcf.git
+http://testbdgit2.educoder.net/educoder/klp26sqc.git
+http://testbdgit2.educoder.net/educoder/y68uqmoe.git
+http://testbdgit2.educoder.net/educoder/7zg5mi2r.git
+http://testbdgit2.educoder.net/educoder/8g93nfvc.git
+http://testbdgit2.educoder.net/educoder/mnj3srpe.git
+http://testbdgit2.educoder.net/educoder/lrwsyhzc.git
+http://testbdgit2.educoder.net/educoder/a2ct98o7.git
+http://testbdgit2.educoder.net/educoder/hawxspqm.git
+http://testbdgit2.educoder.net/educoder/pobfl4g8.git
+http://testbdgit2.educoder.net/educoder/zg7e9o2y.git
+http://testbdgit2.educoder.net/educoder/fsu7tkaw.git
+http://testbdgit2.educoder.net/educoder/cmklt4f8.git
+http://testbdgit2.educoder.net/educoder/2gt3yuen.git
+http://testbdgit2.educoder.net/educoder/v3bksozu.git
+http://testbdgit2.educoder.net/educoder/ku6lva8t.git
+http://testbdgit2.educoder.net/educoder/g8w3nj6r.git
+http://testbdgit2.educoder.net/educoder/pxlsuotc.git
+http://testbdgit2.educoder.net/educoder/opv8xkjw.git
+http://testbdgit2.educoder.net/educoder/stewl573.git
+http://testbdgit2.educoder.net/educoder/nuj9lbwv.git
+http://testbdgit2.educoder.net/educoder/r4vlju5x.git
+http://testbdgit2.educoder.net/educoder/85fat9w3.git
+http://testbdgit2.educoder.net/educoder/guzqi4nm.git
+http://testbdgit2.educoder.net/educoder/obtfwj3e.git
+http://testbdgit2.educoder.net/educoder/3ozvy5f8.git
+http://testbdgit2.educoder.net/educoder/8bu9zmjy.git
+http://testbdgit2.educoder.net/educoder/n489y7qt.git
+http://testbdgit2.educoder.net/educoder/f3pwvrtk.git
+http://testbdgit2.educoder.net/educoder/b6ljcet3.git
+http://testbdgit2.educoder.net/educoder/uie9snqp.git
+http://testbdgit2.educoder.net/educoder/xti6ueyf.git
+http://testbdgit2.educoder.net/educoder/gwkc395l.git
+http://testbdgit2.educoder.net/educoder/6a2qy98p.git
+http://testbdgit2.educoder.net/educoder/2qffg3pu.git
+http://testbdgit2.educoder.net/educoder/nfypjxhl.git
+http://testbdgit2.educoder.net/educoder/9p4neovc.git
+http://testbdgit2.educoder.net/educoder/k4wg9b32.git
+http://testbdgit2.educoder.net/educoder/pw53ln4m.git
+http://testbdgit2.educoder.net/educoder/cylj7vgb.git
+http://testbdgit2.educoder.net/educoder/ftfzbw72.git
+http://testbdgit2.educoder.net/educoder/qt78x4a5.git
+http://testbdgit2.educoder.net/educoder/qsza57pj.git
+http://testbdgit2.educoder.net/educoder/afvk9r35.git
+http://testbdgit2.educoder.net/educoder/68rqajhy.git
+http://testbdgit2.educoder.net/educoder/q4ixftoz.git
+http://testbdgit2.educoder.net/educoder/pbmkl5vt.git
+http://testbdgit2.educoder.net/educoder/ral8fjw9.git
+http://testbdgit2.educoder.net/educoder/89zfsjbp.git
+http://testbdgit2.educoder.net/educoder/no9uv3g2.git
+http://testbdgit2.educoder.net/educoder/cztux23y.git
+http://testbdgit2.educoder.net/educoder/4bflgcs8.git
+http://testbdgit2.educoder.net/educoder/6w2xmtls.git
+http://testbdgit2.educoder.net/educoder/o4xa93mc.git
+http://testbdgit2.educoder.net/educoder/uctzevfx.git
+http://testbdgit2.educoder.net/educoder/wokspmut.git
+http://testbdgit2.educoder.net/educoder/ba56rk8v.git
+http://testbdgit2.educoder.net/educoder/6w49utr2.git
+http://testbdgit2.educoder.net/educoder/qnubm248.git
+http://testbdgit2.educoder.net/educoder/itzexlbn.git
+http://testbdgit2.educoder.net/educoder/e6o9pmz4.git
+http://testbdgit2.educoder.net/educoder/qr9fhylp.git
+http://testbdgit2.educoder.net/educoder/q2nya3cj.git
+http://testbdgit2.educoder.net/educoder/58drwg63.git
+http://testbdgit2.educoder.net/educoder/oiwsvgpf.git
+http://testbdgit2.educoder.net/educoder/4uyn5ebp.git
+http://testbdgit2.educoder.net/educoder/pebvjtk9.git
+http://testbdgit2.educoder.net/educoder/uywljq4v.git
+http://testbdgit2.educoder.net/educoder/zawfjtnm.git
+http://testbdgit2.educoder.net/educoder/z5w3gbhk.git
+http://testbdgit2.educoder.net/educoder/cz7yw3en.git
+http://testbdgit2.educoder.net/educoder/p87sflg2.git
+http://testbdgit2.educoder.net/educoder/w3vcokrg.git
+http://testbdgit2.educoder.net/educoder/uc64f2qs.git
+http://testbdgit2.educoder.net/educoder/vtnag4op.git
+http://testbdgit2.educoder.net/educoder/mbgfitn6.git
+http://testbdgit2.educoder.net/educoder/nwj4ua2k.git
+http://testbdgit2.educoder.net/educoder/y8kfhtu6.git
+http://testbdgit2.educoder.net/educoder/tmivlph2.git
+http://testbdgit2.educoder.net/educoder/ziyft572.git
+http://testbdgit2.educoder.net/educoder/k8u4nrj6.git
+http://testbdgit2.educoder.net/educoder/wgfyrzhe.git
+http://testbdgit2.educoder.net/educoder/a4ts237c.git
+http://testbdgit2.educoder.net/educoder/cvw63y9e.git
+http://testbdgit2.educoder.net/educoder/bxltfpa5.git
+http://testbdgit2.educoder.net/educoder/x2anczf5.git
+http://testbdgit2.educoder.net/educoder/m57iyhan.git
+http://testbdgit2.educoder.net/educoder/iqrakwl2.git
+http://testbdgit2.educoder.net/educoder/fagcx7yl.git
+http://testbdgit2.educoder.net/educoder/oxlpy9uq.git
+http://testbdgit2.educoder.net/educoder/6spm2y7k.git
+http://testbdgit2.educoder.net/educoder/6fxzts5b.git
+http://testbdgit2.educoder.net/eduforge/fhc7p56a.git
+http://testbdgit2.educoder.net/eduforge/3aexl5my.git
+http://testbdgit2.educoder.net/educoder/9mz7qn5t.git
+http://testbdgit2.educoder.net/educoder/b9r8pon3.git
+http://testbdgit2.educoder.net/educoder/ciz68os9.git
+http://testbdgit2.educoder.net/educoder/2e4fuw87.git
+http://testbdgit2.educoder.net/educoder/hwm9s64y.git
+http://testbdgit2.educoder.net/educoder/owsik483.git
+http://testbdgit2.educoder.net/educoder/pbt9cyfo.git
+http://testbdgit2.educoder.net/educoder/8u4fvn9w.git
+http://testbdgit2.educoder.net/educoder/5bpkg3e6.git
+http://testbdgit2.educoder.net/educoder/ohkunqe2.git
+http://testbdgit2.educoder.net/educoder/u3j28qe6.git
+http://testbdgit2.educoder.net/educoder/yjo3t72c.git
+http://testbdgit2.educoder.net/educoder/oy7prsxe.git
+http://testbdgit2.educoder.net/educoder/q3ljmkn2.git
+http://testbdgit2.educoder.net/educoder/gk6lhtrf.git
+http://testbdgit2.educoder.net/eduforge/v6pa2kiz.git
+http://testbdgit2.educoder.net/educoder/qpuobn24.git
+http://testbdgit2.educoder.net/educoder/mkxfysza.git
+http://testbdgit2.educoder.net/eduforge/hpr7ojgc.git
+http://testbdgit2.educoder.net/educoder/2aef9wni.git
+http://testbdgit2.educoder.net/eduforge/8texrqwj.git
+http://testbdgit2.educoder.net/educoder/wle7zmxu.git
+http://testbdgit2.educoder.net/eduforge/j7cx68b9.git
+http://testbdgit2.educoder.net/educoder/ywrcjki2.git
+http://testbdgit2.educoder.net/educoder/sauvl9px.git
+http://testbdgit2.educoder.net/educoder/3pl6j2me.git
+http://testbdgit2.educoder.net/eduforge/o53rjgsh.git
+http://testbdgit2.educoder.net/educoder/g8znf6cy.git
+http://testbdgit2.educoder.net/educoder/itk4hy6l.git
+http://testbdgit2.educoder.net/eduforge/igbc4rtw.git
+http://testbdgit2.educoder.net/educoder/mnkfuyvx.git
+http://testbdgit2.educoder.net/educoder/oatsh64e.git
+http://testbdgit2.educoder.net/educoder/2mgsyrnu.git
+http://testbdgit2.educoder.net/educoder/69ulmat5.git
+http://testbdgit2.educoder.net/eduforge/9z3k5i4f.git
+http://testbdgit2.educoder.net/educoder/7bysthvr.git
+http://testbdgit2.educoder.net/eduforge/z3wh7uex.git
+http://testbdgit2.educoder.net/educoder/9o5h2rsf.git
+http://testbdgit2.educoder.net/educoder/uf3gl2vq.git
+http://testbdgit2.educoder.net/eduforge/jef9xvzb.git
+http://testbdgit2.educoder.net/educoder/g94qce7p.git
+http://testbdgit2.educoder.net/educoder/2a54vk8x.git
+http://testbdgit2.educoder.net/educoder/sx5eukfq.git
+http://testbdgit2.educoder.net/educoder/ivzjw793.git
+http://testbdgit2.educoder.net/eduforge/aekgf6pz.git
+http://testbdgit2.educoder.net/educoder/tzqbu6c4.git
+http://testbdgit2.educoder.net/educoder/ovz3e6a7.git
+http://testbdgit2.educoder.net/educoder/ujavffi2.git
+http://testbdgit2.educoder.net/educoder/8jsxcfm5.git
+http://testbdgit2.educoder.net/educoder/qgpycjvn.git
+http://testbdgit2.educoder.net/educoder/rhasift3.git
+http://testbdgit2.educoder.net/educoder/nfpla5jg.git
+http://testbdgit2.educoder.net/educoder/bjo2x4c9.git
+http://testbdgit2.educoder.net/educoder/3jawxy9g.git
+http://testbdgit2.educoder.net/eduforge/h6gs8t7q.git
+http://testbdgit2.educoder.net/educoder/ntexhzrl.git
+http://testbdgit2.educoder.net/educoder/jft327sa.git
+http://testbdgit2.educoder.net/educoder/7bvs54gw.git
+http://testbdgit2.educoder.net/educoder/grunzcs3.git
+http://testbdgit2.educoder.net/educoder/q4fowkfa.git
+http://testbdgit2.educoder.net/educoder/fkmtrpsn.git
+http://testbdgit2.educoder.net/educoder/2iubzxfh.git
+http://testbdgit2.educoder.net/educoder/gbhwvrki.git
+http://testbdgit2.educoder.net/educoder/kpxfs4b5.git
+http://testbdgit2.educoder.net/educoder/h5f6wi7x.git
+http://testbdgit2.educoder.net/educoder/c3lr2xjz.git
+http://testbdgit2.educoder.net/educoder/q8bcyxz3.git
+http://testbdgit2.educoder.net/educoder/qha5emif.git
+http://testbdgit2.educoder.net/educoder/5jr4gzs7.git
+http://testbdgit2.educoder.net/educoder/9ksg4up7.git
+http://testbdgit2.educoder.net/educoder/4rcxvftu.git
+http://testbdgit2.educoder.net/educoder/hvaf5txj.git
+http://testbdgit2.educoder.net/educoder/b4vqe8uz.git
+http://testbdgit2.educoder.net/educoder/pg6c2i5y.git
+http://testbdgit2.educoder.net/educoder/fbtlw8ro.git
+http://testbdgit2.educoder.net/educoder/86f92lri.git
+http://testbdgit2.educoder.net/educoder/zvaup9yo.git
+http://testbdgit2.educoder.net/educoder/exm3ffap.git
+http://testbdgit2.educoder.net/educoder/owg63ezu.git
+http://testbdgit2.educoder.net/educoder/c36opqaj.git
+http://testbdgit2.educoder.net/educoder/xuyrc6qs.git
+http://testbdgit2.educoder.net/educoder/xc9tj82p.git
+http://testbdgit2.educoder.net/educoder/nmougtya.git
+http://testbdgit2.educoder.net/educoder/8arufxzl.git
+http://testbdgit2.educoder.net/educoder/m7nrf6zf.git
+http://testbdgit2.educoder.net/educoder/zffu9j6v.git
+http://testbdgit2.educoder.net/educoder/epmtoh6b.git
+http://testbdgit2.educoder.net/educoder/ejab7vxn.git
+http://testbdgit2.educoder.net/educoder/83lyhsen.git
+http://testbdgit2.educoder.net/educoder/m4e6x573.git
+http://testbdgit2.educoder.net/educoder/unfihtsv.git
+http://testbdgit2.educoder.net/educoder/74ftapwb.git
+http://testbdgit2.educoder.net/educoder/iu47m9qx.git
+http://testbdgit2.educoder.net/educoder/8bh6mfu3.git
+http://testbdgit2.educoder.net/educoder/sb26oath.git
+http://testbdgit2.educoder.net/educoder/igvm3fsb.git
+http://testbdgit2.educoder.net/educoder/gancv2yo.git
+http://testbdgit2.educoder.net/educoder/kyp65jwu.git
+http://testbdgit2.educoder.net/educoder/6ru2nbpj.git
+http://testbdgit2.educoder.net/educoder/rfpwhsu5.git
+http://testbdgit2.educoder.net/educoder/orem2wgc.git
+http://testbdgit2.educoder.net/educoder/yuhmfliq.git
+http://testbdgit2.educoder.net/educoder/m4c7jo6y.git
+http://testbdgit2.educoder.net/educoder/5l6oufzc.git
+http://testbdgit2.educoder.net/educoder/my7vcffx.git
+http://testbdgit2.educoder.net/educoder/uvka63xs.git
+http://testbdgit2.educoder.net/educoder/c9thq3li.git
+http://testbdgit2.educoder.net/educoder/o45rn2sl.git
+http://testbdgit2.educoder.net/educoder/sae3fyjc.git
+http://testbdgit2.educoder.net/educoder/56orxtg3.git
+http://testbdgit2.educoder.net/educoder/cqpzx47f.git
+http://testbdgit2.educoder.net/educoder/2in3vcf7.git
+http://testbdgit2.educoder.net/educoder/6isfgtun.git
+http://testbdgit2.educoder.net/educoder/46woubzq.git
+http://testbdgit2.educoder.net/educoder/6xwmi29f.git
+http://testbdgit2.educoder.net/educoder/hk968fua.git
+http://testbdgit2.educoder.net/educoder/ogb6ixjz.git
+http://testbdgit2.educoder.net/educoder/va7cru64.git
+http://testbdgit2.educoder.net/educoder/vqnk5tjo.git
+http://testbdgit2.educoder.net/educoder/oqfsci8u.git
+http://testbdgit2.educoder.net/educoder/qcosi4f8.git
+http://testbdgit2.educoder.net/educoder/bsnk7wit.git
+http://testbdgit2.educoder.net/educoder/ksvmtwql.git
+http://testbdgit2.educoder.net/educoder/eigqpfua.git
+http://testbdgit2.educoder.net/educoder/hqmwxztb.git
+http://testbdgit2.educoder.net/educoder/jlgt9wfk.git
+http://testbdgit2.educoder.net/educoder/hcuzqkgv.git
+http://testbdgit2.educoder.net/educoder/hzw89pof.git
+http://testbdgit2.educoder.net/educoder/xnft4fsm.git
+http://testbdgit2.educoder.net/educoder/guj4ml8q.git
+http://testbdgit2.educoder.net/educoder/l56jkwfn.git
+http://testbdgit2.educoder.net/educoder/4jqry5gl.git
+http://testbdgit2.educoder.net/educoder/65kiwb72.git
+http://testbdgit2.educoder.net/educoder/xb39mzfr.git
+http://testbdgit2.educoder.net/educoder/hyb5m38x.git
+http://testbdgit2.educoder.net/educoder/p4f2jtkq.git
+http://testbdgit2.educoder.net/educoder/4n3stcol.git
+http://testbdgit2.educoder.net/educoder/6kjqar5e.git
+http://testbdgit2.educoder.net/educoder/qhc2prk4.git
+http://testbdgit2.educoder.net/educoder/ltw8b29i.git
+http://testbdgit2.educoder.net/educoder/g5y8zcvl.git
+http://testbdgit2.educoder.net/educoder/5et7zpra.git
+http://testbdgit2.educoder.net/educoder/au97mpbr.git
+http://testbdgit2.educoder.net/educoder/oxmt2zvc.git
+http://testbdgit2.educoder.net/educoder/26chou4y.git
+http://testbdgit2.educoder.net/educoder/lfmus7o2.git
+http://testbdgit2.educoder.net/educoder/efbp7luz.git
+http://testbdgit2.educoder.net/educoder/7lr8agws.git
+http://testbdgit2.educoder.net/educoder/ak8tbjuv.git
+http://testbdgit2.educoder.net/educoder/qu8a93ew.git
+http://testbdgit2.educoder.net/educoder/zlgfiowe.git
+http://testbdgit2.educoder.net/educoder/qmt4nfai.git
+http://testbdgit2.educoder.net/educoder/u2s4v9ba.git
+http://testbdgit2.educoder.net/educoder/2icxsunf.git
+http://testbdgit2.educoder.net/educoder/fzmqjp6g.git
+http://testbdgit2.educoder.net/educoder/7ir3vmzw.git
+http://testbdgit2.educoder.net/educoder/xkfzg96o.git
+http://testbdgit2.educoder.net/educoder/xvfl5sjz.git
+http://testbdgit2.educoder.net/educoder/qnwuy7h3.git
+http://testbdgit2.educoder.net/educoder/bhnspvmg.git
+http://testbdgit2.educoder.net/educoder/ns7vh6ro.git
+http://testbdgit2.educoder.net/eduforge/un3xoal7.git
+http://testbdgit2.educoder.net/educoder/29am7wv4.git
+http://testbdgit2.educoder.net/educoder/qlfn5hiu.git
+http://testbdgit2.educoder.net/educoder/e4pvkhtj.git
+http://testbdgit2.educoder.net/educoder/hfesmtuz.git
+http://testbdgit2.educoder.net/educoder/6kjhil3m.git
+http://testbdgit2.educoder.net/educoder/2igrh8c4.git
+http://testbdgit2.educoder.net/educoder/e7yt3kmw.git
+http://testbdgit2.educoder.net/educoder/a8zybrkt.git
+http://testbdgit2.educoder.net/educoder/v2uzrasj.git
+http://testbdgit2.educoder.net/educoder/rb83htif.git
+http://testbdgit2.educoder.net/eduforge/jc3p2wto.git
+http://testbdgit2.educoder.net/educoder/jtnlfgw2.git
+http://testbdgit2.educoder.net/educoder/fa96xrti.git
+http://testbdgit2.educoder.net/educoder/r6bjga3u.git
+http://testbdgit2.educoder.net/educoder/fpmwzxqn.git
+http://testbdgit2.educoder.net/educoder/rbpsw8ct.git
+http://testbdgit2.educoder.net/educoder/4zuxembp.git
+http://testbdgit2.educoder.net/educoder/3gxwrzaf.git
+http://testbdgit2.educoder.net/educoder/wz6j5lpn.git
+http://testbdgit2.educoder.net/educoder/izu9tf3j.git
+http://testbdgit2.educoder.net/educoder/vhux4pa7.git
+http://testbdgit2.educoder.net/educoder/s9wvroqn.git
+http://testbdgit2.educoder.net/educoder/ruofj2xl.git
+http://testbdgit2.educoder.net/educoder/qj4mlxoi.git
+http://testbdgit2.educoder.net/educoder/34gzbolc.git
+http://testbdgit2.educoder.net/educoder/at86wfsn.git
+http://testbdgit2.educoder.net/educoder/j7fnwsrh.git
+http://testbdgit2.educoder.net/educoder/zgsuk364.git
+http://testbdgit2.educoder.net/educoder/nf3gv54x.git
+http://testbdgit2.educoder.net/educoder/fnbuq957.git
+http://testbdgit2.educoder.net/educoder/z4fp9o3e.git
+http://testbdgit2.educoder.net/educoder/c3qh4p6f.git
+http://testbdgit2.educoder.net/educoder/fszntcbw.git
+http://testbdgit2.educoder.net/educoder/af968lnf.git
+http://testbdgit2.educoder.net/educoder/kpc36fhn.git
+http://testbdgit2.educoder.net/educoder/6c4wp5bu.git
+http://testbdgit2.educoder.net/educoder/hzmikncs.git
+http://testbdgit2.educoder.net/educoder/6ogr4bhj.git
+http://testbdgit2.educoder.net/educoder/fu59rezf.git
+http://testbdgit2.educoder.net/educoder/zef9gswv.git
+http://testbdgit2.educoder.net/educoder/p9z4fxv8.git
+http://testbdgit2.educoder.net/eduforge/hcxeuyfl.git
+http://testbdgit2.educoder.net/educoder/4u2ebx89.git
+http://testbdgit2.educoder.net/educoder/cikojzsb.git
+http://testbdgit2.educoder.net/educoder/2rzomtx5.git
+http://testbdgit2.educoder.net/educoder/wfvbhr2s.git
+http://testbdgit2.educoder.net/educoder/q8mxg4zv.git
+http://testbdgit2.educoder.net/educoder/q8fezi37.git
+http://testbdgit2.educoder.net/educoder/nb7ha8te.git
+http://testbdgit2.educoder.net/educoder/qxgfbyn9.git
+http://testbdgit2.educoder.net/educoder/k8so9wa2.git
+http://testbdgit2.educoder.net/educoder/zwc9ja5y.git
+http://testbdgit2.educoder.net/educoder/89lwscfy.git
+http://testbdgit2.educoder.net/educoder/ga26fy4f.git
+http://testbdgit2.educoder.net/educoder/rgy4769i.git
+http://testbdgit2.educoder.net/educoder/q3rnovik.git
+http://testbdgit2.educoder.net/educoder/r5xsukn4.git
+http://testbdgit2.educoder.net/educoder/yu6za47j.git
+http://testbdgit2.educoder.net/educoder/fqvr56nm.git
+http://testbdgit2.educoder.net/educoder/tq26m73o.git
+http://testbdgit2.educoder.net/educoder/k2rmpuf6.git
+http://testbdgit2.educoder.net/educoder/fzg87ip6.git
+http://testbdgit2.educoder.net/educoder/qk3l64zi.git
+http://testbdgit2.educoder.net/educoder/bcjpk93f.git
+http://testbdgit2.educoder.net/educoder/rnjak48l.git
+http://testbdgit2.educoder.net/educoder/hyzkq5vr.git
+http://testbdgit2.educoder.net/educoder/tqnvbisr.git
+http://testbdgit2.educoder.net/educoder/nfszy26f.git
+http://testbdgit2.educoder.net/educoder/rfnhkvgo.git
+http://testbdgit2.educoder.net/educoder/6omf2gbl.git
+http://testbdgit2.educoder.net/educoder/x4qhb5k7.git
+http://testbdgit2.educoder.net/educoder/jyz63ge5.git
+http://testbdgit2.educoder.net/educoder/hfqwilp3.git
+http://testbdgit2.educoder.net/educoder/aq9c4fy5.git
+http://testbdgit2.educoder.net/educoder/tzshnbl8.git
+http://testbdgit2.educoder.net/educoder/zm8qffrj.git
+http://testbdgit2.educoder.net/educoder/szctor3e.git
+http://testbdgit2.educoder.net/educoder/amcyzpvk.git
+http://testbdgit2.educoder.net/educoder/fpy467o9.git
+http://testbdgit2.educoder.net/educoder/w5nytxec.git
+http://testbdgit2.educoder.net/educoder/icreqzu4.git
+http://testbdgit2.educoder.net/educoder/2jf76xr5.git
+http://testbdgit2.educoder.net/educoder/yl4a2qf5.git
+http://testbdgit2.educoder.net/educoder/jgmcieqk.git
+http://testbdgit2.educoder.net/educoder/hjtxy657.git
+http://testbdgit2.educoder.net/educoder/47w6uyeh.git
+http://testbdgit2.educoder.net/educoder/pr4vg7j5.git
+http://testbdgit2.educoder.net/educoder/m6xn7z93.git
+http://testbdgit2.educoder.net/educoder/f23fge9h.git
+http://testbdgit2.educoder.net/educoder/cfo7lqhs.git
+http://testbdgit2.educoder.net/educoder/4gnkqf3y.git
+http://testbdgit2.educoder.net/educoder/k89bgonj.git
+http://testbdgit2.educoder.net/educoder/k98qr7iw.git
+http://testbdgit2.educoder.net/educoder/jel85v62.git
+http://testbdgit2.educoder.net/educoder/zt2aqnb6.git
+http://testbdgit2.educoder.net/educoder/7icqubfj.git
+http://testbdgit2.educoder.net/educoder/2x59s3by.git
+http://testbdgit2.educoder.net/educoder/mrvwxekj.git
+http://testbdgit2.educoder.net/educoder/k5cruoyp.git
+http://testbdgit2.educoder.net/educoder/rc6hw58u.git
+http://testbdgit2.educoder.net/educoder/ygzf7v3k.git
+http://testbdgit2.educoder.net/educoder/8ty6fgln.git
+http://testbdgit2.educoder.net/educoder/wp5mbjg8.git
+http://testbdgit2.educoder.net/educoder/oniuafxz.git
+http://testbdgit2.educoder.net/educoder/aviljpmn.git
+http://testbdgit2.educoder.net/educoder/iufg8573.git
+http://testbdgit2.educoder.net/educoder/gc8xl2v9.git
+http://testbdgit2.educoder.net/educoder/2wgmhvuk.git
+http://testbdgit2.educoder.net/educoder/clx7ha6j.git
+http://testbdgit2.educoder.net/educoder/bz9wxpvr.git
+http://testbdgit2.educoder.net/educoder/uw95cg28.git
+http://testbdgit2.educoder.net/educoder/4frpc7ix.git
+http://testbdgit2.educoder.net/educoder/nas3v78t.git
+http://testbdgit2.educoder.net/educoder/cbrys8f3.git
+http://testbdgit2.educoder.net/educoder/ofj29enq.git
+http://testbdgit2.educoder.net/educoder/btvk2w5h.git
+http://testbdgit2.educoder.net/educoder/cztbjan5.git
+http://testbdgit2.educoder.net/educoder/7atfm9vu.git
+http://testbdgit2.educoder.net/educoder/cpxs3kfu.git
+http://testbdgit2.educoder.net/educoder/5pfalzkh.git
+http://testbdgit2.educoder.net/educoder/yf6covh2.git
+http://testbdgit2.educoder.net/educoder/ocevha8x.git
+http://testbdgit2.educoder.net/educoder/qtxkogfi.git
+http://testbdgit2.educoder.net/educoder/pa8fh4m2.git
+http://testbdgit2.educoder.net/educoder/n3ps8i4m.git
+http://testbdgit2.educoder.net/educoder/5x9alvmc.git
+http://testbdgit2.educoder.net/educoder/yl732ofk.git
+http://testbdgit2.educoder.net/educoder/hvlgfjb7.git
+http://testbdgit2.educoder.net/educoder/i9sfum58.git
+http://testbdgit2.educoder.net/educoder/my9jcvio.git
+http://testbdgit2.educoder.net/educoder/2myqxbce.git
+http://testbdgit2.educoder.net/educoder/p4x9qmka.git
+http://testbdgit2.educoder.net/educoder/aslcogwk.git
+http://testbdgit2.educoder.net/educoder/eryg8fot.git
+http://testbdgit2.educoder.net/educoder/ust5hgjm.git
+http://testbdgit2.educoder.net/educoder/ypve8gbo.git
+http://testbdgit2.educoder.net/educoder/ir768pfq.git
+http://testbdgit2.educoder.net/educoder/ki98yelu.git
+http://testbdgit2.educoder.net/educoder/i4nzvb7x.git
+http://testbdgit2.educoder.net/educoder/58l7vb9f.git
+http://testbdgit2.educoder.net/educoder/l859pqs3.git
+http://testbdgit2.educoder.net/educoder/6rvpzn7x.git
+http://testbdgit2.educoder.net/educoder/c5msxfe8.git
+http://testbdgit2.educoder.net/educoder/cwa6igze.git
+http://testbdgit2.educoder.net/educoder/vbnqglcw.git
+http://testbdgit2.educoder.net/educoder/8bysvmcf.git
+http://testbdgit2.educoder.net/educoder/u3ceh2xw.git
+http://testbdgit2.educoder.net/educoder/heqtnza3.git
+http://testbdgit2.educoder.net/educoder/uzoltjva.git
+http://testbdgit2.educoder.net/educoder/mefykafs.git
+http://testbdgit2.educoder.net/educoder/6jvypwgq.git
+http://testbdgit2.educoder.net/educoder/h5wisac9.git
+http://testbdgit2.educoder.net/educoder/52ufjw9m.git
+http://testbdgit2.educoder.net/educoder/v2uxoifl.git
+http://testbdgit2.educoder.net/educoder/an2ofy6k.git
+http://testbdgit2.educoder.net/educoder/kao2rlf5.git
+http://testbdgit2.educoder.net/educoder/uihap3wr.git
+http://testbdgit2.educoder.net/educoder/wliam3nq.git
+http://testbdgit2.educoder.net/educoder/7cpo6hel.git
+http://testbdgit2.educoder.net/educoder/bmtlph7e.git
+http://testbdgit2.educoder.net/educoder/b8n9twpf.git
+http://testbdgit2.educoder.net/educoder/3cur5wz6.git
+http://testbdgit2.educoder.net/educoder/h6ga29wv.git
+http://testbdgit2.educoder.net/educoder/67kv4zmg.git
+http://testbdgit2.educoder.net/educoder/buf6h8jf.git
+http://testbdgit2.educoder.net/educoder/gce9ojqv.git
+http://testbdgit2.educoder.net/educoder/jm2l6rwf.git
+http://testbdgit2.educoder.net/educoder/4lwfjfrt.git
+http://testbdgit2.educoder.net/educoder/5qsw32oj.git
+http://testbdgit2.educoder.net/educoder/9yw36vxq.git
+http://testbdgit2.educoder.net/educoder/93fivo6k.git
+http://testbdgit2.educoder.net/educoder/nwy3x4t2.git
+http://testbdgit2.educoder.net/educoder/ku9o2fcf.git
+http://testbdgit2.educoder.net/educoder/s68uqlic.git
+http://testbdgit2.educoder.net/educoder/4bajyohg.git
+http://testbdgit2.educoder.net/educoder/qtfpscz8.git
+http://testbdgit2.educoder.net/educoder/j5u7y6wn.git
+http://testbdgit2.educoder.net/educoder/btku8vcx.git
+http://testbdgit2.educoder.net/educoder/a9n8w2eu.git
+http://testbdgit2.educoder.net/educoder/vze7ny25.git
+http://testbdgit2.educoder.net/educoder/yz5aofe2.git
+http://testbdgit2.educoder.net/educoder/r9nibvz4.git
+http://testbdgit2.educoder.net/educoder/6cvxk3q8.git
+http://testbdgit2.educoder.net/educoder/rmtuvk6z.git
+http://testbdgit2.educoder.net/educoder/sbitr936.git
+http://testbdgit2.educoder.net/educoder/sb6j4raf.git
+http://testbdgit2.educoder.net/educoder/a7gfvh5s.git
+http://testbdgit2.educoder.net/educoder/zsj6ao3c.git
+http://testbdgit2.educoder.net/educoder/8x2epwk6.git
+http://testbdgit2.educoder.net/educoder/cbnfxeiw.git
+http://testbdgit2.educoder.net/educoder/ul47bqcn.git
+http://testbdgit2.educoder.net/educoder/ltsnfy4x.git
+http://testbdgit2.educoder.net/educoder/t53nvo8e.git
+http://testbdgit2.educoder.net/educoder/yojwp2mb.git
+http://testbdgit2.educoder.net/educoder/67nayvtg.git
+http://testbdgit2.educoder.net/educoder/42fq3yx7.git
+http://testbdgit2.educoder.net/educoder/f39hiscw.git
+http://testbdgit2.educoder.net/educoder/jey9avks.git
+http://testbdgit2.educoder.net/educoder/ascbpy86.git
+http://testbdgit2.educoder.net/educoder/vagzfryl.git
+http://testbdgit2.educoder.net/educoder/c6k5i82o.git
+http://testbdgit2.educoder.net/educoder/utr8bp9a.git
+http://testbdgit2.educoder.net/educoder/ul65ap4o.git
+http://testbdgit2.educoder.net/educoder/bmulap4n.git
+http://testbdgit2.educoder.net/educoder/nxj2sfvr.git
+http://testbdgit2.educoder.net/educoder/vq5t9hea.git
+http://testbdgit2.educoder.net/educoder/7g5l6kzr.git
+http://testbdgit2.educoder.net/educoder/2y8t594n.git
+http://testbdgit2.educoder.net/educoder/mlnpqx9r.git
+http://testbdgit2.educoder.net/educoder/apgxmqs7.git
+http://testbdgit2.educoder.net/educoder/vur567ha.git
+http://testbdgit2.educoder.net/educoder/qwctfpjl.git
+http://testbdgit2.educoder.net/educoder/5w6gh9m8.git
+http://testbdgit2.educoder.net/educoder/fzhe4mpv.git
+http://testbdgit2.educoder.net/educoder/vmygstfb.git
+http://testbdgit2.educoder.net/educoder/uryh3e4i.git
+http://testbdgit2.educoder.net/educoder/nbixuzkf.git
+http://testbdgit2.educoder.net/educoder/zpkyj7bs.git
+http://testbdgit2.educoder.net/educoder/79tpk5oy.git
+http://testbdgit2.educoder.net/educoder/s93x58at.git
+http://testbdgit2.educoder.net/educoder/6ymec92a.git
+http://testbdgit2.educoder.net/educoder/7vqgbsfc.git
+http://testbdgit2.educoder.net/educoder/fr5fom8n.git
+http://testbdgit2.educoder.net/educoder/7uzyskn9.git
+http://testbdgit2.educoder.net/educoder/g4fvywf6.git
+http://testbdgit2.educoder.net/educoder/wa98h2ly.git
+http://testbdgit2.educoder.net/educoder/u6i2o3qz.git
+http://testbdgit2.educoder.net/educoder/enxbyiok.git
+http://testbdgit2.educoder.net/educoder/2fuweqf8.git
+http://testbdgit2.educoder.net/educoder/48flws5g.git
+http://testbdgit2.educoder.net/educoder/yugrij4n.git
+http://testbdgit2.educoder.net/educoder/gtbkvm58.git
+http://testbdgit2.educoder.net/educoder/nes73wfv.git
+http://testbdgit2.educoder.net/educoder/oztyjl4h.git
+http://testbdgit2.educoder.net/educoder/f398leqr.git
+http://testbdgit2.educoder.net/educoder/i3xutoze.git
+http://testbdgit2.educoder.net/educoder/mfv6zrj7.git
+http://testbdgit2.educoder.net/educoder/6ujfeqbh.git
+http://testbdgit2.educoder.net/educoder/8x93tfqn.git
+http://testbdgit2.educoder.net/educoder/fxv9bpcw.git
+http://testbdgit2.educoder.net/eduforge/64xb9k2q.git
+http://testbdgit2.educoder.net/educoder/5e4vcr7t.git
+http://testbdgit2.educoder.net/educoder/qwaffs2p.git
+http://testbdgit2.educoder.net/educoder/ose7482b.git
+http://testbdgit2.educoder.net/educoder/wt2xfzny.git
+http://testbdgit2.educoder.net/educoder/cuqnpzjv.git
+http://testbdgit2.educoder.net/educoder/n3a8q9b2.git
+http://testbdgit2.educoder.net/educoder/f9o4hpix.git
+http://testbdgit2.educoder.net/educoder/bm9qr7ue.git
+http://testbdgit2.educoder.net/educoder/nhlygi7p.git
+http://testbdgit2.educoder.net/educoder/mf2vfngu.git
+http://testbdgit2.educoder.net/educoder/x6tsevzy.git
+http://testbdgit2.educoder.net/educoder/rjfbm74o.git
+http://testbdgit2.educoder.net/educoder/ztbukf7e.git
+http://testbdgit2.educoder.net/educoder/pf8yze9h.git
+http://testbdgit2.educoder.net/educoder/nrug2mfz.git
+http://testbdgit2.educoder.net/educoder/jswmzaxr.git
+http://testbdgit2.educoder.net/educoder/wpxjzo3c.git
+http://testbdgit2.educoder.net/educoder/zaohblre.git
+http://testbdgit2.educoder.net/educoder/psx2h9kf.git
+http://testbdgit2.educoder.net/educoder/ayju6fie.git
+http://testbdgit2.educoder.net/educoder/5kp9guol.git
+http://testbdgit2.educoder.net/educoder/c4ztkfb2.git
+http://testbdgit2.educoder.net/educoder/kboupjtl.git
+http://testbdgit2.educoder.net/educoder/bcvhs9u7.git
+http://testbdgit2.educoder.net/educoder/26vljnb3.git
+http://testbdgit2.educoder.net/educoder/zesqa3wi.git
+http://testbdgit2.educoder.net/educoder/43phxgsf.git
+http://testbdgit2.educoder.net/educoder/fbx6awcm.git
+http://testbdgit2.educoder.net/educoder/i2s7jof5.git
+http://testbdgit2.educoder.net/educoder/n2w4jrax.git
+http://testbdgit2.educoder.net/educoder/4pou5tey.git
+http://testbdgit2.educoder.net/eduforge/e9qr7cxi.git
+http://testbdgit2.educoder.net/educoder/y6bg739q.git
+http://testbdgit2.educoder.net/educoder/h32r58s7.git
+http://testbdgit2.educoder.net/eduforge/hpr7ojgc-1.git
+http://testbdgit2.educoder.net/educoder/c3j4hufp.git
+http://testbdgit2.educoder.net/eduforge/o72clmi4.git
+http://testbdgit2.educoder.net/educoder/qfz8o2r6.git
+http://testbdgit2.educoder.net/educoder/rw3i8vf2.git
+http://testbdgit2.educoder.net/educoder/shpwf3xf.git
+http://testbdgit2.educoder.net/eduforge/vnw2fg5r.git
+http://testbdgit2.educoder.net/innov/f2izon59.git
+http://testbdgit2.educoder.net/innov/qlkpiusm.git
+http://testbdgit2.educoder.net/innov/edu1547017399.git
+http://testbdgit2.educoder.net/forge01/cermyt39.git
+http://testbdgit2.educoder.net/innov/em3z8yn6.git
+http://testbdgit2.educoder.net/innov/c8ynf526.git
+http://testbdgit2.educoder.net/Hjqreturn/sx36oveq.git
+http://testbdgit2.educoder.net/innov/t7sxkfab20190115135957.git
+http://testbdgit2.educoder.net/innov/etlb3pn620190115140004.git
+http://testbdgit2.educoder.net/innov/5jbomfrg20190115140011.git
+http://testbdgit2.educoder.net/innov/6ecmbf7g20190115140015.git
+http://testbdgit2.educoder.net/innov/f7jn8kex20190115140330.git
diff --git a/lib/gitcheck/shixun_update_error.txt b/lib/gitcheck/shixun_update_error.txt
new file mode 100644
index 000000000..ef9663c46
--- /dev/null
+++ b/lib/gitcheck/shixun_update_error.txt
@@ -0,0 +1,72 @@
+mbtclufr
+9op3hs4j
+96ctv7yr
+rtmzxfke
+ofqxthrf
+czu9w4gj
+9fpzj6et
+pwhc865b
+maozpx4l
+y5wh2ofx
+b5rzhpf3
+bs243nrl
+47fn2yfb
+kwotfxey
+w5468sbp
+fyekprio
+q6ze5fih
+b5hjq9zm
+ky8pbqux
+53phc7nq
+b9j2yuix
+9t3uphwk
+iokm8ah2
+qlsy6xb4
+345bqhfi
+v728fqia
+4euftvf2
+f23sef5m
+nhqis8m9
+qp72tb5x
+gt3anszw
+tng6heyf
+nb9keawo
+elgnbkp9
+4neslomg
+lh35s6ma
+xmc4rpay
+qrpaxi6b
+9fla2zry
+efuibzrm
+fzp3iu4w
+pligsyn8
+glbksr29
+kfm7ghyc
+p6hk3svf
+p539gjhm
+am5o73er
+4x3qwrbe
+fqosyl8g
+of5z3fci
+tb7hw62n
+ie6zxg7r
+4q2bmy9h
+fpm3u5yb
+nikx3ojt
+vt82s9bq
+ma59fefo
+lxa39tfq
+4gnockxf
+nxwg84ey
+fmie8nzb
+w5nsr24v
+4hn3efwc
+h9ljfbq7
+nuv54t8b
+2te9fmfq
+vihnsayz
+qhlyn82s
+vw74kmfr
+vcta36bz
+henz425l
+g529v38z
diff --git a/lib/tasks/git_check.rake b/lib/tasks/git_check.rake
index 64f8be91b..a5e95eedc 100644
--- a/lib/tasks/git_check.rake
+++ b/lib/tasks/git_check.rake
@@ -1,15 +1,52 @@
+# 需要做的几件事：
+# 1、检测两边（TPM\TPI）同步后有更新的仓库
+#
+
 namespace :git do
   desc "检测是否TPM是否需要更新"
   task :shixun_check_update => :environment do
-
+    g = Gitlab.client
+    file_txt = File.new("lib/gitcheck/shixun_update.txt", "r+")
+    file_error_txt = File.new("lib/gitcheck/shixun_update_error.txt", "r+")
+    host = EduSetting.find_by_name("git_address_domain").try(:value)
+    Shixun.find_each do |shixun|
+      begin
+        gitlab_commit = g.commits(shixun.gpid, :ref_name => 'master').first.try(:id)
+        repo_name = shixun.repo_name
+        git_commit = GitService.commits(repo_path: "#{repo_name}.git").first["id"]
+        git_url = host + "/" + repo_name + ".git\n"
+        if git_commit != gitlab_commit
+          file_txt.syswrite(git_url)
+        end
+      rescue
+        file_error_txt.syswrite("#{shixun.identifier}\n")
+      end
+    end
   end
 
-  desc "检测版本库是否有异常"
+  desc "检测版本库是否有更新"
   task :myshixuns_check_update => :environment do
-
+    g = Gitlab.client
+    file_txt = File.new("lib/gitcheck/myshixun_update.txt", "r+")
+    file_error_txt = File.new("lib/gitcheck/myshixun_update_error.txt", "r+")
+    host = EduSetting.find_by_name("git_address_domain").try(:value)
+    Myshixun.find_each do |myshixun|
+      begin
+        gitlab_commit = g.commits(myshixun.gpid, :ref_name => 'master').first.try(:id)
+        repo_name = myshixun.repo_name
+        git_commit = GitService.commits(repo_path: "#{repo_name}.git").first["id"]
+        git_url = host + "/" + repo_name + ".git\n"
+        if git_commit != gitlab_commit
+          file_txt.syswrite(git_url)
+        end
+      rescue
+        file_error_txt.syswrite("#{myshixun.identifier}\n")
+      end
+    end
   end
 
 
+  # 检测TPI没有迁移过来的
   task :check => :environment do
 
   end

From bab042a7a5e80ec2f1739b13e68fd09f5ca61743 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 11:35:10 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=9B=86=E8=A7=A3?=
 =?UTF-8?q?=E9=94=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb | 1 +
 config/routes.rb                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 32175ec2f..4e7afa516 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -270,6 +270,7 @@ class GamesController < ApplicationController
         if @game.status == 2
           @game.update_attributes!(:answer_open => @answer.level)
         else
+          # 扣除总分计算
           answer_deduction = challenge.challenge_answers.where("level <= #{@answer.level}").sum(:score)
           @game.update_attributes!(:answer_open => @answer.level, :answer_deduction => answer_deduction)
         end
diff --git a/config/routes.rb b/config/routes.rb
index ecd54c8c0..f81d90267 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -117,6 +117,7 @@ Rails.application.routes.draw do
         get :close_webssh
         get :get_answer_info
         get :unlock_answer
+        get :check_test_sets
 
       end
       collection do

From f755a2dca8aacaba6d1b5f74d502c9f3d7776a93 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 14:07:24 +0800
Subject: [PATCH 10/15] fix export exercise pdf

---
 app/controllers/accounts_controller.rb               | 1 -
 app/services/exercise_user_pdf_service.rb            | 6 +++---
 app/templates/exercise_export/exercise_export.css    | 2 +-
 app/templates/exercise_export/exercise_user.html.erb | 7 ++++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index c3333c912..0d32926e4 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -83,7 +83,6 @@ class AccountsController < ApplicationController
         email = params[:login]
         verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
         user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
-
       end
       check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       unless check_code
diff --git a/app/services/exercise_user_pdf_service.rb b/app/services/exercise_user_pdf_service.rb
index d74e66d31..663d8b042 100644
--- a/app/services/exercise_user_pdf_service.rb
+++ b/app/services/exercise_user_pdf_service.rb
@@ -47,7 +47,7 @@ class ExerciseUserPdfService
   end
 
   def load_data
-    @exercise_questions = exercise.exercise_questions
+    @exercise_questions = exercise.exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments)
     @exercise_ques_count = @exercise_questions.count # 全部的题目数
     @exercise_ques_scores = @exercise_questions.pluck(:question_score).sum
 
@@ -81,9 +81,9 @@ class ExerciseUserPdfService
     @exercise_ques_shixun_count = exercise_ques_shixun.all.count
     @exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
 
-    challenge_ids = @exercise_questions.joins(:exercise_shixun_challenges).pluck("exercise_shixun_challenges.challenge_id")
+    challenge_ids = @exercise_questions.pluck("exercise_shixun_challenges.challenge_id")
 
     get_each_student_exercise(exercise.id,@exercise_questions,@ex_user_user.id)
-    @games = @exercise_user.user.games.ch_games(challenge_ids)
+    # @games = @exercise_user.user.games.ch_games(challenge_ids)
   end
 end
\ No newline at end of file
diff --git a/app/templates/exercise_export/exercise_export.css b/app/templates/exercise_export/exercise_export.css
index 59be4f1bd..e04f77035 100644
--- a/app/templates/exercise_export/exercise_export.css
+++ b/app/templates/exercise_export/exercise_export.css
@@ -231,7 +231,7 @@ p{
     position: absolute;
     display: inline-block;
     bottom: 9px;
-    left: 1px;
+    left: 2px;
 }
 .circle-right:after{
     color:#fff;
diff --git a/app/templates/exercise_export/exercise_user.html.erb b/app/templates/exercise_export/exercise_user.html.erb
index 193a25301..c81f45d68 100644
--- a/app/templates/exercise_export/exercise_user.html.erb
+++ b/app/templates/exercise_export/exercise_user.html.erb
@@ -112,6 +112,7 @@
     <div class="mbt10">
       <% @exercise_questions.each do |q| %>
         <% q_type = q.question_type %>
+        <% games =( q_type == 5 ? @ex_user_user.games.ch_games(q.exercise_shixun_challenges.pluck(:challenge_id)) : nil) %>
         <% user_answer = (q_type == 5 ? q.exercise_shixun_answers.where(user_id: @ex_user_user.id) : q.exercise_answers.where(user_id: @ex_user_user.id)) %>
         <% this_ques_status = @ex_obj_array.detect{|f| f[:q_id] == q.id} %>
         <% main_ques_status = @ex_sub_array.detect{|f| f[:q_id] == q.id} %>
@@ -247,8 +248,8 @@
                     <th width="13%">得分/满分</th>
                     </thead>
                     <tbody>
-                    <% if @games.size > 0 %>
-                      <% @games.each_with_index do |game, index| %>
+                    <% if games.present? %>
+                      <% games&.each_with_index do |game, index| %>
                         <% game_score = q.exercise_shixun_challenges.where(challenge_id:game.challenge.id) %>
                         <% user_score = q.exercise_shixun_answers.where(exercise_shixun_challenge_id: game_score&.first&.id,user_id: @ex_user_user.id) %>
                         <tr>
@@ -286,7 +287,7 @@
                   <p class="text-gray mbt10">
                     <span class="fl font-bd">实训详情</span>
                   </p>
-                  <% @games.each_with_index do |game, index| %>
+                  <% games&.each_with_index do |game, index| %>
                     <div class="mbt10">
                       <p class="clearfix">
                         <span class="fl mt3"><span class="font-bd mr15">第<%= index+1 %>关</span><%= game.challenge.subject %></span>

From 3eadedc9ad3ec611e67016d761870fe42f312f78 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 14:11:38 +0800
Subject: [PATCH 11/15] fix bug

---
 app/services/exercise_user_pdf_service.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/services/exercise_user_pdf_service.rb b/app/services/exercise_user_pdf_service.rb
index 663d8b042..d76e792c4 100644
--- a/app/services/exercise_user_pdf_service.rb
+++ b/app/services/exercise_user_pdf_service.rb
@@ -47,7 +47,7 @@ class ExerciseUserPdfService
   end
 
   def load_data
-    @exercise_questions = exercise.exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments)
+    @exercise_questions = exercise.exercise_questions
     @exercise_ques_count = @exercise_questions.count # 全部的题目数
     @exercise_ques_scores = @exercise_questions.pluck(:question_score).sum
 
@@ -80,8 +80,9 @@ class ExerciseUserPdfService
     exercise_ques_shixun = @exercise_questions.find_by_custom("question_type",5)
     @exercise_ques_shixun_count = exercise_ques_shixun.all.count
     @exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
+    @exercise_questions = @exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
 
-    challenge_ids = @exercise_questions.pluck("exercise_shixun_challenges.challenge_id")
+    # challenge_ids = @exercise_questions.pluck("exercise_shixun_challenges.challenge_id")
 
     get_each_student_exercise(exercise.id,@exercise_questions,@ex_user_user.id)
     # @games = @exercise_user.user.games.ch_games(challenge_ids)

From d89a9138d15975ecafc33c0b6adf234c934e8a03 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 14:13:27 +0800
Subject: [PATCH 12/15] fix bug

---
 app/services/exercise_user_pdf_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/exercise_user_pdf_service.rb b/app/services/exercise_user_pdf_service.rb
index d76e792c4..ae90f60bf 100644
--- a/app/services/exercise_user_pdf_service.rb
+++ b/app/services/exercise_user_pdf_service.rb
@@ -80,7 +80,7 @@ class ExerciseUserPdfService
     exercise_ques_shixun = @exercise_questions.find_by_custom("question_type",5)
     @exercise_ques_shixun_count = exercise_ques_shixun.all.count
     @exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
-    @exercise_questions = @exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
+    # @exercise_questions = @exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
 
     # challenge_ids = @exercise_questions.pluck("exercise_shixun_challenges.challenge_id")
 

From ca172d57e796a813a65d581fcebe1fcd47fb09e1 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 14:19:15 +0800
Subject: [PATCH 13/15] fix exprot exercise bugs 2

---
 app/services/exercise_user_pdf_service.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/services/exercise_user_pdf_service.rb b/app/services/exercise_user_pdf_service.rb
index ae90f60bf..422c3ad5f 100644
--- a/app/services/exercise_user_pdf_service.rb
+++ b/app/services/exercise_user_pdf_service.rb
@@ -47,7 +47,7 @@ class ExerciseUserPdfService
   end
 
   def load_data
-    @exercise_questions = exercise.exercise_questions
+    @exercise_questions = exercise.exercise_questions.includes(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
     @exercise_ques_count = @exercise_questions.count # 全部的题目数
     @exercise_ques_scores = @exercise_questions.pluck(:question_score).sum
 
@@ -80,11 +80,7 @@ class ExerciseUserPdfService
     exercise_ques_shixun = @exercise_questions.find_by_custom("question_type",5)
     @exercise_ques_shixun_count = exercise_ques_shixun.all.count
     @exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
-    # @exercise_questions = @exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
-
-    # challenge_ids = @exercise_questions.pluck("exercise_shixun_challenges.challenge_id")
 
     get_each_student_exercise(exercise.id,@exercise_questions,@ex_user_user.id)
-    # @games = @exercise_user.user.games.ch_games(challenge_ids)
   end
 end
\ No newline at end of file

From 6e36cc24ab8b803028f99cad4d90ce6198b8c859 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 14:22:04 +0800
Subject: [PATCH 14/15] fix bug

---
 app/services/exercise_user_pdf_service.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/exercise_user_pdf_service.rb b/app/services/exercise_user_pdf_service.rb
index 422c3ad5f..28857dff9 100644
--- a/app/services/exercise_user_pdf_service.rb
+++ b/app/services/exercise_user_pdf_service.rb
@@ -47,7 +47,7 @@ class ExerciseUserPdfService
   end
 
   def load_data
-    @exercise_questions = exercise.exercise_questions.includes(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
+    @exercise_questions = exercise.exercise_questions
     @exercise_ques_count = @exercise_questions.count # 全部的题目数
     @exercise_ques_scores = @exercise_questions.pluck(:question_score).sum
 
@@ -81,6 +81,8 @@ class ExerciseUserPdfService
     @exercise_ques_shixun_count = exercise_ques_shixun.all.count
     @exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
 
+    @exercise_questions = @exercise_questions.includes(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments,:exercise_standard_answers)
     get_each_student_exercise(exercise.id,@exercise_questions,@ex_user_user.id)
+
   end
 end
\ No newline at end of file

From 28c641510c13cd7a6477df4c8176ac6dbec0292d Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 27 Jun 2019 14:32:05 +0800
Subject: [PATCH 15/15] fix bug

---
 app/controllers/exercises_controller.rb           | 2 +-
 app/templates/exercise_export/exercise_export.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 44b694239..e1e8e226b 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1334,7 +1334,7 @@ class ExercisesController < ApplicationController
 
   #导出空白试卷
   def export_exercise
-    @exercise_questions = @exercise.exercise_questions.order("question_number ASC")
+    @exercise_questions = @exercise.exercise_questions.includes(:exercise_choices).order("question_number ASC")
     filename = "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.current.strftime('%Y%m%d%H%M%S')}.pdf"
     stylesheets = "#{Rails.root}/app/templates/exercise_export/exercise_export.css"
     render pdf: 'exercise_export/blank_exercise', filename: filename, stylesheets: stylesheets
diff --git a/app/templates/exercise_export/exercise_export.css b/app/templates/exercise_export/exercise_export.css
index e04f77035..9190e9251 100644
--- a/app/templates/exercise_export/exercise_export.css
+++ b/app/templates/exercise_export/exercise_export.css
@@ -156,7 +156,7 @@ p{
     position: absolute;
     display: inline-block;
     bottom: 6px;
-    /*left: 1px;*/
+    left: 1px;
 }
 
 .line-line {