From d77ab21d541ad3db009cd7f168beaa104fab68b9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 9 Oct 2019 21:11:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index bf067b389..f8ab58e71 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -326,7 +326,7 @@ class MyshixunsController < ApplicationController
if edu_css.present?
css_path = edu_css.split(",")
css_path.each do |path|
- file_content = GitService.file_content(repo_path: @repo_path, path: path)["content"]
+ file_content = GitService.git_fle_content(repo_path: @repo_path, path: path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERCSS/, "")
end
@@ -335,7 +335,7 @@ class MyshixunsController < ApplicationController
if edu_js.present?
js_path = edu_js.split(",")
js_path.each do |path|
- file_content = GitService.file_content(repo_path: @repo_path, path: path)["content"]
+ file_content = GitService.git_fle_content(repo_path: @repo_path, path: path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERJS/, "")
end
From 343f33c4e4ef7fb002bf98ec0b2607f1ca7bf293 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 9 Oct 2019 21:24:04 +0800
Subject: [PATCH 2/2] =?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/myshixuns_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index f8ab58e71..74f02f1ab 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -326,7 +326,7 @@ class MyshixunsController < ApplicationController
if edu_css.present?
css_path = edu_css.split(",")
css_path.each do |path|
- file_content = GitService.git_fle_content(repo_path: @repo_path, path: path)["content"]
+ file_content = git_fle_content(@repo_path, path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERCSS/, "")
end
@@ -335,7 +335,7 @@ class MyshixunsController < ApplicationController
if edu_js.present?
js_path = edu_js.split(",")
js_path.each do |path|
- file_content = GitService.git_fle_content(repo_path: @repo_path, path: path)["content"]
+ file_content = git_fle_content(@repo_path, path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERJS/, "")
end