TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-03 16:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: code review

Browse Source
This commit is contained in:
meilin.huang
2023-12-29 16:48:15 +08:00
parent 664118a709
commit 76fd6675b5
35 changed files with 343 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/pkg/config/config.go
View File

@@ -55,7 +55,6 @@ type Config struct {
Sqlite Sqlite `yaml:"sqlite"`
Redis Redis `yaml:"redis"`
Log Log `yaml:"log"`
Db Db `yaml:"db"`
}
func (c *Config) IfBlankDefaultValue() {
@@ -73,7 +72,6 @@ func (c *Config) IfBlankDefaultValue() {
c.Jwt.Default()
c.Mysql.Default()
c.Sqlite.Default()
c.Db.Default()
}
// 配置文件内容校验
@@ -82,7 +80,7 @@ func (c *Config) Valid() {
c.Aes.Valid()
}
// 替换系统环境变量，如果环境变量中存在该值，则优秀使用环境变量设定的值
// 替换系统环境变量，如果环境变量中存在该值，则优先使用环境变量设定的值
func (c *Config) ReplaceOsEnv() {
serverPort := os.Getenv("MAYFLY_SERVER_PORT")
if serverPort != "" {

13
server/pkg/config/db.go
View File

@@ -1,13 +0,0 @@
package config
type Db struct {
BackupPath string `yaml:"backup-path"`
MysqlUtil MysqlUtil `yaml:"mysqlutil-path"`
MariadbUtil MysqlUtil `yaml:"mariadbutil-path"`
}
type MysqlUtil struct {
Mysql string `yaml:"mysql"`
MysqlDump string `yaml:"mysqldump"`
MysqlBinlog string `yaml:"mysqlbinlog"`
}

28
server/pkg/config/db_darwin.go
View File

@@ -1,28 +0,0 @@
package config
func (db *Db) Default() {
if len(db.BackupPath) == 0 {
db.BackupPath = "./backup"
}
if len(db.MysqlUtil.Mysql) == 0 {
db.MysqlUtil.Mysql = "./mysqlutil/bin/mysql"
}
if len(db.MysqlUtil.MysqlDump) == 0 {
db.MysqlUtil.MysqlDump = "./mysqlutil/bin/mysqldump"
}
if len(db.MysqlUtil.Mysql) == 0 {
db.MysqlUtil.MysqlBinlog = "./mysqlutil/bin/mysqlbinlog"
}
if len(db.MariadbUtil.Mysql) == 0 {
db.MariadbUtil.Mysql = "./mariadbutil/bin/mariadb"
}
if len(db.MariadbUtil.MysqlDump) == 0 {
db.MariadbUtil.MysqlDump = "./mariadbutil/bin/mariadb-dump"
}
if len(db.MariadbUtil.MysqlBinlog) == 0 {
db.MariadbUtil.MysqlBinlog = "./mariadbutil/bin/mariadb-binlog"
}
}

27
server/pkg/config/db_linux.go
View File

@@ -1,27 +0,0 @@
package config
func (db *Db) Default() {
if len(db.BackupPath) == 0 {
db.BackupPath = "./backup"
}
if len(db.MysqlUtil.Mysql) == 0 {
db.MysqlUtil.Mysql = "./mysqlutil/bin/mysql"
}
if len(db.MysqlUtil.MysqlDump) == 0 {
db.MysqlUtil.MysqlDump = "./mysqlutil/bin/mysqldump"
}
if len(db.MysqlUtil.MysqlBinlog) == 0 {
db.MysqlUtil.MysqlBinlog = "./mysqlutil/bin/mysqlbinlog"
}
if len(db.MariadbUtil.Mysql) == 0 {
db.MariadbUtil.Mysql = "./mariadbutil/bin/mariadb"
}
if len(db.MariadbUtil.MysqlDump) == 0 {
db.MariadbUtil.MysqlDump = "./mariadbutil/bin/mariadb-dump"
}
if len(db.MariadbUtil.MysqlBinlog) == 0 {
db.MariadbUtil.MysqlBinlog = "./mariadbutil/bin/mariadb-binlog"
}
}

27
server/pkg/config/db_windows.go
View File

@@ -1,27 +0,0 @@
package config
func (db *Db) Default() {
if len(db.BackupPath) == 0 {
db.BackupPath = "./backup"
}
if len(db.MysqlUtil.Mysql) == 0 {
db.MysqlUtil.Mysql = "./mysqlutil/bin/mysql.exe"
}
if len(db.MysqlUtil.MysqlDump) == 0 {
db.MysqlUtil.MysqlDump = "./mysqlutil/bin/mysqldump.exe"
}
if len(db.MysqlUtil.Mysql) == 0 {
db.MysqlUtil.MysqlBinlog = "./mysqlutil/bin/mysqlbinlog.exe"
}
if len(db.MariadbUtil.Mysql) == 0 {
db.MariadbUtil.Mysql = "./mariadbutil/bin/mariadb.exe"
}
if len(db.MariadbUtil.MysqlDump) == 0 {
db.MariadbUtil.MysqlDump = "./mariadbutil/bin/mariadb-dump.exe"
}
if len(db.MariadbUtil.MysqlBinlog) == 0 {
db.MariadbUtil.MysqlBinlog = "./mariadbutil/bin/mariadb-binlog.exe"
}
}