fix: error for the install step

saltbo · Feb 10, 2021 · b6d627a · b6d627a
1 parent da3c3f5
commit b6d627a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/internal/app/api/system.go b/internal/app/api/system.go
@@ -50,9 +50,15 @@ func (rs *Option) createDatabase(c *gin.Context) {
 		return
 	}
 
+	if err := dao.NewOption().Init(); err != nil {
+		ginutil.JSONServerError(c, err)
+		return
+	}
+
 	viper.Set("database.driver", p["driver"])
 	viper.Set("database.dsn", p["dsn"])
-	if err := viper.WriteConfigAs("config.yml"); err != nil {
+	viper.SetConfigFile("config.yml")
+	if err := viper.WriteConfigAs(viper.ConfigFileUsed()); err != nil {
 		ginutil.JSONServerError(c, err)
 		return
 	}

diff --git a/internal/app/dao/option.go b/internal/app/dao/option.go
@@ -28,3 +28,9 @@ func (o *Option) Set(name string, opts model.Opts) error {
 	}
 	return gdb.Save(mOpt).Error
 }
+
+func (o *Option) Init() error {
+	o.Set(model.OptSite, model.DefaultSiteOpts)
+	o.Set(model.OptEmail, model.DefaultEmailOpts)
+	return nil
+}
diff --git a/internal/app/model/option.go b/internal/app/model/option.go
@@ -12,9 +12,13 @@ import (
 )
 
 const (
-	OptSite  = "CORE_SITE"
-	OptEmail = "CORE_EMAIL"
-	//OptInvitation = "INVITATION"
+	OptSite  = "core.site"
+	OptEmail = "core.email"
+)
+
+var (
+	DefaultSiteOpts  = Opts{"name": "ZPan", "intro": "您的私有网盘专家", "locale": "zh-CN", "invite_required": true}
+	DefaultEmailOpts = Opts{"address": "smtpdm.aliyun.com:25", "username": "no-reply@saltbo.fun", "password": "yourpassword", "sender": "ZPan"}
 )
 
 type Option struct {