Merge branches 'gin-vue-admin-adjust-log' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin-adjust-log

Conflicts: QMPlusServer/init/qmsql/initMysql.go QMPlusServer/main.go QMPlusVuePage/src/view/superAdmin/autoCode/index.vue
2020-03-24 14:20:50 +08:00
parent 9ccd32a70b 489e7b92c9
commit e714df22c4
10 changed files with 261 additions and 10 deletions
@@ -15,8 +15,9 @@ func InitMysql(admin config.MysqlAdmin) *gorm.DB {
 		log.L.Error("DEFAULTDB数据库启动异常",err)
 	} else {
 		DEFAULTDB = db
-		DEFAULTDB.DB().SetMaxIdleConns(10)
-		DEFAULTDB.DB().SetMaxOpenConns(100)
+		DEFAULTDB.DB().SetMaxIdleConns(admin.MaxIdleConns)
+		DEFAULTDB.DB().SetMaxOpenConns(admin.MaxOpenConns)
+		DEFAULTDB.LogMode(admin.LogMode)
 	}
 	return DEFAULTDB
 }