Merge branch 'dev' into 'master'

use API
use API
先用一个吧, 省得有人跟我一样作死
Merge branch 'dev' into 'master'

防止作死