改进Db类
Merge remote-tracking branch 'origin/3.1' into 3.1