From fde00add0518100eda0a4ee76f62150c72b414d5 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 30 Nov 2019 12:14:26 +0800 Subject: [PATCH] 1 --- app/services/oauth/create_or_find_wechat_account_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/oauth/create_or_find_wechat_account_service.rb b/app/services/oauth/create_or_find_wechat_account_service.rb index a5f23b4c8..0e05bfddb 100644 --- a/app/services/oauth/create_or_find_wechat_account_service.rb +++ b/app/services/oauth/create_or_find_wechat_account_service.rb @@ -27,7 +27,7 @@ class Oauth::CreateOrFindWechatAccountService < ApplicationService cd = CharDet.detect(result['nickname']) Rails.logger.info "encoding: #{cd['encoding']} confidence: #{cd['confidence']}" decode_content = - if cd["encoding"] == 'GB18030' && cd['confidence'] > 0.8 + if cd["encoding"] == 'GB18030' && cd['confidence'] > 0.8 || cd["encoding"] == 'IBM866' result['nickname'].encode('UTF-8', 'GBK', {:invalid => :replace, :undef => :replace, :replace => ' '}) else result['nickname'].force_encoding('UTF-8')