add assign id
merge from master
Merge branch 'master' into wj_dev
modify server
Merge branch 'master' into wj_dev