From 9a4d2e1591165f444836ae3c5fa47f51fed6e879 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 8 Mar 2020 00:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=86=85=E5=AE=B9=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/git_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index db99f9da5..f97a137bb 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -25,7 +25,7 @@ module GitHelper decode_content = if cd["encoding"] == 'GB18030' && cd['confidence'] > 0.8 content.encode('UTF-8', 'GBK', {:invalid => :replace, :undef => :replace, :replace => ' '}) - elsif cd['encoding'].blank? + elsif cd['encoding'].blank? && !content.blank? raise("ERROR_UTF8") else content.force_encoding('UTF-8') @@ -36,7 +36,7 @@ module GitHelper rescue Exception => e Rails.logger.error(e.message) - error_msg = e.message == "ERROR_UTF8" ? "文件无法预览" : "文档内容获取异常" + error_msg = e.message == "ERROR_UTF8" ? "文件编码异常，请将文件编码设置为UTF-8" : "文档内容获取异常" error_status = e.message == "ERROR_UTF8" ? -2 : -1 raise Educoder::TipException.new(error_status, error_msg) end