✨ define migrate tenant domain (#145)

Author: lwnmengjing

cmd/migrate/migrate.go

@@ -30,6 +30,7 @@ var (
 	generate       bool
 	username       string
 	password       string
+	domain         string
 	system         bool
 	configProvider string
 	driver         string
@@ -59,6 +60,8 @@ func init() {
 		"admin", "system super administrator login username")
 	StartCmd.PersistentFlags().StringVarP(&password, "password", "p",
 		"123456", "system super administrator login password")
+	StartCmd.PersistentFlags().StringVarP(&domain, "domain", "d",
+		"localhost:8000", "system tenant domain")
 	StartCmd.PersistentFlags().StringVarP(&driver,
 		"gorm-driver", "r",
 		"mysql", "Start server with db driver")

cmd/migrate/migration/system/1691847581348_migrate.go

@@ -2,6 +2,7 @@ package system
 
 import (
 	"runtime"
+	"strings"
 	"time"
 
 	adminPKG "github.com/mss-boot-io/mss-boot-admin/pkg"
@@ -13,8 +14,11 @@ import (
 	"gorm.io/gorm"
 )
 
-var Username string
-var Password string
+var (
+	Username string
+	Password string
+	Domain   string
+)
 
 func init() {
 	_, fileName, _, _ := runtime.Caller(0)
@@ -171,6 +175,10 @@ oauth2:
 				Password: Password,
 			},
 		}
+		if Domain != "" {
+			tenant.Domains[0].Name = strings.Split(Domain, ":")[0]
+			tenant.Domains[0].Domain = Domain
+		}
 		err = tx.Create(tenant).Error
 		if err != nil {
 			return err

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/grafana/pyroscope-go v1.1.1
 	github.com/larksuite/oapi-sdk-go/v3 v3.3.0
-	github.com/mss-boot-io/mss-boot v0.2.6-0.20240731101419-5f04fdc2ad35
+	github.com/mss-boot-io/mss-boot v0.2.6-0.20240806093818-eef02c463244
 	github.com/mss-boot-io/redisqueue/v2 v2.0.0-20240222064111-d36e396df7f9
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/redis/go-redis/v9 v9.6.1

go.sum

@@ -573,8 +573,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/mss-boot-io/mss-boot v0.2.6-0.20240731101419-5f04fdc2ad35 h1:iRvxKLVvcKRTrEz+HojyE5kUfUS1ZLhfYZH3fHEM/H4=
-github.com/mss-boot-io/mss-boot v0.2.6-0.20240731101419-5f04fdc2ad35/go.mod h1:frC6YvBpVBN/zCc2MNZT9RF+9tynB+ERLNbfQDLSHYg=
+github.com/mss-boot-io/mss-boot v0.2.6-0.20240806093818-eef02c463244 h1:C14jtdPeIqs1Nbaz10Lm27z0STE2vbyeRzKmSR4a2WM=
+github.com/mss-boot-io/mss-boot v0.2.6-0.20240806093818-eef02c463244/go.mod h1:frC6YvBpVBN/zCc2MNZT9RF+9tynB+ERLNbfQDLSHYg=
 github.com/mss-boot-io/redisqueue/v2 v2.0.0-20240222064111-d36e396df7f9 h1:/YgpHiqgrxz/0+mKoETXu21c6/fyDt7/j9bdD3UkbdU=
 github.com/mss-boot-io/redisqueue/v2 v2.0.0-20240222064111-d36e396df7f9/go.mod h1:f/sISkwvecPq37zygQzWNj5ntJoP/jcoK0kPIjFTWFI=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=

models/menu.go

@@ -70,7 +70,8 @@ type Menu struct {
 	// Sort 排序
 	Sort int `json:"sort" gorm:"column:sort;comment:排序;size:11;not null;default:0"`
 	// Children 子菜单
-	Children []*Menu `json:"children,omitempty" gorm:"foreignKey:ParentID;references:ID" swaggerignore:"true"`
+	Children   []*Menu `json:"children,omitempty" gorm:"foreignKey:ParentID;references:ID" swaggerignore:"true"`
+	ParentPath string  `json:"parentPath" gorm:"-" swaggerignore:"true"`
 }
 
 func (x MenuList) Len() int           { return len(x) }
@@ -89,6 +90,15 @@ func (e *Menu) BeforeCreate(tx *gorm.DB) error {
 		e.Type == pkg.ComponentAccessType {
 		e.HideInMenu = true
 	}
+	if e.ParentPath != "" {
+		var parent struct{ ID string }
+		if tx.Model(&Menu{}).
+			Where("path = ?", e.ParentPath).
+			Select("id").
+			First(&parent).Error == nil {
+			e.ParentID = parent.ID
+		}
+	}
 	return nil
 }