Merge branch 'master' of /Users/tangrongjian/trjwork/hcm_core with conflicts.
extract json method