yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	QMPlusServer/init/qmsql/initMysql.go
	QMPlusServer/main.go
	QMPlusVuePage/src/view/superAdmin/autoCode/index.vue
This commit is contained in:
pixel
2020-03-24 14:20:50 +08:00
parent 9ccd32a70b 489e7b92c9
commit e714df22c4
10 changed files with 261 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
QMPlusServer/config/config.go
+8 -5
View File
@@ -32,11 +32,14 @@ type CasbinConfig struct { //casbin配置
}
type MysqlAdmin struct { // mysql admin 数据库配置
Username string `json:"username"`
Password string `json:"password"`
Path string `json:"path"`
Dbname string `json:"dbname"`
Config string `json:"config"`
Username string `json:"username"`
Password string `json:"password"`
Path string `json:"path"`
Dbname string `json:"dbname"`
Config string `json:"config"`
MaxIdleConns int `json:"maxIdleConns"`
MaxOpenConns int `json:"maxOpenConns"`
LogMode bool `json:"maxOpenConns"`
}
type RedisAdmin struct { // Redis admin 数据库配置