From 925e61abf43bb1c51ce89e97431600b3d1b5cfd1 Mon Sep 17 00:00:00 2001
From: Jacky <me@jackyu.cn>
Date: Wed, 23 Oct 2024 11:48:41 +0800
Subject: [PATCH] fix: update demo database and app.ini; enhance: migration

---
 .gitignore                 |   2 +
 install.sh                 |   3 ++
 resources/demo/app.ini     |  82 +++++++++++++++++++++++++++++++------
 resources/demo/demo.db     | Bin 65536 -> 131072 bytes
 settings/database.go       |   4 +-
 settings/server_v1.go      |   4 ++
 settings/server_v1_test.go |   2 +-
 settings/settings.go       |   3 +-
 8 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 095b6dbf..c4a0697c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ resources/development/nginx
 app/.env
 app/.status_hash
 casdoor.pub
+.idea/deployment.xml
+.idea/webServers.xml
diff --git a/install.sh b/install.sh
index 7a9e72a3..20976d0f 100644
--- a/install.sh
+++ b/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
diff --git a/resources/demo/app.ini b/resources/demo/app.ini
index 78d30fef..097ac0a0 100644
--- a/resources/demo/app.ini
+++ b/resources/demo/app.ini
@@ -1,19 +1,77 @@
-[server]
-HttpPort = 9000
-RunMode = release
+[app]
+PageSize  = 10
 JwtSecret = 6EEB622E-5C73-4082-AF76-7BAC337772F2
-Email = test@jackyu.cn
-HTTPChallengePort = 9180
-StartCmd = bash
-NodeSecret = 57D079F2-CA8B-412A-B5C0-FDA291C13391
-Demo = true
+
+[server]
+Host    =
+Port    = 9000
+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 =
-ErrorLogPath =
+AccessLogPath   =
+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     =
diff --git a/resources/demo/demo.db b/resources/demo/demo.db
index 2f78552ff1af25c238531275bb042bc53b15199b..2ae6cf1c96dbd652e7a61833e778c8166be65607 100644
GIT binary patch
delta 5223
zcmeHL-EZ4e6t`O^&bJfxVY)7@yQx~EX0-c|V02{-YZ#>;%StEM1GC-auJcH2*LJoH
zSY0<mObCf}<^>^5ut^h7NF$H%0OB9ujTgpvKukRBg%`As2d*7|CIu<d*b9x6#6IWv
z-1|HC+<Sh<tE<@RYUpZjY6L+L3V!X+rS<HA@e$;?ca{TCgc6SoMKAFv{%!2%SS@-z
znhN)az6nL}Tfq;55p1mckM8BJM%OX)a^QV5joc1gTF-4$&%KC~hk8*h&haHs<4QGp
zk>zPllxa{CISG_#R<R_{9-YtU7V^~8++_YuirLtfp^nc{jP(RF#JFCV3^;_7y>P4n
zg<UKI)8@1&TehU-eIfVqOy2cC4KbX^PztCiS%y^<P!ScGp*UUvOF+tc{oBHfHt{@8
z?%9K`9nrrC_M_YN?}O<eHMEN>?b1iX)A}xaSUq>J6}PNNfUU@M36z0i;<hB)+Htqr
zHgQ{Wh}-qTWVEpZCh)ac6S!eC1xK=sxB7wGE)3u$2PjpTpPJ3hpQ5Jor>NY?h2v9m
z@Uhwa+=AX0n$+J5r`62){Wy7K0M&Y&rDTg0Kv!iTc~QB-E$zTur6&$eY_6&WUSVI5
z93EEDQ%!WsWljOK43?{aF9O+r`-~54i*kr(D<BJ>%&cu6#mRvIw0^<#=??8)rF@<k
zcE5v_=^%84v!KFqWjn!&EM4Lx`%VH&99#}o;RN26y$vqfm!c%poSUXCkZ6IYWrdZL
zD$H8GS^*MQ%)pJgPyZ}9s0PP^#x6y)t`~4JzX#O@owecxg*(F)&B46O<&!7cSInnx
zTQr}RiTm<WpTV`rTF+jb92`XJRsARYtJf$7@W$qZnP*L&n#{kFJ2|sJDN+?=DMk=M
zGa|HnkuN%CP-EQFtjN(Y7NFKx35}rowrD9*7cw|WlIREHje7J|RHYba6=_e3Lk}>x
zv~p1dR)i@=0<ut*imt#MgBMBwJ_(Nj^H`vmN>x^jsEcK2Y0VqDD}yBguBU7OqKigy
z(Q;M9L_ty-SHqW4{i8Stzcpx1uHK_RjIZy5C=^zyLf8KUUlCz$7bT!D)M8m!ycXTs
zxSm)<^<QFaSPkIh?%k-C*N?>~55gH3d#?qf=RmX%tY(N|TI|Svox~<WND@I34-*gd
zWMQXH6|hFOaDu>~zTVJiRZK?UB}Uvwh{wcV#Gl0dM)Jp0LQmeU=^x*DSMR-}=vVH7
zEm(IP#f+bB<EN{;J08CAD|PMj=*{S8vJqt-^xwo7DuyKn5aJ54HSuX;ppi<pIjUQx
zqsfCY{1!r}L|-D`QH_~>qBUkcM{X7^=hU#Og=gPelFg!J5)tR5kvEH$NufF^T3z#-
zMeBc7v`%+ev>-1S&BS3nN(E9#;<rR8J{@}y)1p5_--vt?A;MpV4~JgI?*)Gko)26P
zq;9X@!^XA91Wry3quO5g7&9m%<UX)qOC0dhAK9;=^zTC3)s0Op3hsZPW!q~fkKmB3
zqHAoEton^x2J81zOh-G?oMlHmQ{8~MWcZhGax9H%DJKvjE6b1tc_Uzp`r5glt@0fI
z%^=tc7roKP!A@jl94FIhw0_)#Z=2cwX+L0F+zHSVYAfYoB=&;Ifto!Wq)sKkD;(>P
z?lKG68)Qo66#bmYOs{i?TU)iFz@Ookyg{-gJCDw*tvzbHaWh7i+znAPLTARzUah{{
zjF4qy{q^|cV|$>yty-`2FTL6dv7m~qa@KAkHb{zWlSd2ZfpkHF>FF@h%#)!}s+WLv
z)T=+4R$cWibLOdcLVZRz*UAPq-xydge_X!gIa6HW<{N`hq4*Tu82q=bxxNzGaU+?$
OHW4*@y9UNQ?*AJ)2mj{)

delta 546
zcmZo@;Am)InIJ7F$iToL0K_m5HBrY{TaZD|zm^v$#LqUJk=LH*9=|%@Jl+qyJzQ3t
zYq=}AMLGU(%wRvu?#niPv!H+rs|V*&#&U6GWkzmM2;Hh*l9-f}nw(lxQXC&&lA2q9
z#AJ02a&-)GRS0o(@^Mv2K$1zA+{YI*c|IqHAp--GhPa_2V^ciXpwzsw%%c3f+|)dn
zc@U9CV|{jUb#=xj)yaK~@{{+na!lUJDCVr8l$oNWkeOGKnx0yuqm*2fnpl#W5}#P2
zq)?JtQKF+%T9AS!l9HN}imYa`G?UI`F17})Mh{(faaC2urr_!C)-kS|oXR7zc{#fX
z<7PqbbVkOO$-6mHxSEnQ*~P`h8C#V%YjS!pPUhw>;qYc<1BFQZ<PLt9$>lt0oZ6~j
zHBF|IpYcot8Y8@U4{s9VvJH#^n-o|KIGFf;G4R*&{hBNgATwDZfMv5zKp;O$BLgGz
z=EnH?0s&q=E(R7}X$JldUTNNbeu2#b7X<kxN8b~l?0?Tzs=T~hFE2eauc9<lFF8M#
zfq{`FIGC5wUYmLH-n+^`Y^w;C*2_vv&aN!gOU^50;$RF61S-*FGBPkS)-^Pmtaz_t
OdPh8C^JeY`U*!SvNT758

diff --git a/settings/database.go b/settings/database.go
index 7e35f1c8..5524b46e 100644
--- a/settings/database.go
+++ b/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
diff --git a/settings/server_v1.go b/settings/server_v1.go
index 7f54d066..27e78d50 100644
--- a/settings/server_v1.go
+++ b/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
 }
 
diff --git a/settings/server_v1_test.go b/settings/server_v1_test.go
index ce29093e..addf173f 100644
--- a/settings/server_v1_test.go
+++ b/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
diff --git a/settings/settings.go b/settings/settings.go
index e763ecdc..4b90f728 100644
--- a/settings/settings.go
+++ b/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()