feat: enhance MySQL database configuration and connection utilities

- Add a database configuration struct to manage external database connection details
- Implement MySQL connection check functionality
- Modify external database port to be an integer type
- Update default database name to be more specific
- Adjust logging messages for better clarity and context
- Update usages of external database settings in initialization routines
- Create new database utility files for MySQL functionality

Signed-off-by: ysicing <i@ysicing.me>

Author: ysicing

cmd/init.go

@@ -20,6 +20,7 @@ import (
 	"github.com/easysoft/qcadmin/internal/app/config"
 	"github.com/easysoft/qcadmin/internal/pkg/k8s"
 	"github.com/easysoft/qcadmin/internal/pkg/types"
+	"github.com/easysoft/qcadmin/internal/pkg/util/db"
 	"github.com/easysoft/qcadmin/internal/pkg/util/factory"
 	"github.com/easysoft/qcadmin/pkg/providers"
 
@@ -97,6 +98,18 @@ func newCmdInit(f factory.Factory) *cobra.Command {
 				nCluster.MasterIPs = append(nCluster.MasterIPs, exnet.LocalIPs()[0])
 			}
 		}
+		if len(meta.ExtDBHost) > 0 && len(meta.ExtDBPassword) > 0 {
+			cfg := &db.Config{
+				Host:     meta.ExtDBHost,
+				Port:     meta.ExtDBPort,
+				Username: meta.ExtDBUser,
+				Password: meta.ExtDBPassword,
+			}
+			if !db.CheckMySQL(cfg) {
+				log.Errorf("external db check failed, please check your external db")
+				os.Exit(-1)
+			}
+		}
 	}
 	initCmd.Run = func(cmd *cobra.Command, args []string) {
 		if name == "native" {

cmd/manage/crd/dbsvc.go

@@ -158,7 +158,7 @@ func cmdNewDbSvc(f factory.Factory) *cobra.Command {
 				svc.Spec = corev1.ServiceSpec{
 					Ports: []corev1.ServicePort{
 						{
-							Port:       port,
+							Port:       3306,
 							Protocol:   corev1.ProtocolTCP,
 							Name:       "db",
 							TargetPort: intstr.FromInt(int(port)),
@@ -208,7 +208,7 @@ func cmdNewDbSvc(f factory.Factory) *cobra.Command {
 					ExternalName: host,
 					Ports: []corev1.ServicePort{
 						{
-							Port:       port,
+							Port:       3306,
 							TargetPort: intstr.FromInt32(port),
 							Protocol:   corev1.ProtocolTCP,
 							Name:       "db",
@@ -272,7 +272,7 @@ func cmdNewDbSvc(f factory.Factory) *cobra.Command {
 				return nil
 			}
 			log.Donef("created external database service %s in namespace %s", name, namespace)
-			log.Infof("you can access the database in cluster using: %s", color.SGreen("%s.%s:%d", name, namespace, port))
+			log.Infof("you can access the database in cluster using: %s", color.SGreen("%s.%s:3306", name, namespace))
 			return nil
 		},
 	}

common/const.go

@@ -97,7 +97,7 @@ const (
 	CDNVersionURL                 = "https://pkg.zentao.net/cli/devops/version.json"
 	DefaultNerdctlConfig          = "/etc/nerdctl/nerdctl.toml"
 	DefaultExternalDBPort         = 3306
-	DefaultExternalDBName         = "zentaopaas-mysql"
+	DefaultExternalDBName         = "ex-zentaopaas-mysql"
 )
 
 const (

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/easysoft/quickon-api v0.7.6
 	github.com/emirpasic/gods v1.18.1
 	github.com/ergoapi/util v0.7.12
+	github.com/go-sql-driver/mysql v1.9.1
 	github.com/gofrs/flock v0.12.1
 	github.com/google/gops v0.3.28
 	github.com/gosuri/uitable v0.0.4
@@ -66,6 +67,7 @@ require (
 
 require (
 	dario.cat/mergo v1.0.1 // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/6tail/lunar-go v1.3.15 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect

go.sum

@@ -179,8 +179,9 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF
 github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI=
+github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=

internal/pkg/cli/check/mysql.go

@@ -7,11 +7,11 @@
 package check
 
 import (
-	"database/sql"
 	"fmt"
 
 	"github.com/spf13/cobra"
 
+	"github.com/easysoft/qcadmin/internal/pkg/util/db"
 	"github.com/easysoft/qcadmin/internal/pkg/util/factory"
 )
 
@@ -33,29 +33,13 @@ func CheckMySQLCommand(f factory.Factory) *cobra.Command {
 			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			// Test MySQL connection
-			f.GetLog().Infof("test mysql connection %:%d", host, port)
-			db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:%d)/", username, password, host, port))
-			if err != nil {
-				f.GetLog().Errorf("failed to connect to mysql(%s:%d), err: %v", host, port, err)
-				return
+			cfg := &db.Config{
+				Host:     host,
+				Port:     port,
+				Username: username,
+				Password: password,
 			}
-			defer db.Close()
-			// Test database creation
-			f.GetLog().Infof("try create database z_test_db")
-			_, err = db.Exec("CREATE DATABASE z_test_db")
-			if err != nil {
-				f.GetLog().Errorf("failed to create database z_test_db,err: %v", err)
-				return
-			}
-			f.GetLog().Infof("clean test database z_test_db")
-			_, err = db.Exec("DROP DATABASE z_test_db")
-			if err != nil {
-				f.GetLog().Errorf("failed to drop test database: %v", err)
-				return
-			}
-			f.GetLog().Done("mysql is available and can create databases")
-			return
+			db.CheckMySQL(cfg)
 		},
 	}
 	cmd.Flags().StringVarP(&host, "host", "", "localhost", "MySQL host")

internal/pkg/util/db/db.go

@@ -0,0 +1,15 @@
+// Copyright (c) 2021-2025 北京渠成软件有限公司(Beijing Qucheng Software Co., Ltd. www.qucheng.com) All rights reserved.
+// Use of this source code is covered by the following dual licenses:
+// (1) Z PUBLIC LICENSE 1.2 (ZPL 1.2)
+// (2) Affero General Public License 3.0 (AGPL 3.0)
+// license that can be found in the LICENSE file.
+
+package db
+
+type Config struct {
+	Type     string `json:"type" yaml:"type"`
+	Host     string `json:"host" yaml:"host"`
+	Port     int    `json:"port" yaml:"port"`
+	Username string `json:"username" yaml:"username"`
+	Password string `json:"password" yaml:"password"`
+}

internal/pkg/util/db/mysql.go

@@ -0,0 +1,43 @@
+// Copyright (c) 2021-2025 北京渠成软件有限公司(Beijing Qucheng Software Co., Ltd. www.qucheng.com) All rights reserved.
+// Use of this source code is covered by the following dual licenses:
+// (1) Z PUBLIC LICENSE 1.2 (ZPL 1.2)
+// (2) Affero General Public License 3.0 (AGPL 3.0)
+// license that can be found in the LICENSE file.
+
+package db
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/easysoft/qcadmin/internal/pkg/util/log"
+
+	_ "github.com/go-sql-driver/mysql"
+)
+
+func CheckMySQL(cfg *Config) bool {
+	log := log.GetInstance()
+	// Test MySQL connection
+	log.Debugf("test mysql connection %s:%d", cfg.Host, cfg.Port)
+	db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:%d)/", cfg.Username, cfg.Password, cfg.Host, cfg.Port))
+	if err != nil {
+		log.Errorf("failed to connect to mysql(%s:%d), err: %v", cfg.Host, cfg.Port, err)
+		return false
+	}
+	defer db.Close()
+	// Test database creation
+	log.Debugf("try create database z_test_db")
+	_, err = db.Exec("CREATE DATABASE z_test_db")
+	if err != nil {
+		log.Errorf("failed to create database z_test_db,err: %v", err)
+		return false
+	}
+	log.Debugf("clean test database z_test_db")
+	_, err = db.Exec("DROP DATABASE z_test_db")
+	if err != nil {
+		log.Errorf("failed to drop test database: %v", err)
+		return false
+	}
+	log.Done("mysql check success")
+	return true
+}

pkg/quickon/quickon.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
@@ -46,7 +47,7 @@ type Meta struct {
 	OffLine         bool
 	DBReplication   bool
 	ExtDBHost       string
-	ExtDBPort       string
+	ExtDBPort       int
 	ExtDBUser       string
 	ExtDBPassword   string
 	Type            string
@@ -104,7 +105,7 @@ func (m *Meta) GetCustomFlags() []types.Flag {
 			Name:  "ext-db-port",
 			Usage: "external db port",
 			P:     &m.ExtDBPort,
-			V:     "3306",
+			V:     3306,
 		},
 		{
 			Name:  "ext-db-user",
@@ -365,11 +366,11 @@ func (m *Meta) Init() error {
 	}
 	useExtDB := false
 	// 如果外部数据库可用，则使用外部数据库
-	if m.ExtDBHost != "" && m.ExtDBPort != "" && m.ExtDBUser != "" && m.ExtDBPassword != "" {
+	if m.ExtDBHost != "" && m.ExtDBUser != "" && m.ExtDBPassword != "" {
 		m.Log.Infof("detected external db, will use external db as cluster global database instance")
-		args := []string{"platform", "crd", "dbsvc", "new", "--host", m.ExtDBHost, "--port", m.ExtDBPort, "--username", m.ExtDBUser, "--password", m.ExtDBPassword}
-		if output, err := qcexec.Command(os.Args[0], args...).CombinedOutput(); err != nil {
-			m.Log.Warnf("create external dbservice failed, reason: %v, std: %s", err, string(output))
+		args := []string{"platform", "crd", "dbsvc", "new", "--host", m.ExtDBHost, "--port", strconv.Itoa(m.ExtDBPort), "--username", m.ExtDBUser, "--password", m.ExtDBPassword}
+		if err := qcexec.CommandRun(os.Args[0], args...); err != nil {
+			m.Log.Warnf("create external dbservice failed, reason: %v", err)
 		} else {
 			m.Log.Done("configure external db as cluster global database instance success")
 			useExtDB = true
@@ -400,8 +401,8 @@ func (m *Meta) Init() error {
 	if useExtDB {
 		// create external db
 		helmargs = append(helmargs, "--set", "mysql.enabled=false")
-		helmargs = append(helmargs, "--set", "mysql.auth.dbservice.name=zentaopaas-mysql")
-		helmargs = append(helmargs, "--set", "mysql.auth.host=zentaopaas-mysql.quickon-system.svc")
+		helmargs = append(helmargs, "--set", fmt.Sprintf("mysql.auth.dbservice.name=%s", common.DefaultExternalDBName))
+		helmargs = append(helmargs, "--set", fmt.Sprintf("mysql.auth.host=%s.quickon-system.svc", common.DefaultExternalDBName))
 	}
 
 	// TODO: 等下个版本禅道正式发版后续删除
@@ -470,7 +471,7 @@ func (m *Meta) QuickONReady() {
 
 // OperatorReady OperatorReady
 func (m *Meta) OperatorReady() error {
-	m.Log.Debugf("waiting for operator ready")
+	m.Log.Debug("waiting for operator ready")
 	for i := 1; i <= 10; i++ {
 		deploy, err := m.kubeClient.GetDeployment(context.Background(), common.GetDefaultSystemNamespace(true), common.DefaultCneOperatorName, metav1.GetOptions{})
 		if err != nil {
@@ -502,7 +503,7 @@ func (m *Meta) readyQuickON(ctx context.Context) error {
 			status = true
 			break
 		}
-		time.Sleep(time.Second * 10)
+		time.Sleep(time.Second * 5)
 	}
 	m.Log.StopWait()
 	if status {