fix: update demo database and app.ini; enhance: migration

.gitignore

@@ -13,3 +13,5 @@ resources/development/nginx
 app/.env
 app/.status_hash
 casdoor.pub
+.idea/deployment.xml
+.idea/webServers.xml

install.sh

@@ -289,6 +289,9 @@ install_config() {
     mkdir -p "$DataPath"
     if [[ ! -f "$DataPath/app.ini" ]]; then
 cat > "$DataPath/app.ini" << EOF
+[app]
+PageSize = 10
+
 [server]
 HOST = 0.0.0.0
 PORT = 9000

resources/demo/app.ini

@@ -1,19 +1,77 @@
-[server]
+[app]
-HttpPort = 9000
+PageSize  = 10
-RunMode = release
 JwtSecret = 6EEB622E-5C73-4082-AF76-7BAC337772F2
-Email = test@jackyu.cn
+
-HTTPChallengePort = 9180
+[server]
-StartCmd = bash
+Host    =
-NodeSecret = 57D079F2-CA8B-412A-B5C0-FDA291C13391
+Port    = 9000
-Demo = true
+RunMode = release
+
+[database]
+Name = database
+
+[auth]
+IPWhiteList         =
+BanThresholdMinutes = 10
+MaxAttempts         = 10
+
+[casdoor]
+Endpoint        =
+ClientId        =
+ClientSecret    =
+CertificatePath =
+Organization    =
+Application     =
+RedirectUri     =
+
+[cert]
+Email                = test@jackyu.cn
+CADir                = https://acme-staging-v02.api.letsencrypt.org/directory
+RenewalInterval      = 0
+RecursiveNameservers =
+HTTPChallengePort    = 9180
+
+[cluster]
+Node =
+
+[crypto]
+Secret = 4a82fe17c5aab629007462b303c367d2863b7db28b95c8f869f2f815672d41d8
+
+[http]
+GithubProxy        =
+InsecureSkipVerify = false
+
+[logrotate]
+Enabled  = false
+CMD      = logrotate /etc/logrotate.d/nginx
+Interval = 0
 
 [nginx]
-AccessLogPath =
+AccessLogPath   =
-ErrorLogPath =
+ErrorLogPath    =
+LogDirWhiteList = /var/log/nginx
+ConfigDir       =
+PIDPath         =
+TestConfigCmd   =
+ReloadCmd       =
+RestartCmd      =
+
+[node]
+Name             =
+Secret           = 57D079F2-CA8B-412A-B5C0-FDA291C13391
+SkipInstallation = false
+Demo             = true
 
 [openai]
-Model   = gpt-3.5-turbo
 BaseUrl =
-Proxy   =
 Token   =
+Proxy   =
+Model   = gpt-3.5-turbo
+
+[terminal]
+StartCmd = bash
+
+[webauthn]
+RPDisplayName =
+RPID          =
+RPOrigins     =

settings/database.go

@@ -4,7 +4,9 @@ type Database struct {
 	Name string
 }
 
-var DatabaseSettings = &Database{}
+var DatabaseSettings = &Database{
+	Name: "database",
+}
 
 func (d *Database) GetName() string {
 	return d.Name

settings/server_v1.go

@@ -74,6 +74,10 @@ func (v1 *serverV1) migrateToV2() (v2 *settingsV2) {
 	v2.Http.InsecureSkipVerify = v1.InsecureSkipVerify
 	v2.Node.Name = v1.Name
 
+	if v1.Database == "" {
+		v2.DataBase.Name = "database"
+	}
+
 	return
 }
 

settings/server_v1_test.go

@@ -61,7 +61,7 @@ StartCmd             = bash
 Database             = database
 CADir                = /test
 GithubProxy          = https://mirror.ghproxy.com/
-Secret           = newSecret
+Secret               = newSecret
 Demo                 = false
 PageSize             = 20
 HttpHost             = 0.0.0.0

settings/settings.go

@@ -43,6 +43,7 @@ func init() {
 	t := time.Unix(cast.ToInt64(buildTime), 0)
 	LastModified = strings.ReplaceAll(t.Format(time.RFC1123), "UTC", "GMT")
 
+	sections.Set("database", DatabaseSettings)
 	sections.Set("auth", AuthSettings)
 	sections.Set("casdoor", CasdoorSettings)
 	sections.Set("cert", CertSettings)
@@ -86,7 +87,7 @@ func Init() {
 func Save() (err error) {
 	// fix unable to save empty slice
 	if len(CertSettings.RecursiveNameservers) == 0 {
-		settings.Conf.Section("server").Key("RecursiveNameservers").SetValue("")
+		settings.Conf.Section("cert").Key("RecursiveNameservers").SetValue("")
 	}
 
 	err = settings.Save()