update

Author: admpub

application/handler/setup/setup.go

@@ -38,6 +38,7 @@ import (
 	"github.com/coscms/webcore/library/backend"
 	"github.com/coscms/webcore/library/common"
 	"github.com/coscms/webcore/library/config"
+	"github.com/coscms/webcore/library/license"
 	"github.com/coscms/webcore/library/nsql"
 	"github.com/coscms/webcore/model"
 	"github.com/coscms/webcore/registry/settings"
@@ -327,6 +328,7 @@ func Setup(ctx echo.Context) error {
 		requestData = &request.Setup{}
 	}
 	ctx.Set(`data`, requestData)
+	ctx.Set(`defaultDBName`, license.ProductName())
 	ctx.Set(`dbEngines`, config.DBEngines.Slice())
 	ctx.SetFunc(`policy`, func() echo.KVList {
 		if bootconfig.Policy == nil {

go.mod

@@ -38,7 +38,7 @@ require (
 	github.com/admpub/copier v0.1.1
 	github.com/admpub/go-ps v0.0.1
 	github.com/admpub/regexp2 v1.1.8
-	github.com/coscms/webcore v0.7.1
+	github.com/coscms/webcore v0.7.2
 	github.com/nging-plugins/caddymanager v1.8.2
 	github.com/nging-plugins/collector v1.8.0
 	github.com/nging-plugins/dbmanager v1.8.0

go.sum

@@ -1112,8 +1112,8 @@ github.com/coscms/session-sqlstore v0.0.1 h1:L1ef74QILW4RXrAcG2Se6K+zakmnE7sE735
 github.com/coscms/session-sqlstore v0.0.1/go.mod h1:n1mHOa5RJRVCXjliFkVcgg8A+TEDY6BPqFkyi3qVbTc=
 github.com/coscms/webauthn v0.3.2 h1:usQi+b0zE2nPmIwaLFwrFmGD8fPJg3LhERXTWJFIhqM=
 github.com/coscms/webauthn v0.3.2/go.mod h1:0aQwJzqz+gCMwzImV6pBtRFgnLXKNJsXv+HVv9lFtjY=
-github.com/coscms/webcore v0.7.1 h1:29dckDG36/A1unJ+u4w9ATV3jnJQ5z4zWYo2nxEX3qc=
-github.com/coscms/webcore v0.7.1/go.mod h1:J3BdNHLHKUm5IU7sSkgKBGnrLp03Q4eKSVoXbQfUDas=
+github.com/coscms/webcore v0.7.2 h1:enObWraOiH/GwopbH5HlllTsdJKVEE9zNW7iHus+6+k=
+github.com/coscms/webcore v0.7.2/go.mod h1:J3BdNHLHKUm5IU7sSkgKBGnrLp03Q4eKSVoXbQfUDas=
 github.com/cpu/goacmedns v0.1.1/go.mod h1:MuaouqEhPAHxsbqjgnck5zeghuwBP1dLnPoobeGqugQ=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=

template/backend/setup.html

@@ -95,7 +95,7 @@ <h3 class="hthin">1. {{"数据库信息"|$.T}}</h3>
 										<div class="col-sm-12">
 											<div class="input-group" data-toggle="tooltip" title="{{`数据库名称`|$.T}}">
 												<span class="input-group-addon"><i class="fa fa-folder"></i></span>
-												<input type="text" name="database" id="database-name" data-parsley-trigger="change" data-parsley-errors-container="#database-error" required placeholder="{{`数据库名称`|$.T}}" class="form-control" value="{{$data.Database|Default `nging`}}">
+												<input type="text" name="database" id="database-name" data-parsley-trigger="change" data-parsley-errors-container="#database-error" required placeholder="{{`数据库名称`|$.T}}" class="form-control" value="{{$data.Database|Default $.Stored.defaultDBName}}">
 											</div>
 											<div id="database-error"></div>
 										</div>