From c4e6e9aa14e75fb45c1da454af959f0622205573 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 13 Jan 2020 17:03:23 +0800 Subject: [PATCH] 1 --- app/controllers/concerns/git_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index f22753dde..ec0f2ad82 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -25,6 +25,8 @@ 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? + raise("无效的utf-8文件") else Rails.logger.info("####encoding:#{content.encoding}") content.force_encoding('UTF-8')