更新快捷键，更新语法配置
Merge branch 'develop'