Merge branch 'master' of https://github.com/robertsing/JavaGSC
重构