改进数据库驱动类
Merge remote-tracking branch 'upstream/master'