Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_hjm_a
杨树林 5 years ago
commit edb1f956f4

@ -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 = git_fle_content(@repo_path, path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERCSS/, "<style>#{file_content}</style>")
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 = git_fle_content(@repo_path, path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERJS/, "<script>#{file_content}</script>")
end

Loading…
Cancel
Save