diff --git a/global/config.go b/global/config.go index b9581d8..8646792 100644 --- a/global/config.go +++ b/global/config.go @@ -26,10 +26,15 @@ func InitViper() { var version string var name string var auto bool + var projectGroupId int + var projectTemplateId int flag.StringVar(&version, "DongtaiGoProjectVersion", "v1.0.0", "Project Version") flag.StringVar(&name, "DongtaiGoProjectName", "GO Project", "Project Name") flag.BoolVar(&auto, "DongtaiGoProjectCreate", true, "Auto Create Project") + flag.IntVar(&projectGroupId, "DongtaiGoProjectGroupId", 1, "Group ID") + flag.IntVar(&projectTemplateId, "DongtaiGoProjectTemplateId", 1, "Template ID") + flag.Parse() if version != "v1.0.0" { Config.DongtaiGoProjectVersion = version @@ -40,5 +45,12 @@ func InitViper() { if auto != true { Config.DongtaiGoProjectCreate = auto } + if projectGroupId != 1 { + Config.DongtaiGoProjectGroupId = projectGroupId + } + if projectTemplateId != 1 { + Config.DongtaiGoProjectTemplateId = projectTemplateId + } + fmt.Println(Config) } diff --git a/model/config.go b/model/config.go index a892b43..b2d354f 100644 --- a/model/config.go +++ b/model/config.go @@ -1,9 +1,11 @@ package model type Config struct { - DongtaiGoOpenapi string `yaml:"DongtaiGoOpenapi"` - DongtaiGoToken string `yaml:"DongtaiGoToken"` - DongtaiGoProjectName string `yaml:"DongtaiGoProjectName"` - DongtaiGoProjectVersion string `yaml:"DongtaiGoProjectVersion"` - DongtaiGoProjectCreate bool `yaml:"DongtaiGoProjectCreate"` + DongtaiGoOpenapi string `yaml:"DongtaiGoOpenapi"` + DongtaiGoToken string `yaml:"DongtaiGoToken"` + DongtaiGoProjectName string `yaml:"DongtaiGoProjectName"` + DongtaiGoProjectVersion string `yaml:"DongtaiGoProjectVersion"` + DongtaiGoProjectCreate bool `yaml:"DongtaiGoProjectCreate"` + DongtaiGoProjectGroupId int `yaml:"DongtaiGoProjectGroupId"` + DongtaiGoProjectTemplateId int `yaml:"DongtaiGoProjectTemplateId"` } diff --git a/model/request/engine.go b/model/request/engine.go index 6c34642..6aa2cc6 100644 --- a/model/request/engine.go +++ b/model/request/engine.go @@ -25,6 +25,8 @@ type AgentRegisterReq struct { ServerEnv string `json:"serverEnv"` Pid string `json:"pid"` ProjectVersion string `json:"projectVersion"` + ProjectGroupId int `json:"projectGroupId"` + ProjectTemplateId int `json:"projectTemplateId"` } type HookRuleReq struct { diff --git a/service/engine.go b/service/engine.go index c3cfe4e..c9eb258 100644 --- a/service/engine.go +++ b/service/engine.go @@ -145,6 +145,8 @@ func AgentRegister() (err error) { ServerPath: filePath, ServerEnv: encodeEnv, Pid: strconv.Itoa(pid), + ProjectGroupId: global.Config.DongtaiGoProjectGroupId, + ProjectTemplateId: global.Config.DongtaiGoProjectTemplateId, } go func() { for {