fix
Merge branch 'master' into gkl
重构zarkfx.js