daiao 6 years ago
parent efbbe8adc1
commit c889fac49d

@ -21,7 +21,7 @@ module GitHelper
content = Base64.decode64(content)
cd = CharDet.detect(content)
Rails.logger.info "encoding: #{cd['encoding']} confidence: #{cd['confidence']}"
# 字符编码问题GB18030编码识别率不行
decode_content =
if cd["encoding"] == 'GB18030' && cd['confidence'] == 1.0
content.encode('UTF-8', 'GBK', {:invalid => :replace, :undef => :replace, :replace => ' '})

@ -474,10 +474,13 @@ class ShixunsController < ApplicationController
ShixunSchool.create!(arr)
end
# 超级管理员和运营人员才能保存 中间层服务器pod信息的配置
#if current_user.admin? || current_user.business? ||
#
logger.info("-------###{@shixun.shixun_service_configs.map(&:mirror_repository_id).sort}}")
logger.info("-------###{params[:shixun_service_configs].map(&:mirror_repository_id).sort}")
if current_user.admin? || current_user.business?
@shixun.shixun_service_configs.destroy_all
service_config_params[:shixun_service_configs].each do |config|
logger.info("####{config[:mirror_repository_id]}")
name = MirrorRepository.find_by_id(config[:mirror_repository_id])&.name
# 不保存没有镜像的配置
@shixun.shixun_service_configs.create!(config) if name.present?

Loading…
Cancel
Save