Merge remote-tracking branch 'origin/master'

src/main/resources/project-dev.properties

dataSource=com.alibaba.druid.pool.DruidDataSource
#数据库连接地址、名称、密码
dataSource.url=jdbc:postgresql://192.168.3.233:5432/console_dev
#dataSource.url=jdbc:postgresql://192.168.3.233:5432/console_dev
#dataSource.url=jdbc:postgresql://localhost:5432/console
#dataSource.url=jdbc:postgresql://www.ekexiu.com:5432/ekexiu
dataSource.url=jdbc:postgresql://www.ekexiu.com:5432/ekexiu
dataSource.username=postgres
dataSource.password=postgres
#连接池启动时的初始值（初始化连接）