From c78e45005478c2f8b0c8742c14d03cc9a1ad7b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Jun 2019 16:26:55 +0800
Subject: [PATCH 1/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

---
 app/views/shixuns/_settings_edit.html.erb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 21ffacfb..be896706 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -304,6 +304,7 @@
             <label class="panel-form-label fl">CPU(核)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+                     disabled=<!=list.admin!>
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -312,6 +313,7 @@
             <label class="panel-form-label fl">最低CPU(核)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="lower_cpu_limit[]" value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+                     disabled=<!=list.admin!>
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -320,6 +322,7 @@
             <label class="panel-form-label fl">内存限制(M)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="memory_limit[]" value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+                     disabled=<!=list.admin!>
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -328,6 +331,7 @@
             <label class="panel-form-label fl">内存要求(M)：</label>
             <div class="pr fl with20 status_con">
               <input type="text" name="request_limit[]" value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+                     disabled=<!=list.admin!>
                      placeholder="请输入类别名称"/>
             </div>
             <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
@@ -365,12 +369,13 @@
         <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
           <!=listname[i]!>
         </p>
-        <input type="hidden" name="mirror_id[]"  value=<!=list[i]!> >
+        <input type="hidden" name="mirror_id[]"  value=>
         <div class="clearfix mb5">
           <label class="panel-form-label fl">CPU(核)：</label>
           <div class="pr fl with80 status_con">
             <input type="text" name="cpu_limit[]" value="1" class="panel-box-sizing task-form-100 task-height-40"
-                   placeholder="请输入类别名称"/>
+                   disabled=<!=list.admin!>
+            placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
         </div>
@@ -378,6 +383,7 @@
           <label class="panel-form-label fl">最低CPU(核)：</label>
           <div class="pr fl with80 status_con">
             <input type="text" name="lower_cpu_limit[]" value="0.1" class="panel-box-sizing task-form-100 task-height-40"
+                   disabled=<!=list.admin!>
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -386,6 +392,7 @@
           <label class="panel-form-label fl">内存限制(M)：</label>
           <div class="pr fl with80 status_con">
             <input type="text" name="memory_limit[]" value="1024" class="panel-box-sizing task-form-100 task-height-40"
+                   disabled=<!=list.admin!>
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -394,6 +401,7 @@
           <label class="panel-form-label fl">内存要求(M)：</label>
           <div class="pr fl with20 status_con">
             <input type="text" name="request_limit[]" value="10" class="panel-box-sizing task-form-100 task-height-40"
+                   disabled=<!=list.admin!>
                    placeholder="请输入类别名称"/>
           </div>
           <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
@@ -529,9 +537,10 @@
           }
           var data={
               "listname":arrs,
-              "list":idarr
+              "list":idarr,
+              "admin":<%= User.current.admin? %>
           };
-          debugger
+
           var htmlidarr=bt('t:edit-setting-list',data);
           document.getElementById('result').innerHTML=htmlidarr;
           $("input[name='small_type']").val(idarr);

From bf6bccfc7a4bcc52bdc2fd709f355da547aa8d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Jun 2019 16:28:03 +0800
Subject: [PATCH 2/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

---
 app/views/shixuns/_settings_edit.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index be896706..66cda120 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -304,7 +304,7 @@
             <label class="panel-form-label fl">CPU(核)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled=<!=list.admin!>
+                     disabled="">
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -313,7 +313,7 @@
             <label class="panel-form-label fl">最低CPU(核)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="lower_cpu_limit[]" value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled=<!=list.admin!>
+                     disabled="">
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -322,7 +322,7 @@
             <label class="panel-form-label fl">内存限制(M)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="memory_limit[]" value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled=<!=list.admin!>
+                     disabled="">
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -331,7 +331,7 @@
             <label class="panel-form-label fl">内存要求(M)：</label>
             <div class="pr fl with20 status_con">
               <input type="text" name="request_limit[]" value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled=<!=list.admin!>
+                     disabled="">
                      placeholder="请输入类别名称"/>
             </div>
             <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>

From 2fcf391018896d62bbe6e7a16c7f85b7a9af8947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Jun 2019 16:31:20 +0800
Subject: [PATCH 3/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

---
 app/views/shixuns/_settings_edit.html.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 66cda120..80b416a2 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -295,7 +295,7 @@
       </div>
     <% end %>
     <% if User.current.admin? || User.current.business? %>
-      <div class="edu-back-white padding40-20 mb20">
+      <div class=<%User.current.admin? || User.current.business? ? "edu-back-white padding40-20 mb20":"none" %> >
         <p class="color-grey-6 font-16 mb30">服务配置</p>
         <% @shixun.shixun_service_configs.each do |config| %>
           <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name"><%= config.mirror_repository.try(:type_name) %></p>
@@ -304,7 +304,7 @@
             <label class="panel-form-label fl">CPU(核)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled="">
+                     >
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -313,7 +313,7 @@
             <label class="panel-form-label fl">最低CPU(核)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="lower_cpu_limit[]" value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled="">
+                     >
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -322,7 +322,7 @@
             <label class="panel-form-label fl">内存限制(M)：</label>
             <div class="pr fl with80 status_con">
               <input type="text" name="memory_limit[]" value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled="">
+                     >
                      placeholder="请输入类别名称"/>
             </div>
             <div class="cl"></div>
@@ -331,7 +331,7 @@
             <label class="panel-form-label fl">内存要求(M)：</label>
             <div class="pr fl with20 status_con">
               <input type="text" name="request_limit[]" value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     disabled="">
+                     >
                      placeholder="请输入类别名称"/>
             </div>
             <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
@@ -374,7 +374,7 @@
           <label class="panel-form-label fl">CPU(核)：</label>
           <div class="pr fl with80 status_con">
             <input type="text" name="cpu_limit[]" value="1" class="panel-box-sizing task-form-100 task-height-40"
-                   disabled=<!=list.admin!>
+                   >
             placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -383,7 +383,7 @@
           <label class="panel-form-label fl">最低CPU(核)：</label>
           <div class="pr fl with80 status_con">
             <input type="text" name="lower_cpu_limit[]" value="0.1" class="panel-box-sizing task-form-100 task-height-40"
-                   disabled=<!=list.admin!>
+                   >
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -392,7 +392,7 @@
           <label class="panel-form-label fl">内存限制(M)：</label>
           <div class="pr fl with80 status_con">
             <input type="text" name="memory_limit[]" value="1024" class="panel-box-sizing task-form-100 task-height-40"
-                   disabled=<!=list.admin!>
+                   >
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -401,7 +401,7 @@
           <label class="panel-form-label fl">内存要求(M)：</label>
           <div class="pr fl with20 status_con">
             <input type="text" name="request_limit[]" value="10" class="panel-box-sizing task-form-100 task-height-40"
-                   disabled=<!=list.admin!>
+                   >
                    placeholder="请输入类别名称"/>
           </div>
           <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>

From f8e5a7c89c1854a5de7c14371331e6edb77da37f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 17:18:47 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb     |  24 +-
 app/views/shixuns/_form.html.erb          |  26 +-
 app/views/shixuns/_settings_edit.html.erb | 770 +++++++++++-----------
 3 files changed, 407 insertions(+), 413 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index c0290b72..0f91285b 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -818,17 +818,17 @@ class ShixunsController < ApplicationController
           end
         end
         # 自动构建版本库
-        repository = Repository.new
-        repository.shixun = @shixun
-        repository.type = 'Repository::Gitlab'
-        repository.identifier = @shixun.identifier.downcase
-        repository.project_id = -1
-        repository.save!
-        s = Trustie::Gitlab::Sync.new
-        gproject = s.create_shixun(@shixun, repository)
-        raise "版本库创建失败" if @shixun.gpid.blank?   # 若和gitlab没同步成功，则抛出异常
-        g = Gitlab.client
-        @shixun.update_column(:git_url, g.project(@shixun.gpid).path_with_namespace)
+        # repository = Repository.new
+        # repository.shixun = @shixun
+        # repository.type = 'Repository::Gitlab'
+        # repository.identifier = @shixun.identifier.downcase
+        # repository.project_id = -1
+        # repository.save!
+        # s = Trustie::Gitlab::Sync.new
+        # gproject = s.create_shixun(@shixun, repository)
+        # raise "版本库创建失败" if @shixun.gpid.blank?   # 若和gitlab没同步成功，则抛出异常
+        # g = Gitlab.client
+        # @shixun.update_column(:git_url, g.project(@shixun.gpid).path_with_namespace)
         # g = Gitlab.client
         # hook_url = Setting.protocol + "://" + Setting.host_name + "/shixuns/#{@shixun.identifier}" + "/ghook"
         # g.add_project_hook(@shixun.gpid, hook_url)
@@ -1168,6 +1168,8 @@ class ShixunsController < ApplicationController
     @small_type = MirrorRepository.published_small_mirror
     @shixun_main_mirror = @shixun.mirror_repositories.published_main_mirror.first
     # 权限
+    logger.info("###########{User.current.admin?}")
+    logger.info("#########business:##{User.current.business?}")
     @power = (@shixun.status < 2 ? true : ( User.current.admin? ? true : false))
     # unless @repository.nil?
     #   gitlab_address = Redmine::Configuration['gitlab_address']
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 337ecee2..f6bc11a7 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -37,19 +37,19 @@
       </div>
     </div>
   </div>
-  <div class="mb10 edu-back-white padding30-20">
-    <p class="color-grey-6 font-16 mb15">简介</p>
-    <div class="df mb20">
-      <div class="flex1 mr20">
-        <div id="shixun_introduction" class="fl">
-          <textarea name="shixun[description]"><%= @introduction_sample || @shixun.description %></textarea>
-        </div>
-        <p id="e_tip_desc" class="edu-txt-right color-grey-cd font-12"></p>
-        <p id="e_tips_desc" class="edu-txt-right color-grey-cd font-12"></p>
-      </div>
-      <div style="width: 57px;">&nbsp;</div>
-    </div>
-  </div>
+<!--  <div class="mb10 edu-back-white padding30-20">-->
+<!--    <p class="color-grey-6 font-16 mb15">简介</p>-->
+<!--    <div class="df mb20">-->
+<!--      <div class="flex1 mr20">-->
+<!--        <div id="shixun_introduction" class="fl">-->
+<!--          <textarea name="shixun[description]"><%#= @introduction_sample || @shixun.description %></textarea>-->
+<!--        </div>-->
+<!--        <p id="e_tip_desc" class="edu-txt-right color-grey-cd font-12"></p>-->
+<!--        <p id="e_tips_desc" class="edu-txt-right color-grey-cd font-12"></p>-->
+<!--      </div>-->
+<!--      <div style="width: 57px;">&nbsp;</div>-->
+<!--    </div>-->
+<!--  </div>-->
   <div class="mb10 edu-back-white padding30-20">
     <p class="color-grey-6 font-16 mb15">技术平台</p>
     <div class="clearfix mb20">
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 80b416a2..e23adfc6 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -33,19 +33,19 @@
       </div>
     </div>
 
-    <div class="mb10 edu-back-white padding40-20">
-      <p class="color-grey-6 font-16 mb30">简介</p>
-      <div class="df mb20">
-        <div class="flex1 mr20">
-          <div id="setting_introduction" class="fl">
-            <textarea name="shixun[description]"><%= @shixun.description %></textarea>
-          </div>
-          <p id="e_tip_in" class="edu-txt-right color-grey-cd font-12"></p>
-          <p id="e_tips_in" class="edu-txt-right color-grey-cd font-12"></p>
-        </div>
-        <div style="width: 57px;">&nbsp;</div>
-      </div>
-    </div>
+<!--    <div class="mb10 edu-back-white padding40-20">-->
+<!--      <p class="color-grey-6 font-16 mb30">简介</p>-->
+<!--      <div class="df mb20">-->
+<!--        <div class="flex1 mr20">-->
+<!--          <div id="setting_introduction" class="fl">-->
+<!--            <textarea name="shixun[description]"><%#= @shixun.description %></textarea>-->
+<!--          </div>-->
+<!--          <p id="e_tip_in" class="edu-txt-right color-grey-cd font-12"></p>-->
+<!--          <p id="e_tips_in" class="edu-txt-right color-grey-cd font-12"></p>-->
+<!--        </div>-->
+<!--        <div style="width: 57px;">&nbsp;</div>-->
+<!--      </div>-->
+<!--    </div>-->
 
     <div class="mb10 edu-back-white padding40-20">
       <div class="clearfix mb20">
@@ -294,96 +294,23 @@
         </div>
       </div>
     <% end %>
-    <% if User.current.admin? || User.current.business? %>
-      <div class=<%User.current.admin? || User.current.business? ? "edu-back-white padding40-20 mb20":"none" %> >
-        <p class="color-grey-6 font-16 mb30">服务配置</p>
-        <% @shixun.shixun_service_configs.each do |config| %>
-          <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name"><%= config.mirror_repository.try(:type_name) %></p>
-          <input type="hidden" name="mirror_id[]"  id="shixun_scenario_type_name_id" value="<%= config.mirror_repository.try(:id) %>'">
-          <div class="clearfix mb5">
-            <label class="panel-form-label fl">CPU(核)：</label>
-            <div class="pr fl with80 status_con">
-              <input type="text" name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     >
-                     placeholder="请输入类别名称"/>
-            </div>
-            <div class="cl"></div>
-          </div>
-          <div class="clearfix mb5">
-            <label class="panel-form-label fl">最低CPU(核)：</label>
-            <div class="pr fl with80 status_con">
-              <input type="text" name="lower_cpu_limit[]" value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     >
-                     placeholder="请输入类别名称"/>
-            </div>
-            <div class="cl"></div>
-          </div>
-          <div class="clearfix mb5">
-            <label class="panel-form-label fl">内存限制(M)：</label>
-            <div class="pr fl with80 status_con">
-              <input type="text" name="memory_limit[]" value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     >
-                     placeholder="请输入类别名称"/>
-            </div>
-            <div class="cl"></div>
-          </div>
-          <div class="clearfix mb5">
-            <label class="panel-form-label fl">内存要求(M)：</label>
-            <div class="pr fl with20 status_con">
-              <input type="text" name="request_limit[]" value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
-                     >
-                     placeholder="请输入类别名称"/>
-            </div>
-            <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
-            <div class="cl"></div>
-          </div>
-
-
-          <!--          <div class="clearfix mb5">-->
-<!--            <label class="panel-form-label fl">磁盘限制(K)：</label>-->
-<!--            <div class="pr fl with80 status_con">-->
-<!--              <input type="text" name="resource_limit[]" value="<%#= config.resource_limit %>" class="panel-box-sizing task-form-100 task-height-40"-->
-<!--                     placeholder="请输入类别名称"/>-->
-<!--            </div>-->
-<!--            <div class="cl"></div>-->
-<!--          </div>-->
-        <% end %>
-        <div id='result'></div>
-      </div>
-
-    <% end %>
-      <div class="clearfix mt30">
-        <a href="javascript:void(0)" class="defalutSubmitbtn fl mr20" onclick="submit_edit_shixun(<%= @shixun.id %>);">保存</a>
-        <%= link_to "取消", settings_shixun_path(@shixun), :class => "defalutCancelbtn fl" %>
-      </div>
-  <% end %>
-
-  </div>
-
-
-<script id="t:edit-setting-list" type="text/html">
-
-  <!if(list.length>0) { !>
-    <!for(var i=0;i<list.length;i++){!>
-
-        <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
-          <!=listname[i]!>
-        </p>
-        <input type="hidden" name="mirror_id[]"  value=>
+    <div class="edu-back-white padding40-20 mb20">
+      <p class="color-grey-6 font-16 mb30">服务配置</p>
+      <% @shixun.shixun_service_configs.each do |config| %>
+        <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name"><%= config.mirror_repository.try(:type_name) %></p>
+        <input type="hidden" name="mirror_id[]" id="shixun_scenario_type_name_id" value="<%= config.mirror_repository.try(:id) %>'">
         <div class="clearfix mb5">
           <label class="panel-form-label fl">CPU(核)：</label>
           <div class="pr fl with80 status_con">
-            <input type="text" name="cpu_limit[]" value="1" class="panel-box-sizing task-form-100 task-height-40"
-                   >
-            placeholder="请输入类别名称"/>
+            <input type="text" <%= User.current.admin? ? "" : "readonly" %> name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+                   placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
         </div>
         <div class="clearfix mb5">
           <label class="panel-form-label fl">最低CPU(核)：</label>
           <div class="pr fl with80 status_con">
-            <input type="text" name="lower_cpu_limit[]" value="0.1" class="panel-box-sizing task-form-100 task-height-40"
-                   >
+            <input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -391,8 +318,7 @@
         <div class="clearfix mb5">
           <label class="panel-form-label fl">内存限制(M)：</label>
           <div class="pr fl with80 status_con">
-            <input type="text" name="memory_limit[]" value="1024" class="panel-box-sizing task-form-100 task-height-40"
-                   >
+            <input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -400,307 +326,373 @@
         <div class="clearfix mb5">
           <label class="panel-form-label fl">内存要求(M)：</label>
           <div class="pr fl with20 status_con">
-            <input type="text" name="request_limit[]" value="10" class="panel-box-sizing task-form-100 task-height-40"
-                   >
+            <input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
           <div class="cl"></div>
         </div>
 
-      <!}!>
-      <!}else{!><!}!>
+
+        <!--          <div class="clearfix mb5">-->
+        <!--            <label class="panel-form-label fl">磁盘限制(K)：</label>-->
+        <!--            <div class="pr fl with80 status_con">-->
+        <!--              <input type="text" name="resource_limit[]" value="<%#= config.resource_limit %>" class="panel-box-sizing task-form-100 task-height-40"-->
+        <!--                     placeholder="请输入类别名称"/>-->
+        <!--            </div>-->
+        <!--            <div class="cl"></div>-->
+        <!--          </div>-->
+      <% end %>
+      <div id='result'></div>
+    </div>
+
+    <div class="clearfix mt30">
+      <a href="javascript:void(0)" class="defalutSubmitbtn fl mr20" onclick="submit_edit_shixun(<%= @shixun.id %>);">保存</a>
+      <%= link_to "取消", settings_shixun_path(@shixun), :class => "defalutCancelbtn fl" %>
+    </div>
+  <% end %>
+
+</div>
+
+
+<script id="t:edit-setting-list" type="text/html">
+
+  <!if(list.length>0) { !>
+  <!for(var i=0;i
+  <list.length
+  ;i++){!>
+
+  <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
+    <!=listname[i]!>
+  </p>
+  <input type="hidden" name="mirror_id[]" value=>
+  <div class="clearfix mb5">
+    <label class="panel-form-label fl">CPU(核)：</label>
+    <div class="pr fl with80 status_con">
+      <input type="text" name="cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1" class="panel-box-sizing task-form-100 task-height-40"
+      placeholder="请输入类别名称"/>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="clearfix mb5">
+    <label class="panel-form-label fl">最低CPU(核)：</label>
+    <div class="pr fl with80 status_con">
+      <input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="0.1" class="panel-box-sizing task-form-100 task-height-40"
+      placeholder="请输入类别名称"/>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="clearfix mb5">
+    <label class="panel-form-label fl">内存限制(M)：</label>
+    <div class="pr fl with80 status_con">
+      <input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1024" class="panel-box-sizing task-form-100 task-height-40"
+      placeholder="请输入类别名称"/>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="clearfix mb5">
+    <label class="panel-form-label fl">内存要求(M)：</label>
+    <div class="pr fl with20 status_con">
+      <input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="10" class="panel-box-sizing task-form-100 task-height-40"
+      placeholder="请输入类别名称"/>
+    </div>
+    <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
+    <div class="cl"></div>
+  </div>
+
+  <!}!>
+  <!}else{!><!}!>
 
 </script>
 
 
-  <script>
-      //配置-信息提交
-      function submit_edit_shixun(id) {
-          if (regex_shixun_name() && regex_public_unit() && regex_tech_platform()) {
-              if (script_Codemirror.getValue().trim() == "") {
-                  $("#test_script_code").show();
-                  $(document).scrollTop(parseInt($("#test_script_code").offset().top) - 150);
-                  return;
-              } else {
-                  $("#test_script_code").hide();
-              }
-              if ($("#shixun_exec_time").val() == "")
-                  return;
-              $("#edit_shixun_" + id).submit();
-          }
-      }
-
-      function get_mirror_script() {
-          $select.siblings("input[type=hidden]").attr("value", hideValue);
-          $select.siblings("input[type=text]").attr("value", textValue);
-          $parent.hide();
-          var script_id = $("#shixun_scenario").val();
-          $.ajax({
-              url: "<%= get_script_contents_shixun_path(@shixun) %>",
-              data: {script_id: script_id},
-              success: function (data) {
-                  script_Codemirror.setValue(data.contents);
-                  $("#script_description").html(data.description);
-                  notice_box("评测脚本生成成功！");
-              },
-              error: function () {
-                  notice_box("获取脚本失败！")
-              }
-          })
-      }
-
-      //自定义模板弹框
-      function define_temp() {
-          var html = "<%= j(render :partial => 'define_scenario') %>";
-          pop_box_new(html, 400, 400);
-      }
-
-      //下拉框
-      $("[select-for]").append("<i class='fa fa-sort-desc lesson_img color-grey-8'></i>");
-      $("[select-for]").hover(function () {
-          $(this).find(".down-select").show();
-      }, function () {
-          $(this).find(".down-select").hide();
-      });
-      var $select, hideValue, textValue, $parent;
-      $("[select-for] .down-select p").live("click", function () {
-          $select = $(this).parents(".down-select");
-          hideValue = $(this).attr("data-shixun-value");
-          textValue = $(this).html().trim();
-          $("#shixun_scenario_type_name").html(textValue)
-          $parent = $(this).parent();
-          var parentId = $(this).parent().attr("id");
-          if (parentId != "shixun_scenario_option") {
-              $select.siblings("input[type=hidden]").attr("value", hideValue);
-              $select.siblings("input[type=text]").attr("value", textValue);
-              $parent.hide();
-          }
-          if (parentId == "shixun_language_option") {
-              var mirror_id = $("#shixun_main_language").val();
-              $("#shixun_scenario_type_name_id").val(mirror_id)
-              $.ajax({
-                  url: "<%= get_mirror_script_shixuns_path %>",
-                  data: {mirror_id: mirror_id},
-                  success: function (data) {
-                      var lens = data.length;
-                      var htmlContents = "";
-                      $("#shixun_scenario").val("");
-                      $("#shixun_scenario_name").val("");
-                      for (var i = 0; i < lens; i++) {
-                          htmlContents += "<p data-shixun-value=\"" + data[i].mirror_script.id + "\" " + "title=\"" + data[i].mirror_script.script_type + "\">" + data[i].mirror_script.script_type + "</p>"
-                      }
-                      $("#shixun_scenario_option").html(htmlContents);
-                  },
-                  error: function () {
-                      notice_box("获取技术平台失败！")
-                  }
-              });
-          }
-          if (parentId == "shixun_scenario_option") {
-              op_confirm_tip("原有脚本将被新的脚本覆盖，无法撤销<br/>是否确认执行覆盖操作", "get_mirror_script");
-          }
-      });
-
-      $("input[name='webssh']").on("click", function () {
-          if ($(this).val() == 2) {
-              $("#multi_webssh").parent().show();
-          } else {
-              $("#multi_webssh").parent().hide();
-              $("#multi_webssh").attr("checked", false);
-          }
-      });
-
-      /*----------------------------选择镜像小类别--------------*/
-      $("[select-more]").append("<i class='fa fa-sort-desc lesson_img color-grey-8'></i>");
-      $("[select-more]").hover(function () {
-          $(this).find(".down-select").show();
-      }, function () {
-          $(this).find(".down-select").hide();
-      });
-      $("[select-more] .down-select p input").bind("click", function (){
-
-          var bt=baidu.template;
-          bt.LEFT_DELIMITER='<!';
-          bt.RIGHT_DELIMITER='!>';
-
-          var all = $(this).parents(".down-select");
-          var arr = "";
-          var arrs=[];
-          var idarr = [];
-          for (var i = 0; i < all.find("input").length; i++) {
-              if (all.find("input").eq(i).is(':checked')) {
-                  arr += ";" + (all.find("input").eq(i).attr("value"));
-                  arrs.push(all.find("input").eq(i).attr("value"))
-                  idarr.push(all.find("input").eq(i).parents("p").attr("data-shixun-value"));
-              }
-          }
-          var data={
-              "listname":arrs,
-              "list":idarr,
-              "admin":<%= User.current.admin? %>
-          };
-
-          var htmlidarr=bt('t:edit-setting-list',data);
-          document.getElementById('result').innerHTML=htmlidarr;
-          $("input[name='small_type']").val(idarr);
-          $(this).parents().prev("input").val(arr.substring(1));
-          //$(this).parents(".down-select").hide();
-      });
-
-      $(function () {
-          //选择自定义脚本
-          $("#diy_script").click(function () {
-              var html = "<%= j(render :partial => 'define_scenario') %>";
-              pop_box_new(html, 400, 400);
-          });
-
-          $("#webssh").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-          $("#vnc").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-
-          $("#can_copy").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-          $("#unlock_test_set").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-          $("#code_hidden").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-          $("#forbid_copy").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-          $("#hide_code").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-          $("#task_pass").on("click", function () {
-              $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
-          });
-
-          $("#scope-down-list").find("li").live("click", function () {
-              var ul = $(this).parent("ul");
-              var div = $(this).parents("#unit-input-part");
-              var value = $(this).html();
-              ul.siblings("#for_part_search").val(value);
-
-              var width = value.length * 2;
-              var label = "<label class=\"fl unit-part mb10\"><input type='text' size='" + width + "' id='scope_partment' name='scope_partment[]' readonly value='" + value + "'><span class=\"color-orange03 ml5 eud-pointer\">×</span></label>";
-              div.before(label);
-              ul.siblings("#for_part_search").attr("data-value-was", value);
-              $("#person-unit").hide();
-              $("#scope-down-list").hide();
-          });
-
-          $(".unit-part").find("span").live("click", function () {
-              $(this).parents(".unit-part").remove();
-          });
-
-          if ($("#public-part").is(":checked")) {
-              $("#person-unit").show();
-              $("#person-unit").find("input").val("");
+<script>
+    //配置-信息提交
+    function submit_edit_shixun(id) {
+        if (regex_shixun_name() && regex_public_unit() && regex_tech_platform()) {
+            if (script_Codemirror.getValue().trim() == "") {
+                $("#test_script_code").show();
+                $(document).scrollTop(parseInt($("#test_script_code").offset().top) - 150);
+                return;
+            } else {
+                $("#test_script_code").hide();
+            }
+            if ($("#shixun_exec_time").val() == "")
+                return;
+            $("#edit_shixun_" + id).submit();
+        }
+    }
+
+    function get_mirror_script() {
+        $select.siblings("input[type=hidden]").attr("value", hideValue);
+        $select.siblings("input[type=text]").attr("value", textValue);
+        $parent.hide();
+        var script_id = $("#shixun_scenario").val();
+        $.ajax({
+            url: "<%= get_script_contents_shixun_path(@shixun) %>",
+            data: {script_id: script_id},
+            success: function (data) {
+                script_Codemirror.setValue(data.contents);
+                $("#script_description").html(data.description);
+                notice_box("评测脚本生成成功！");
+            },
+            error: function () {
+                notice_box("获取脚本失败！")
+            }
+        })
+    }
+
+    //自定义模板弹框
+    function define_temp() {
+        var html = "<%= j(render :partial => 'define_scenario') %>";
+        pop_box_new(html, 400, 400);
+    }
+
+    //下拉框
+    $("[select-for]").append("<i class='fa fa-sort-desc lesson_img color-grey-8'></i>");
+    $("[select-for]").hover(function () {
+        $(this).find(".down-select").show();
+    }, function () {
+        $(this).find(".down-select").hide();
+    });
+    var $select, hideValue, textValue, $parent;
+    $("[select-for] .down-select p").live("click", function () {
+        $select = $(this).parents(".down-select");
+        hideValue = $(this).attr("data-shixun-value");
+        textValue = $(this).html().trim();
+        $("#shixun_scenario_type_name").html(textValue)
+        $parent = $(this).parent();
+        var parentId = $(this).parent().attr("id");
+        if (parentId != "shixun_scenario_option") {
+            $select.siblings("input[type=hidden]").attr("value", hideValue);
+            $select.siblings("input[type=text]").attr("value", textValue);
+            $parent.hide();
+        }
+        if (parentId == "shixun_language_option") {
+            var mirror_id = $("#shixun_main_language").val();
+            $("#shixun_scenario_type_name_id").val(mirror_id)
+            $.ajax({
+                url: "<%= get_mirror_script_shixuns_path %>",
+                data: {mirror_id: mirror_id},
+                success: function (data) {
+                    var lens = data.length;
+                    var htmlContents = "";
+                    $("#shixun_scenario").val("");
+                    $("#shixun_scenario_name").val("");
+                    for (var i = 0; i < lens; i++) {
+                        htmlContents += "<p data-shixun-value=\"" + data[i].mirror_script.id + "\" " + "title=\"" + data[i].mirror_script.script_type + "\">" + data[i].mirror_script.script_type + "</p>"
+                    }
+                    $("#shixun_scenario_option").html(htmlContents);
+                },
+                error: function () {
+                    notice_box("获取技术平台失败！")
+                }
+            });
+        }
+        if (parentId == "shixun_scenario_option") {
+            op_confirm_tip("原有脚本将被新的脚本覆盖，无法撤销<br/>是否确认执行覆盖操作", "get_mirror_script");
+        }
+    });
+
+    $("input[name='webssh']").on("click", function () {
+        if ($(this).val() == 2) {
+            $("#multi_webssh").parent().show();
+        } else {
+            $("#multi_webssh").parent().hide();
+            $("#multi_webssh").attr("checked", false);
+        }
+    });
+
+    /*----------------------------选择镜像小类别--------------*/
+    $("[select-more]").append("<i class='fa fa-sort-desc lesson_img color-grey-8'></i>");
+    $("[select-more]").hover(function () {
+        $(this).find(".down-select").show();
+    }, function () {
+        $(this).find(".down-select").hide();
+    });
+    $("[select-more] .down-select p input").bind("click", function () {
+
+        var bt = baidu.template;
+        bt.LEFT_DELIMITER = '<!';
+        bt.RIGHT_DELIMITER = '!>';
+
+        var all = $(this).parents(".down-select");
+        var arr = "";
+        var arrs = [];
+        var idarr = [];
+        for (var i = 0; i < all.find("input").length; i++) {
+            if (all.find("input").eq(i).is(':checked')) {
+                arr += ";" + (all.find("input").eq(i).attr("value"));
+                arrs.push(all.find("input").eq(i).attr("value"))
+                idarr.push(all.find("input").eq(i).parents("p").attr("data-shixun-value"));
+            }
+        }
+        var data = {
+            "listname": arrs,
+            "list": idarr,
+            "admin":<%= User.current.admin? %>
+        };
+
+        var htmlidarr = bt('t:edit-setting-list', data);
+        document.getElementById('result').innerHTML = htmlidarr;
+        $("input[name='small_type']").val(idarr);
+        $(this).parents().prev("input").val(arr.substring(1));
+        //$(this).parents(".down-select").hide();
+    });
+
+    $(function () {
+        //选择自定义脚本
+        $("#diy_script").click(function () {
+            var html = "<%= j(render :partial => 'define_scenario') %>";
+            pop_box_new(html, 400, 400);
+        });
+
+        $("#webssh").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+        $("#vnc").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+
+        $("#can_copy").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+        $("#unlock_test_set").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+        $("#code_hidden").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+        $("#forbid_copy").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+        $("#hide_code").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+        $("#task_pass").on("click", function () {
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
+        $("#scope-down-list").find("li").live("click", function () {
+            var ul = $(this).parent("ul");
+            var div = $(this).parents("#unit-input-part");
+            var value = $(this).html();
+            ul.siblings("#for_part_search").val(value);
+
+            var width = value.length * 2;
+            var label = "<label class=\"fl unit-part mb10\"><input type='text' size='" + width + "' id='scope_partment' name='scope_partment[]' readonly value='" + value + "'><span class=\"color-orange03 ml5 eud-pointer\">×</span></label>";
+            div.before(label);
+            ul.siblings("#for_part_search").attr("data-value-was", value);
+            $("#person-unit").hide();
+            $("#scope-down-list").hide();
+        });
+
+        $(".unit-part").find("span").live("click", function () {
+            $(this).parents(".unit-part").remove();
+        });
+
+        if ($("#public-part").is(":checked")) {
+            $("#person-unit").show();
+            $("#person-unit").find("input").val("");
 //            $(".unit-part").remove();
-              $("#unit-all").show();
-          }
-
-          $("input[name='public_degree']").live("click", function () {
-              var item = $(this).attr("id");
-              if ($(this).is(":checked") && item == "public-part") {
-                  $("#person-unit").show();
-                  $("#person-unit").find("input").val("");
-                  //$(".unit-part").remove();
-                  $("#unit-all").show();
-              } else {
-                  $("#unit-all").hide();
-              }
-          });
-
-          $("body").on("click", function (e) {
-              //alert($(e.target).attr("id"));
-              if ($(e.target).attr("id") != "person-unit") {
-                  $("#scope-down-list").hide();
-              }
-          });
-          //设置编辑时显示的单位
-          $(".unit-part input").each(function () {
-              $(this).attr("size", parseInt($(this).val().length) * 2);
-          })
-      });
-
-      //申请新建
-      function post_apply() {
-          var html = "<%= escape_javascript(render :partial => 'shixuns/apply_setnew') %>";
-          pop_box_new(html, 460, 416);
-      }
-
-      var setting_editormd = editormd("setting_introduction", {
-          width: "100%",
-          height: 210,
-          syncScrolling: "single",
-          //你的lib目录的路径，我这边用JSP做测试的
-          path: "/editormd/lib/",
-          tex: true,
-          toolbarIcons: function () {
-              // Or return editormd.toolbarModes[name]; // full, simple, mini
-              // Using "||" set icons align right.
-              return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-          },
-          toolbarCustomIcons: {
-              testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-              testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-          },
-          onload: function () {
-              $("#setting_introduction [type=\"latex\"]").bind("click", function () {
-                  setting_editormd.cm.replaceSelection("```latex");
-                  setting_editormd.cm.replaceSelection("\n");
-                  setting_editormd.cm.replaceSelection("\n");
-                  setting_editormd.cm.replaceSelection("```");
-                  var __Cursor = setting_editormd.cm.getDoc().getCursor();
-                  setting_editormd.cm.setCursor(__Cursor.line - 1, 0);
-              });
-
-              $("#setting_introduction [type=\"inline\"]").bind("click", function () {
-                  setting_editormd.cm.replaceSelection("$$$$");
-                  var __Cursor = setting_editormd.cm.getDoc().getCursor();
-                  setting_editormd.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
-                  setting_editormd.cm.focus();
-              });
-              $("[type=\"inline\"]").attr("title", "行内公式");
-              $("[type=\"latex\"]").attr("title", "多行公式");
-
-          },
-          //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-          saveHTMLToTextarea: true,
-          autoFocus: false,
-          // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-          dialogMaskOpacity: 0.6,
-          placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
-          imageUpload: true,
-          imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-          imageUploadURL: "<%= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>" //url
-      });
-      md_elocalStorage(setting_editormd, "shixun_edit_<%= User.current.id %>", "in");
-
-      var script_Codemirror = CodeMirror.fromTextArea(document.getElementById("shixun_script"), {
-          lineNumbers: true,
-          theme: "default",
-          // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
-          indentUnit: 4, //代码缩进为一个tab的距离
-          matchBrackets: true,
-          autoRefresh: true,
-          smartIndent: true,//智能换行
-          styleActiveLine: true,
-          lint: true
-      });
-      script_Codemirror.setSize("auto", "600px");
-      // 非管理员只能查看
-  </script>
\ No newline at end of file
+            $("#unit-all").show();
+        }
+
+        $("input[name='public_degree']").live("click", function () {
+            var item = $(this).attr("id");
+            if ($(this).is(":checked") && item == "public-part") {
+                $("#person-unit").show();
+                $("#person-unit").find("input").val("");
+                //$(".unit-part").remove();
+                $("#unit-all").show();
+            } else {
+                $("#unit-all").hide();
+            }
+        });
+
+        $("body").on("click", function (e) {
+            //alert($(e.target).attr("id"));
+            if ($(e.target).attr("id") != "person-unit") {
+                $("#scope-down-list").hide();
+            }
+        });
+        //设置编辑时显示的单位
+        $(".unit-part input").each(function () {
+            $(this).attr("size", parseInt($(this).val().length) * 2);
+        })
+    });
+
+    //申请新建
+    function post_apply() {
+        var html = "<%= escape_javascript(render :partial => 'shixuns/apply_setnew') %>";
+        pop_box_new(html, 460, 416);
+    }
+
+    var setting_editormd = editormd("setting_introduction", {
+        width: "100%",
+        height: 210,
+        syncScrolling: "single",
+        //你的lib目录的路径，我这边用JSP做测试的
+        path: "/editormd/lib/",
+        tex: true,
+        toolbarIcons: function () {
+            // Or return editormd.toolbarModes[name]; // full, simple, mini
+            // Using "||" set icons align right.
+            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+        },
+        toolbarCustomIcons: {
+            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+        },
+        onload: function () {
+            $("#setting_introduction [type=\"latex\"]").bind("click", function () {
+                setting_editormd.cm.replaceSelection("```latex");
+                setting_editormd.cm.replaceSelection("\n");
+                setting_editormd.cm.replaceSelection("\n");
+                setting_editormd.cm.replaceSelection("```");
+                var __Cursor = setting_editormd.cm.getDoc().getCursor();
+                setting_editormd.cm.setCursor(__Cursor.line - 1, 0);
+            });
+
+            $("#setting_introduction [type=\"inline\"]").bind("click", function () {
+                setting_editormd.cm.replaceSelection("$$$$");
+                var __Cursor = setting_editormd.cm.getDoc().getCursor();
+                setting_editormd.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                setting_editormd.cm.focus();
+            });
+            $("[type=\"inline\"]").attr("title", "行内公式");
+            $("[type=\"latex\"]").attr("title", "多行公式");
+
+        },
+        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+        saveHTMLToTextarea: true,
+        autoFocus: false,
+        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+        dialogMaskOpacity: 0.6,
+        placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
+        imageUpload: true,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+        imageUploadURL: "<%= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>" //url
+    });
+    md_elocalStorage(setting_editormd, "shixun_edit_<%= User.current.id %>", "in");
+
+    var script_Codemirror = CodeMirror.fromTextArea(document.getElementById("shixun_script"), {
+        lineNumbers: true,
+        theme: "default",
+        // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
+        indentUnit: 4, //代码缩进为一个tab的距离
+        matchBrackets: true,
+        autoRefresh: true,
+        smartIndent: true,//智能换行
+        styleActiveLine: true,
+        lint: true
+    });
+    script_Codemirror.setSize("auto", "600px");
+    // 非管理员只能查看
+</script>
\ No newline at end of file

From 4af236dc3e8491c668e67cd382f48692d296ed3a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 17:48:12 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/shixun.rb                      | 4 ++++
 app/views/shixuns/_settings_edit.html.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/shixun.rb b/app/models/shixun.rb
index e7682a74..fe9a00b1 100644
--- a/app/models/shixun.rb
+++ b/app/models/shixun.rb
@@ -273,6 +273,10 @@ class Shixun < ActiveRecord::Base
     return name
   end
 
+  def child_mirror_ids
+    self.mirror_repositories.where(:main_type => 0).pluck(:id)
+  end
+
   def mirror_name
     self.mirror_repositories.map(&:type_name).blank? ? "" : self.mirror_repositories.map(&:type_name)
   end
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index e23adfc6..e4837252 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -71,7 +71,7 @@
             <div class="down-select" id="shixun_small_language_option" style="padding: 2px 0px">
               <% @small_type.try(:each) do |type| %>
                 <p data-shixun-value="<%= type.id %>">
-                  <input type="checkbox" class="magic-checkbox" id="mirror_<%= type.id %>" value="<%= type.type_name %>"/>
+                  <input type="checkbox" class="magic-checkbox" id="mirror_<%= type.id %>" value="<%= type.type_name %>" <%= @shixun.child_mirror_ids.include?(type.id) ? "checked" : ""%>/>
                   <label style="top:0px" for="mirror_<%= type.id %>"><%= type.type_name %></label>
                 </p>
               <% end %>

From 7eb7e0f969951a62516c2f1ca6a3df635749580a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Jun 2019 17:51:18 +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

---
 app/controllers/shixuns_controller.rb     |  1 +
 app/views/shixuns/_settings_edit.html.erb | 83 ++++++++++++-----------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 0f91285b..abffd0aa 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -749,6 +749,7 @@ class ShixunsController < ApplicationController
     @main_type = MirrorRepository.published_main_mirror
     @small_type = MirrorRepository.published_small_mirror
 
+
     respond_to do |format|
       format.html{render :layout => 'base_edu'}
       format.json
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index e23adfc6..34c2e551 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -71,7 +71,7 @@
             <div class="down-select" id="shixun_small_language_option" style="padding: 2px 0px">
               <% @small_type.try(:each) do |type| %>
                 <p data-shixun-value="<%= type.id %>">
-                  <input type="checkbox" class="magic-checkbox" id="mirror_<%= type.id %>" value="<%= type.type_name %>"/>
+                  <input type="checkbox" class="magic-checkbox" id="mirror_<%= type.id %>" value="<%= type.type_name %>" />
                   <label style="top:0px" for="mirror_<%= type.id %>"><%= type.type_name %></label>
                 </p>
               <% end %>
@@ -294,7 +294,7 @@
         </div>
       </div>
     <% end %>
-    <div class="edu-back-white padding40-20 mb20">
+    <div class="edu-back-white padding40-20 mb20" id="lists_mirro">
       <p class="color-grey-6 font-16 mb30">服务配置</p>
       <% @shixun.shixun_service_configs.each do |config| %>
         <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name"><%= config.mirror_repository.try(:type_name) %></p>
@@ -354,51 +354,52 @@
 
 </div>
 
-
 <script id="t:edit-setting-list" type="text/html">
 
   <!if(list.length>0) { !>
   <!for(var i=0;i
   <list.length
   ;i++){!>
+    <p name=<!=listname[i]!>>
+        <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
+          <!=listname[i]!>
+        </p>
+        <input type="hidden" name="mirror_id[]" value=<!=list[i]!>>
+        <div class="clearfix mb5">
+          <label class="panel-form-label fl">CPU(核)：</label>
+          <div class="pr fl with80 status_con">
+            <input type="text" name="cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1" class="panel-box-sizing task-form-100 task-height-40"
+                   placeholder="请输入类别名称"/>
+          </div>
+          <div class="cl"></div>
+        </div>
+        <div class="clearfix mb5">
+          <label class="panel-form-label fl">最低CPU(核)：</label>
+          <div class="pr fl with80 status_con">
+            <input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="0.1" class="panel-box-sizing task-form-100 task-height-40"
+                   placeholder="请输入类别名称"/>
+          </div>
+          <div class="cl"></div>
+        </div>
+        <div class="clearfix mb5">
+          <label class="panel-form-label fl">内存限制(M)：</label>
+          <div class="pr fl with80 status_con">
+            <input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1024" class="panel-box-sizing task-form-100 task-height-40"
+                   placeholder="请输入类别名称"/>
+          </div>
+          <div class="cl"></div>
+        </div>
+        <div class="clearfix mb5">
+          <label class="panel-form-label fl">内存要求(M)：</label>
+          <div class="pr fl with20 status_con">
+            <input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="10" class="panel-box-sizing task-form-100 task-height-40"
+                   placeholder="请输入类别名称"/>
+          </div>
+          <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
+          <div class="cl"></div>
+        </div>
+    </p>
 
-  <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
-    <!=listname[i]!>
-  </p>
-  <input type="hidden" name="mirror_id[]" value=>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">CPU(核)：</label>
-    <div class="pr fl with80 status_con">
-      <input type="text" name="cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">最低CPU(核)：</label>
-    <div class="pr fl with80 status_con">
-      <input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="0.1" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">内存限制(M)：</label>
-    <div class="pr fl with80 status_con">
-      <input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1024" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">内存要求(M)：</label>
-    <div class="pr fl with20 status_con">
-      <input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="10" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
-    </div>
-    <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
-    <div class="cl"></div>
-  </div>
 
   <!}!>
   <!}else{!><!}!>
@@ -512,6 +513,8 @@
     });
     $("[select-more] .down-select p input").bind("click", function () {
 
+        debugger
+
         var bt = baidu.template;
         bt.LEFT_DELIMITER = '<!';
         bt.RIGHT_DELIMITER = '!>';

From e4ec176fbd2900d386f506965f0933438b725058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Jun 2019 18:12:04 +0800
Subject: [PATCH 7/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

---
 app/views/shixuns/_settings_edit.html.erb | 83 +++++++++++++----------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index e4837252..70bf43f2 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -295,10 +295,14 @@
       </div>
     <% end %>
     <div class="edu-back-white padding40-20 mb20">
+
+
+
       <p class="color-grey-6 font-16 mb30">服务配置</p>
       <% @shixun.shixun_service_configs.each do |config| %>
+      <div id="<%= config.mirror_repository.try(:id) %>" >
         <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name"><%= config.mirror_repository.try(:type_name) %></p>
-        <input type="hidden" name="mirror_id[]" id="shixun_scenario_type_name_id" value="<%= config.mirror_repository.try(:id) %>'">
+        <input type="hidden" name="mirror_id[]" id="shixun_scenario_type_name_id" value="<%= config.mirror_repository.try(:id) %>">
         <div class="clearfix mb5">
           <label class="panel-form-label fl">CPU(核)：</label>
           <div class="pr fl with80 status_con">
@@ -332,7 +336,7 @@
           <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
           <div class="cl"></div>
         </div>
-
+      </div>
 
         <!--          <div class="clearfix mb5">-->
         <!--            <label class="panel-form-label fl">磁盘限制(K)：</label>-->
@@ -361,45 +365,45 @@
   <!for(var i=0;i
   <list.length
   ;i++){!>
-
-  <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
-    <!=listname[i]!>
-  </p>
-  <input type="hidden" name="mirror_id[]" value=>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">CPU(核)：</label>
-    <div class="pr fl with80 status_con">
-      <input type="text" name="cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
+  <div id=<!=list[i]!>>
+    <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
+      <!=listname[i]!>
+    </p>
+    <input type="hidden" name="mirror_id[]" value=<!=list[i]!>>
+    <div class="clearfix mb5">
+      <label class="panel-form-label fl">CPU(核)：</label>
+      <div class="pr fl with80 status_con">
+        <input type="text" name="cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1" class="panel-box-sizing task-form-100 task-height-40"
+               placeholder="请输入类别名称"/>
+      </div>
+      <div class="cl"></div>
     </div>
-    <div class="cl"></div>
-  </div>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">最低CPU(核)：</label>
-    <div class="pr fl with80 status_con">
-      <input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="0.1" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
+    <div class="clearfix mb5">
+      <label class="panel-form-label fl">最低CPU(核)：</label>
+      <div class="pr fl with80 status_con">
+        <input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="0.1" class="panel-box-sizing task-form-100 task-height-40"
+               placeholder="请输入类别名称"/>
+      </div>
+      <div class="cl"></div>
     </div>
-    <div class="cl"></div>
-  </div>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">内存限制(M)：</label>
-    <div class="pr fl with80 status_con">
-      <input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1024" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
+    <div class="clearfix mb5">
+      <label class="panel-form-label fl">内存限制(M)：</label>
+      <div class="pr fl with80 status_con">
+        <input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1024" class="panel-box-sizing task-form-100 task-height-40"
+               placeholder="请输入类别名称"/>
+      </div>
+      <div class="cl"></div>
     </div>
-    <div class="cl"></div>
-  </div>
-  <div class="clearfix mb5">
-    <label class="panel-form-label fl">内存要求(M)：</label>
-    <div class="pr fl with20 status_con">
-      <input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="10" class="panel-box-sizing task-form-100 task-height-40"
-      placeholder="请输入类别名称"/>
+    <div class="clearfix mb5">
+      <label class="panel-form-label fl">内存要求(M)：</label>
+      <div class="pr fl with20 status_con">
+        <input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="10" class="panel-box-sizing task-form-100 task-height-40"
+               placeholder="请输入类别名称"/>
+      </div>
+      <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
+      <div class="cl"></div>
     </div>
-    <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
-    <div class="cl"></div>
   </div>
-
   <!}!>
   <!}else{!><!}!>
 
@@ -520,13 +524,20 @@
         var arr = "";
         var arrs = [];
         var idarr = [];
+        var noidarr=[];
         for (var i = 0; i < all.find("input").length; i++) {
             if (all.find("input").eq(i).is(':checked')) {
                 arr += ";" + (all.find("input").eq(i).attr("value"));
                 arrs.push(all.find("input").eq(i).attr("value"))
                 idarr.push(all.find("input").eq(i).parents("p").attr("data-shixun-value"));
+            }else{
+                noidarr.push(all.find("input").eq(i).parents("p").attr("data-shixun-value"));
             }
         }
+
+        for(var i=0; i<noidarr.length; i++){
+           $("#"+noidarr[i]).remove();
+        }
         var data = {
             "listname": arrs,
             "list": idarr,

From 1b9f97f21f2c44794828413ee90f4f16eeaff41b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 18:20:00 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb     | 24 ++++++++++-----------
 app/views/shixuns/_form.html.erb          | 26 +++++++++++------------
 app/views/shixuns/_settings_edit.html.erb | 26 +++++++++++------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index abffd0aa..16b7de30 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -818,18 +818,18 @@ class ShixunsController < ApplicationController
             ShixunServiceConfig.create!(:shixun_id => @shixun.id, :mirror_repository_id =>  mirror)
           end
         end
-        # 自动构建版本库
-        # repository = Repository.new
-        # repository.shixun = @shixun
-        # repository.type = 'Repository::Gitlab'
-        # repository.identifier = @shixun.identifier.downcase
-        # repository.project_id = -1
-        # repository.save!
-        # s = Trustie::Gitlab::Sync.new
-        # gproject = s.create_shixun(@shixun, repository)
-        # raise "版本库创建失败" if @shixun.gpid.blank?   # 若和gitlab没同步成功，则抛出异常
-        # g = Gitlab.client
-        # @shixun.update_column(:git_url, g.project(@shixun.gpid).path_with_namespace)
+        自动构建版本库
+        repository = Repository.new
+        repository.shixun = @shixun
+        repository.type = 'Repository::Gitlab'
+        repository.identifier = @shixun.identifier.downcase
+        repository.project_id = -1
+        repository.save!
+        s = Trustie::Gitlab::Sync.new
+        gproject = s.create_shixun(@shixun, repository)
+        raise "版本库创建失败" if @shixun.gpid.blank?   # 若和gitlab没同步成功，则抛出异常
+        g = Gitlab.client
+        @shixun.update_column(:git_url, g.project(@shixun.gpid).path_with_namespace)
         # g = Gitlab.client
         # hook_url = Setting.protocol + "://" + Setting.host_name + "/shixuns/#{@shixun.identifier}" + "/ghook"
         # g.add_project_hook(@shixun.gpid, hook_url)
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index f6bc11a7..337ecee2 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -37,19 +37,19 @@
       </div>
     </div>
   </div>
-<!--  <div class="mb10 edu-back-white padding30-20">-->
-<!--    <p class="color-grey-6 font-16 mb15">简介</p>-->
-<!--    <div class="df mb20">-->
-<!--      <div class="flex1 mr20">-->
-<!--        <div id="shixun_introduction" class="fl">-->
-<!--          <textarea name="shixun[description]"><%#= @introduction_sample || @shixun.description %></textarea>-->
-<!--        </div>-->
-<!--        <p id="e_tip_desc" class="edu-txt-right color-grey-cd font-12"></p>-->
-<!--        <p id="e_tips_desc" class="edu-txt-right color-grey-cd font-12"></p>-->
-<!--      </div>-->
-<!--      <div style="width: 57px;">&nbsp;</div>-->
-<!--    </div>-->
-<!--  </div>-->
+  <div class="mb10 edu-back-white padding30-20">
+    <p class="color-grey-6 font-16 mb15">简介</p>
+    <div class="df mb20">
+      <div class="flex1 mr20">
+        <div id="shixun_introduction" class="fl">
+          <textarea name="shixun[description]"><%= @introduction_sample || @shixun.description %></textarea>
+        </div>
+        <p id="e_tip_desc" class="edu-txt-right color-grey-cd font-12"></p>
+        <p id="e_tips_desc" class="edu-txt-right color-grey-cd font-12"></p>
+      </div>
+      <div style="width: 57px;">&nbsp;</div>
+    </div>
+  </div>
   <div class="mb10 edu-back-white padding30-20">
     <p class="color-grey-6 font-16 mb15">技术平台</p>
     <div class="clearfix mb20">
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 70bf43f2..90efda66 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -33,19 +33,19 @@
       </div>
     </div>
 
-<!--    <div class="mb10 edu-back-white padding40-20">-->
-<!--      <p class="color-grey-6 font-16 mb30">简介</p>-->
-<!--      <div class="df mb20">-->
-<!--        <div class="flex1 mr20">-->
-<!--          <div id="setting_introduction" class="fl">-->
-<!--            <textarea name="shixun[description]"><%#= @shixun.description %></textarea>-->
-<!--          </div>-->
-<!--          <p id="e_tip_in" class="edu-txt-right color-grey-cd font-12"></p>-->
-<!--          <p id="e_tips_in" class="edu-txt-right color-grey-cd font-12"></p>-->
-<!--        </div>-->
-<!--        <div style="width: 57px;">&nbsp;</div>-->
-<!--      </div>-->
-<!--    </div>-->
+    <div class="mb10 edu-back-white padding40-20">
+      <p class="color-grey-6 font-16 mb30">简介</p>
+      <div class="df mb20">
+        <div class="flex1 mr20">
+          <div id="setting_introduction" class="fl">
+            <textarea name="shixun[description]"><%= @shixun.description %></textarea>
+          </div>
+          <p id="e_tip_in" class="edu-txt-right color-grey-cd font-12"></p>
+          <p id="e_tips_in" class="edu-txt-right color-grey-cd font-12"></p>
+        </div>
+        <div style="width: 57px;">&nbsp;</div>
+      </div>
+    </div>
 
     <div class="mb10 edu-back-white padding40-20">
       <div class="clearfix mb20">

From f89ba73d31285035c8d4fdeba2b6ed48e21dcef8 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 27 Jun 2019 18:27:50 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 16b7de30..965f15f3 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -818,7 +818,7 @@ class ShixunsController < ApplicationController
             ShixunServiceConfig.create!(:shixun_id => @shixun.id, :mirror_repository_id =>  mirror)
           end
         end
-        自动构建版本库
+        #自动构建版本库
         repository = Repository.new
         repository.shixun = @shixun
         repository.type = 'Repository::Gitlab'