From b96c293184eb87756b33e8c61fbc8c2f55977af2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 14 Mar 2019 17:02:49 +0800
Subject: [PATCH 1/9] check sign

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

diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb
index d104195e..0201fd73 100644
--- a/app/controllers/ecloud_controller.rb
+++ b/app/controllers/ecloud_controller.rb
@@ -17,7 +17,7 @@ require 'digest'
 class EcloudController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
-  # before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
+  before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
   before_filter :save_para
 
   before_filter :user_setup

From 69c3952b0fb5d78721a13ef77f4cfcb4ec82a7df Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 14 Mar 2019 17:20:08 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=BE=E7=A8=8B--?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=BB=E7=9F=A5MD=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/_paths_list.html.erb | 17 +----------------
 app/views/subjects/show.html.erb        | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/views/subjects/_paths_list.html.erb b/app/views/subjects/_paths_list.html.erb
index bfd59337..615eaa18 100644
--- a/app/views/subjects/_paths_list.html.erb
+++ b/app/views/subjects/_paths_list.html.erb
@@ -70,22 +70,7 @@
   </div>
 <% end %>
 <script>
-    /* -------------- 简介Md -------------------- */
-    var shixunPro = editormd.markdownToHTML("shixuns_propaedeutics", {
-        htmlDecode: "style,script,iframe",  // you can filter tags decode
-        taskList: true,
-        tex: true,  // 默认不解析
-        flowChart: true,  // 默认不解析
-        sequenceDiagram: true // 默认不解析
-    });
-    /* -------------- 简介Md -------------------- */
-    var shixunPro = editormd.markdownToHTML("subject_learning_notes", {
-        htmlDecode: "style,script,iframe",  // you can filter tags decode
-        taskList: true,
-        tex: true,  // 默认不解析
-        flowChart: true,  // 默认不解析
-        sequenceDiagram: true // 默认不解析
-    });
+
     var flag = true;
 
     $(function() {
diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index 4d1df9e2..e70edefa 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -109,6 +109,23 @@
   <% end %>
 </div>
 <script>
+
+    /* -------------- 简介Md -------------------- */
+    var shixunPro = editormd.markdownToHTML("shixuns_propaedeutics", {
+        htmlDecode: "style,script,iframe",  // you can filter tags decode
+        taskList: true,
+        tex: true,  // 默认不解析
+        flowChart: true,  // 默认不解析
+        sequenceDiagram: true // 默认不解析
+    });
+    /* -------------- 课程须知MD -------------------- */
+    var shixunPro = editormd.markdownToHTML("subject_learning_notes", {
+        htmlDecode: "style,script,iframe",  // you can filter tags decode
+        taskList: true,
+        tex: true,  // 默认不解析
+        flowChart: true,  // 默认不解析
+        sequenceDiagram: true // 默认不解析
+    });
     //点击新建阶段
     $(".click_add").click(function(){
         if($("#new_stage_form").length == 1){

From d627f3a0b91905522bdd2f1ba1db772d2a2d2f19 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 14 Mar 2019 18:14:43 +0800
Subject: [PATCH 3/9] Merge branch 'develop' of
 http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

# Conflicts:
#	app/controllers/ecloud_controller.rb
---
 public/javascripts/educoder/edu_account.js | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/public/javascripts/educoder/edu_account.js b/public/javascripts/educoder/edu_account.js
index 89086802..eedc4db5 100644
--- a/public/javascripts/educoder/edu_account.js
+++ b/public/javascripts/educoder/edu_account.js
@@ -1521,22 +1521,24 @@ function my_account_form_submit() {
         }
     }
 
+    if ($("input[name='new_password']").length>0){
+        if($("input[name='new_password']").val().length<8){
+            $("#new_password").focus();
+            $("#new_password_hint").show();
+            return;
+        } else {
+            $("#new_password_hint").hide();
+        }
 
-    if($("input[name='new_password']").val().length<8){
-        $("#new_password").focus();
-        $("#new_password_hint").show();
-        return;
-    } else {
-        $("#new_password_hint").hide();
+        if($("input[name='new_password']").val() !== $("input[name='new_password_confirmation']").val() ){
+            $("#new_password_confirmation").focus();
+            $("#new_password_confirmation_hint").show();
+            return;
+        } else {
+            $("#new_password_confirmation_hint").hide();
+        }
     }
 
-    if($("input[name='new_password']").val() !== $("input[name='new_password_confirmation']").val() ){
-        $("#new_password_confirmation").focus();
-        $("#new_password_confirmation_hint").show();
-        return;
-    } else {
-        $("#new_password_confirmation_hint").hide();
-    }
 
     if ($("#userIdentity").val() == -1) {
         $("#identity_hint").show();

From 94d022938dc7dea813f5ee3916d37f059a158b7c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Mar 2019 18:38:47 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ent_works.rb => 20190314080808_create_shixun_student_works.rb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename db/migrate/{20190314080807_create_shixun_student_works.rb => 20190314080808_create_shixun_student_works.rb} (100%)

diff --git a/db/migrate/20190314080807_create_shixun_student_works.rb b/db/migrate/20190314080808_create_shixun_student_works.rb
similarity index 100%
rename from db/migrate/20190314080807_create_shixun_student_works.rb
rename to db/migrate/20190314080808_create_shixun_student_works.rb

From 8ba070106dec65e5344318ed812d28a500590ba4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Mar 2019 18:57:49 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ent_works.rb => 20190314080809_create_shixun_student_works.rb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename db/migrate/{20190314080808_create_shixun_student_works.rb => 20190314080809_create_shixun_student_works.rb} (100%)

diff --git a/db/migrate/20190314080808_create_shixun_student_works.rb b/db/migrate/20190314080809_create_shixun_student_works.rb
similarity index 100%
rename from db/migrate/20190314080808_create_shixun_student_works.rb
rename to db/migrate/20190314080809_create_shixun_student_works.rb

From 6c8401ab0427dad4457b2d1b567bd61a43e02fae Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Mar 2019 19:03:44 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...20190314080809_create_shixun_student_works.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20190314080809_create_shixun_student_works.rb b/db/migrate/20190314080809_create_shixun_student_works.rb
index 83bac6c7..09be3891 100644
--- a/db/migrate/20190314080809_create_shixun_student_works.rb
+++ b/db/migrate/20190314080809_create_shixun_student_works.rb
@@ -1,4 +1,17 @@
 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
@@ -20,6 +33,7 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
             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?
@@ -64,7 +78,7 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
         end
       rescue Exception => e
         puts ("###failed to exec shixun: current task id is #{e}")
-        g.delete_project(gshixun.id) if gshixun.try(:id).present?
+        # g.delete_project(gshixun.id) if gshixun.try(:id).present?
         raise ActiveRecord::Rollback
       end
     end

From 6040f8165dec1fa28b535123b97e08f5bfccac9e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Mar 2019 19:06:57 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...works.rb => 20190314080800_create_shixun_student_works.rb} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename db/migrate/{20190314080809_create_shixun_student_works.rb => 20190314080800_create_shixun_student_works.rb} (93%)

diff --git a/db/migrate/20190314080809_create_shixun_student_works.rb b/db/migrate/20190314080800_create_shixun_student_works.rb
similarity index 93%
rename from db/migrate/20190314080809_create_shixun_student_works.rb
rename to db/migrate/20190314080800_create_shixun_student_works.rb
index 09be3891..3fe2b4e7 100644
--- a/db/migrate/20190314080809_create_shixun_student_works.rb
+++ b/db/migrate/20190314080800_create_shixun_student_works.rb
@@ -47,7 +47,9 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
                                           :onclick_time => Time.now, :gpid => gshixun.id,
                                           :git_url => gshixun.try(:path_with_namespace), :commit_id => commit_id)
 
-              rep_url = Base64.urlsafe_encode64(gitlab_url shixun) # 注意：educoder为默认给实训创建版本库的用户，如果换成别的用户，名字要相应的修改
+              url = "#{Redmine::Configuration['gitlab_address_ip']}/#{g.project(container.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}")

From 9d606f6349d576e9007dbffff34e9a494c6135a3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Mar 2019 19:11:45 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...t_works.rb => 20190314080801_create_shixun_student_works.rb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename db/migrate/{20190314080800_create_shixun_student_works.rb => 20190314080801_create_shixun_student_works.rb} (98%)

diff --git a/db/migrate/20190314080800_create_shixun_student_works.rb b/db/migrate/20190314080801_create_shixun_student_works.rb
similarity index 98%
rename from db/migrate/20190314080800_create_shixun_student_works.rb
rename to db/migrate/20190314080801_create_shixun_student_works.rb
index 3fe2b4e7..29e5f4b4 100644
--- a/db/migrate/20190314080800_create_shixun_student_works.rb
+++ b/db/migrate/20190314080801_create_shixun_student_works.rb
@@ -47,7 +47,7 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
                                           :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(container.try(:gpid)).try(:path_with_namespace)}.git"
+              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"

From ef42f1ac699d7a63739faec606177f837ee59f37 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 14 Mar 2019 19:14:10 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...works.rb => 20190314080802_create_shixun_student_works.rb} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename db/migrate/{20190314080801_create_shixun_student_works.rb => 20190314080802_create_shixun_student_works.rb} (96%)

diff --git a/db/migrate/20190314080801_create_shixun_student_works.rb b/db/migrate/20190314080802_create_shixun_student_works.rb
similarity index 96%
rename from db/migrate/20190314080801_create_shixun_student_works.rb
rename to db/migrate/20190314080802_create_shixun_student_works.rb
index 29e5f4b4..240adc00 100644
--- a/db/migrate/20190314080801_create_shixun_student_works.rb
+++ b/db/migrate/20190314080802_create_shixun_student_works.rb
@@ -53,7 +53,9 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
               uri = "#{shixun_tomcat}/bridge/game/openGameInstance"
               params = {tpiID: "#{myshixun.id}", tpmGitURL:rep_url, tpiRepoName: gshixun.try(:name)}
               logger.info("openGameInstance params is #{params}")
-              res = uri_exec uri, 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