token有效期
Merge branch 'master' of github.com:RavenZZ/MingdaoShare

Conflicts:
	manifest.json