token fix
Revert "token fix"

This reverts commit fe88567ca283497a0559f756756ae787801f315b.
win game detect
Merge remote-tracking branch 'origin/jinxuanwu-player'
Merge branch 'master' of ssh://git@github.com/lisajluo/smg-server.git

Conflicts:
	.gitignore
Merge branch 'master' into container-ruixue