From e234a2e57f881ce7819b8b6b370ece9ee9a8d4ef Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 20 Jun 2019 19:14:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 37 +++++++++++++---------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 483a4ff3..161bc328 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -346,13 +346,13 @@ class ManagementsController < ApplicationController if mirror.blank? raise("choose_update_mirror exception") end - shixun_tomcat = Redmine::Configuration['shixun_tomcat'] - params = {imageName: mirror.name, imageID: old_id, flag: flag} - uri = "#{shixun_tomcat}/bridge/docker/updateImage" - res = uri_exec uri, params - if (res && res['code'] != 0) + #shixun_tomcat = Redmine::Configuration['shixun_tomcat'] + #params = {imageName: mirror.name, imageID: old_id, flag: flag} + #uri = "#{shixun_tomcat}/bridge/docker/updateImage" + #res = uri_exec uri, params + # if (res && res['code'] != 0) raise("choose_update_mirror exception") - end + #end if flag == 0 mirror.update_attributes(:mirrorID => change_id, :status => 0) # 用户操作的的行为需要记录 user_id， 中间层操作的行为user_id = -1 @@ -720,20 +720,25 @@ class ManagementsController < ApplicationController shixun_tomcat = Redmine::Configuration['shixun_tomcat'] params = {imageName: @mirror.name} # 主从节点同步镜像 - uri = "#{shixun_tomcat}/bridge/docker/syncImage" - res = uri_exec uri, params - if (res && res['code'] != 0) - raise("Synchronize Mirror exception") - end + #uri = "#{shixun_tomcat}/bridge/docker/syncImage" + #res = uri_exec uri, params + #if (res && res['code'] != 0) + # raise("Synchronize Mirror exception") + #end end if @_params[:type_name] != @mirror.type_name - MirrorOperationRecord.create!(:mirror_repository_id => @mirror.id, :status => 5, :user_id => User.current.id, :old_tag => @mirror.type_name, :new_tag => @_params[:type_name]) + MirrorOperationRecord.create!(:mirror_repository_id => @mirror.id, :status => 5, + :user_id => User.current.id, :old_tag => @mirror.type_name, + :new_tag => @_params[:type_name]) elsif @_params[:status].to_i != @mirror.status - MirrorOperationRecord.create!(:mirror_repository_id => @mirror.id, :status => 6, :user_id => User.current.id, :old_tag => @mirror.status, :new_tag => @_params[:status]) + MirrorOperationRecord.create!(:mirror_repository_id => @mirror.id, :status => 6, + :user_id => User.current.id, :old_tag => @mirror.status, + :new_tag => @_params[:status]) end - @mirror.update_attributes(:description => @_params[:description], :status => @_params[:status], :main_type => @_params[:mirror_type], - :type_name => @_params[:type_name], :resource_limit => @_params[:mirror_resource_limit], :cpu_limit => @_params[:mirror_cpu_limit], - :memory_limit => @_params[:mirror_memory_limit], :time_limit => @_params[:mirror_time_limit]) + @mirror.update_attributes(:description => @_params[:description], :status => @_params[:status], + :main_type => @_params[:mirror_type], :type_name => @_params[:type_name], + :resource_limit => @_params[:mirror_resource_limit], :cpu_limit => @_params[:mirror_cpu_limit], + :memory_limit => @_params[:mirror_memory_limit], :time_limit => @_params[:mirror_time_limit]) @index = MirrorRepository.order("created_at desc").map(&:id).index(@mirror.id) respond_to do |format| format.js From 33750be0a5d592edbf48990af9211a616e246a6f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 20 Jun 2019 19:24:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=BB=8F=E8=BF=87=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E5=B1=82=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 161bc328..3d5abae0 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -351,7 +351,7 @@ class ManagementsController < ApplicationController #uri = "#{shixun_tomcat}/bridge/docker/updateImage" #res = uri_exec uri, params # if (res && res['code'] != 0) - raise("choose_update_mirror exception") + #raise("choose_update_mirror exception") #end if flag == 0 mirror.update_attributes(:mirrorID => change_id, :status => 0) From 0bd28514e9b5997ecfb1801b4a9c5c73c7dea50c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 20 Jun 2019 19:28:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 3d5abae0..95fbd8b5 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -354,7 +354,7 @@ class ManagementsController < ApplicationController #raise("choose_update_mirror exception") #end if flag == 0 - mirror.update_attributes(:mirrorID => change_id, :status => 0) + mirror.update_attributes(:mirrorID => change_id, :status => 1) # 用户操作的的行为需要记录 user_id， 中间层操作的行为user_id = -1 MirrorOperationRecord.create!(:mirror_repository_id => mirror.id, :mirror_id => change_id, :mirror_name => mirror.name, :status => 1, :user_id => User.current.id, :old_tag => old_id, :new_tag => change_id) else From 1f4700f9477087ef41043b8dbea1b6511611006d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 20 Jun 2019 19:30:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8D=E7=AE=A1=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=89=E6=8B=A9=E6=96=B0=E6=97=A7=EF=BC=8C?= =?UTF-8?q?=E9=83=BD=E7=9B=B4=E6=8E=A5=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 95fbd8b5..5382a025 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -358,7 +358,7 @@ class ManagementsController < ApplicationController # 用户操作的的行为需要记录 user_id， 中间层操作的行为user_id = -1 MirrorOperationRecord.create!(:mirror_repository_id => mirror.id, :mirror_id => change_id, :mirror_name => mirror.name, :status => 1, :user_id => User.current.id, :old_tag => old_id, :new_tag => change_id) else - mirror.update_attribute(:status, 0) + mirror.update_attribute(:status, 1) end respond_to do |format| format.js{ redirect_to mirror_repository_managements_path(:reaction => "choose_update_mirror")} From 695466e4592e989475d546a78623f3e819685d9b Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 22 Jun 2019 17:52:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=AF=E4=BB=98tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/trainings/trainingsInfo.html.erb | 1 + public/stylesheets/educoder/trainings.css | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/app/views/trainings/trainingsInfo.html.erb b/app/views/trainings/trainingsInfo.html.erb index e71b9c07..de11c423 100644 --- a/app/views/trainings/trainingsInfo.html.erb +++ b/app/views/trainings/trainingsInfo.html.erb @@ -39,6 +39,7 @@ <%= link_to('修改资料', enroll_training_path(id: @friendly_id, disable_redirect: true), class: 'info_updateBtn') %> <% if @training.training_payinfo.blank? || @training.training_payinfo.not_payed? %> +

温馨提示：支持现场缴费

<%= link_to '转账支付', pay_training_path(id: @friendly_id, pay_type: 3), class: 'leftbtn' %> diff --git a/public/stylesheets/educoder/trainings.css b/public/stylesheets/educoder/trainings.css index ad5cdcb6..bcefdbd1 100644 --- a/public/stylesheets/educoder/trainings.css +++ b/public/stylesheets/educoder/trainings.css @@ -174,6 +174,7 @@ input[type='text'].right_input{ .showPanel p > span{ float: right;color: #333; } + .bottomBtn{ position: fixed;bottom: 0px;left: 0px;width: 100%;height: 44px;line-height: 44px;font-size: 1.6rem;text-align: center;z-index: 20; } @@ -300,3 +301,11 @@ input[type='text'].right_input{ .Infos_btn a:last-child{ background: #4CACFF!important;color: #fff!important; } +.notice_pay{ + position: absolute; + bottom: 44px; + padding: 1rem; + box-sizing: border-box; + font-size: 1.4rem; + color: #c6c5c5; +} \ No newline at end of file