Improve addDatabaseUser()

Author: hsluoyz

main.go

@@ -36,6 +36,7 @@ func main() {
 	object.InitRuleMap()
 	object.InitActionMap()
 	run.InitAppMap()
+	run.InitRdsClient()
 	run.InitSelfStart()
 	object.StartMonitorSitesLoop()
 

run/database_cloud.go

@@ -16,29 +16,32 @@ package run
 
 import (
 	"fmt"
-	"github.com/beego/beego"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/rds"
+	"github.com/beego/beego"
 )
 
 var rdsClient *rds.Client
 
-func InitRdsClient() *rds.Client {
+func InitRdsClient() {
 	dbRegionId := beego.AppConfig.String("dbRegionId")
 	dbAccessKeyId := beego.AppConfig.String("dbAccessKeyId")
 	dbAccessKeySecret := beego.AppConfig.String("dbAccessKeySecret")
 
+	if dbRegionId == "" || dbAccessKeyId == "" || dbAccessKeySecret == "" {
+		return
+	}
+
 	config := sdk.NewConfig()
 	credential := credentials.NewAccessKeyCredential(dbAccessKeyId, dbAccessKeySecret)
+
 	var err error
 	rdsClient, err = rds.NewClientWithOptions(dbRegionId, config, credential)
 	if err != nil {
 		panic(err)
 	}
-
-	return rdsClient
 }
 
 func gitCreateDatabaseCloud(name string) (bool, error) {
@@ -57,6 +60,11 @@ func gitCreateDatabaseCloud(name string) (bool, error) {
 		return false, err
 	}
 
+	err = addDatabaseUser(name)
+	if err != nil {
+		return false, err
+	}
+
 	return true, err
 }
 

run/database_cloud_test.go

@@ -24,9 +24,4 @@ func TestCreateDatabaseCloud(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-
-	err = addDatabaseUser(dbName)
-	if err != nil {
-		panic(err)
-	}
 }

run/util.go

@@ -87,7 +87,7 @@ func updateAppConfFile(name string, i int) {
 		content = strings.ReplaceAll(content, "root", beego.AppConfig.String("dbUser"))
 		content = strings.ReplaceAll(content, "123456", beego.AppConfig.String("dbPass"))
 		content = strings.ReplaceAll(content, "localhost:3306", fmt.Sprintf("%s:3306", beego.AppConfig.String("dbHost")))
-		content = strings.ReplaceAll(content, "dbName = casdoor", fmt.Sprintf("dbName = %s", name))
+		content = strings.ReplaceAll(content, "dbName = casibase", fmt.Sprintf("dbName = %s", name))
 		content = strings.ReplaceAll(content, "redisEndpoint =", fmt.Sprintf("redisEndpoint = \"%s\"", beego.AppConfig.String("redisEndpoint")))
 		content = strings.ReplaceAll(content, "disablePreviewMode = false", "disablePreviewMode = true")
 		content = strings.ReplaceAll(content, "casdoorEndpoint = https://door.casdoor.com", fmt.Sprintf("casdoorEndpoint = %s", beego.AppConfig.String("casdoorEndpoint")))