diff --git a/models/send_tasks.go b/models/send_tasks.go index ac6e349..59fcc75 100644 --- a/models/send_tasks.go +++ b/models/send_tasks.go @@ -20,7 +20,7 @@ func GenerateTaskUniqueID() string { // AddSendTaskWithID 添加实例的时候添加任务 func AddSendTaskWithID(name string, id string, createdBy string) error { - err := db.Where("id = ?", id).Take(&SendTasks{}).Error + err := db.Where("id = ?", id).Find(&SendTasks{}).Error if err == nil { return nil } diff --git a/pkg/setting/env.go b/pkg/setting/env.go index 094287a..c337bcf 100644 --- a/pkg/setting/env.go +++ b/pkg/setting/env.go @@ -43,7 +43,6 @@ func printOptionValue() { func loadConfigFromEnv() { AppSetting.JwtSecret = getOptionEnvValue("JWT_SECRET", "message-nest") AppSetting.LogLevel = getOptionEnvValue("LOG_LEVEL", "INFO") - AppSetting.InitData = getOptionEnvValue("INIT_DATA", "") ServerSetting.RunMode = getOptionEnvValue("RUN_MODE", "release") ServerSetting.HttpPort = 8000 @@ -52,13 +51,15 @@ func loadConfigFromEnv() { DatabaseSetting.Type = getOptionEnvValue("DB_TYPE", "sqlite") - DatabaseSetting.Host = getMustEnvValue("MYSQL_HOST") - DatabaseSetting.Port = com.StrTo(getMustEnvValue("MYSQL_PORT")).MustInt() - DatabaseSetting.User = getMustEnvValue("MYSQL_USER") - DatabaseSetting.Password = getMustEnvValue("MYSQL_PASSWORD") - DatabaseSetting.Name = getMustEnvValue("MYSQL_DB") - DatabaseSetting.TablePrefix = getMustEnvValue("MYSQL_TABLE_PREFIX") - DatabaseSetting.SqlDebug = getOptionEnvValue("SQL_DEBUG", "disable") + if DatabaseSetting.Type == "mysql" { + DatabaseSetting.Host = getMustEnvValue("MYSQL_HOST") + DatabaseSetting.Port = com.StrTo(getMustEnvValue("MYSQL_PORT")).MustInt() + DatabaseSetting.User = getMustEnvValue("MYSQL_USER") + DatabaseSetting.Password = getMustEnvValue("MYSQL_PASSWORD") + DatabaseSetting.Name = getMustEnvValue("MYSQL_DB") + } + DatabaseSetting.TablePrefix = getOptionEnvValue("MYSQL_TABLE_PREFIX", "message_") + DatabaseSetting.SqlDebug = getOptionEnvValue("SQL_DEBUG", "disable") printOptionValue() } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 426756e..7109cf0 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -49,10 +49,22 @@ func fileExists(filePath string) bool { return !os.IsNotExist(err) } +func createConfFolder() { + // 检查目录是否存在 + dir := "conf/" + if _, err := os.Stat(dir); os.IsNotExist(err) { + err := os.MkdirAll(dir, 0755) + if err != nil { + return + } + } +} + // Setup initialize the configuration instance func Setup() { var err error intPath := "conf/app.ini" + createConfFolder() if fileExists(intPath) { log.Printf("[message-nest] start server from %s.", intPath) @@ -72,8 +84,6 @@ func Setup() { ServerSetting.ReadTimeout = ServerSetting.ReadTimeout * time.Second ServerSetting.WriteTimeout = ServerSetting.WriteTimeout * time.Second - log.Printf("[message-nest] DB type: %s", DatabaseSetting.Type) - } // mapTo map section