From 0df204a1df20e5360ef52641aa544fc3e32d546e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Wed, 21 Jun 2023 11:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=BB=98=E8=AE=A4=E7=94=9F=E6=88=90=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=EF=BC=8C=E5=B9=B6=E5=B0=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=B3=E8=81=94=E5=88=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=9B=86=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/setup/sql_executor.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/internal/setup/sql_executor.go b/internal/setup/sql_executor.go index 0634d8f9..b0f4fad1 100644 --- a/internal/setup/sql_executor.go +++ b/internal/setup/sql_executor.go @@ -87,14 +87,8 @@ func (this *SQLExecutor) Run(showLog bool) error { // 检查数据 func (this *SQLExecutor) checkData(db *dbs.DB) error { - // 检查初始化用户 - err := this.checkUser(db) - if err != nil { - return err - } - // 检查管理员平台节点 - err = this.checkAdminNode(db) + err := this.checkAdminNode(db) if err != nil { return err } @@ -111,6 +105,13 @@ func (this *SQLExecutor) checkData(db *dbs.DB) error { return err } + // 检查初始化用户 + // 需要放在检查集群后面 + err = this.checkUser(db) + if err != nil { + return err + } + // 检查IP名单 err = this.checkIPList(db) if err != nil { @@ -154,7 +155,14 @@ func (this *SQLExecutor) checkUser(db *dbs.DB) error { return nil } - _, err = db.Exec("INSERT INTO edgeUsers (`username`, `password`, `fullname`, `isOn`, `state`, `createdAt`) VALUES (?, ?, ?, ?, ?, ?)", "USER-"+rands.HexString(10), stringutil.Md5(rands.HexString(32)), "默认用户", 1, 1, time.Now().Unix()) + // 读取默认集群ID + // Read default cluster id + clusterId, err := db.FindCol(0, "SELECT id FROM edgeNodeClusters WHERE state=1 ORDER BY id ASC LIMIT 1") + if err != nil { + return err + } + + _, err = db.Exec("INSERT INTO edgeUsers (`username`, `password`, `fullname`, `isOn`, `state`, `createdAt`, `clusterId`) VALUES (?, ?, ?, ?, ?, ?, ?)", "USER_"+rands.HexString(10), stringutil.Md5(rands.HexString(32)), "默认用户", 1, 1, time.Now().Unix(), clusterId) return err }