code reorganize
dict去掉id
Revert "dict去掉id"

This reverts commit b08aa85b460d9f032ee4da4fcfed6db026794586.