[haiyang] do refactor with zhang yi