改名
判断字符集编码工具类
Merge remote-tracking branch 'origin/master'