adapter final version
Merge pull request #246 from xiadengping/dev

adapter final version