From da919571c6d3828b18b0279be5bef657ad78eb6d Mon Sep 17 00:00:00 2001
From: jinnrry <ok@xjiangwei.cn>
Date: Mon, 15 Apr 2024 10:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/models/base.go       | 26 ++++++++++++++++++++++++++
 server/res_init/init.go     | 25 +------------------------
 server/services/setup/db.go |  1 +
 3 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 server/models/base.go

diff --git a/server/models/base.go b/server/models/base.go
new file mode 100644
index 00000000..99328edd
--- /dev/null
+++ b/server/models/base.go
@@ -0,0 +1,26 @@
+package models
+
+import "pmail/db"
+
+func SyncTables() {
+	err := db.Instance.Sync2(&User{})
+	if err != nil {
+		panic(err)
+	}
+	err = db.Instance.Sync2(&Email{})
+	if err != nil {
+		panic(err)
+	}
+	err = db.Instance.Sync2(&Group{})
+	if err != nil {
+		panic(err)
+	}
+	err = db.Instance.Sync2(&Rule{})
+	if err != nil {
+		panic(err)
+	}
+	err = db.Instance.Sync2(&UserAuth{})
+	if err != nil {
+		panic(err)
+	}
+}
diff --git a/server/res_init/init.go b/server/res_init/init.go
index 0d99b6e4..2358b6bc 100644
--- a/server/res_init/init.go
+++ b/server/res_init/init.go
@@ -38,7 +38,7 @@ func Init(serverVersion string) {
 		if err != nil {
 			panic(err)
 		}
-		syncTables()
+		models.SyncTables()
 		session.Init()
 		hooks.Init(serverVersion)
 		// smtp server start
@@ -86,26 +86,3 @@ func dirInit() {
 		}
 	}
 }
-
-func syncTables() {
-	err := db.Instance.Sync2(&models.User{})
-	if err != nil {
-		panic(err)
-	}
-	err = db.Instance.Sync2(&models.Email{})
-	if err != nil {
-		panic(err)
-	}
-	err = db.Instance.Sync2(&models.Group{})
-	if err != nil {
-		panic(err)
-	}
-	err = db.Instance.Sync2(&models.Rule{})
-	if err != nil {
-		panic(err)
-	}
-	err = db.Instance.Sync2(&models.UserAuth{})
-	if err != nil {
-		panic(err)
-	}
-}
diff --git a/server/services/setup/db.go b/server/services/setup/db.go
index d327bcc3..90b67356 100644
--- a/server/services/setup/db.go
+++ b/server/services/setup/db.go
@@ -85,6 +85,7 @@ func SetDatabaseSettings(ctx *context.Context, dbType, dbDSN string) error {
 	if err != nil {
 		return errors.Wrap(err)
 	}
+	models.SyncTables()
 	return nil
 }