update

admpub · Feb 17, 2024 · 1f0ab20 · 1f0ab20
1 parent 81a2319
commit 1f0ab20
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/application/cmd/init.go b/application/cmd/init.go
@@ -120,6 +120,7 @@ func initRunE(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	req.SetFromCLI(true)
 	ctx.Internal().Set(`validated`, req)
 	err = setup.Setup(ctx)
 	if err == nil {

diff --git a/application/handler/setup/setup.go b/application/handler/setup/setup.go
@@ -313,9 +313,12 @@ func Setup(ctx echo.Context) error {
 			return err
 		}
 
-		// 启动
-		log.Info(color.GreenString(`[installer]`), `Start up`)
-		config.FromCLI().RunStartup()
+		if !requestData.FromCLI() {
+			log.Info(color.GreenString(`[installer]`), `Start up`)
+			config.FromCLI().RunStartup() // 启动
+		} else {
+			config.FromCLI().ParseConfig()
+		}
 
 		// 升级
 		if err := Upgrade(); err != nil && os.ErrNotExist != err {

diff --git a/application/registry/settings/config_default.go b/application/registry/settings/config_default.go
@@ -211,7 +211,7 @@ var configDefaults = map[string]map[string]*dbschema.NgingConfig{
 			Key:         `targets`,
 			Label:       `输出`,
 			Description: ``,
-			Value:       `console`,
+			Value:       `console,file`,
 			Group:       `log`,
 			Type:        `list`,
 			Sort:        0,

diff --git a/application/request/setup.go b/application/request/setup.go
@@ -22,6 +22,15 @@ type Setup struct {
 	AdminUser  string `validate:"username"`
 	AdminPass  string `validate:"required,min=8,max=64"`
 	AdminEmail string `validate:"required,email"`
+	fromCLI    bool
+}
+
+func (s *Setup) SetFromCLI(fromCLI bool) {
+	s.fromCLI = fromCLI
+}
+
+func (s *Setup) FromCLI() bool {
+	return s.fromCLI
 }
 
 func (s *Setup) AfterValidate(c echo.Context) error {