breeze/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-01-12 00:06:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix issue with mcp bind website (#8356)

Browse Source
This commit is contained in:
zhengkunwang
2025-04-09 11:55:56 +08:00
committed by GitHub
parent 5ab8377ac1
commit 342c04b30a
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/app/repo/group.go
View File

@@ -16,6 +16,7 @@ type IGroupRepo interface {
Delete(opts ...DBOption) error
CancelDefault(groupType string) error
WithByHostDefault() DBOption
WithByWebsiteDefault() DBOption
}
func NewIGroupRepo() IGroupRepo {
@@ -56,6 +57,12 @@ func (u *GroupRepo) WithByHostDefault() DBOption {
}
}
func (u *GroupRepo) WithByWebsiteDefault() DBOption {
return func(g *gorm.DB) *gorm.DB {
return g.Where("is_default = ? AND type = ?", 1, "website")
}
}
func (u *GroupRepo) Delete(opts ...DBOption) error {
db := global.DB
for _, opt := range opts {

25
backend/app/service/mcp_server.go
View File

@@ -279,10 +279,12 @@ func (m McpServerService) BindDomain(req request.McpBindDomain) error {
return buserr.New("ErrSSL")
}
}
group, _ := groupRepo.Get(groupRepo.WithByWebsiteDefault())
createWebsiteReq := request.WebsiteCreate{
PrimaryDomain: req.Domain,
Alias: strings.ToLower(req.Domain),
Type: constant.Static,
PrimaryDomain: req.Domain,
Alias: strings.ToLower(req.Domain),
Type: constant.Static,
WebsiteGroupID: group.ID,
}
websiteService := NewIWebsiteService()
if err := websiteService.CreateWebsite(createWebsiteReq); err != nil {
@@ -386,13 +388,16 @@ func updateMcpConfig(websiteID uint) {
} else {
baseUrl = fmt.Sprintf("https://%s", websiteDomain.Domain)
}
for _, server := range servers {
if server.BaseURL != baseUrl {
server.BaseURL = baseUrl
server.HostIP = "127.0.0.1"
go updateMcpServer(&server)
go func() {
for _, server := range servers {
if server.BaseURL != baseUrl {
server.BaseURL = baseUrl
server.HostIP = "127.0.0.1"
_ = updateMcpServer(&server)
}
}
}
}()
}
func addProxy(server *model.McpServer) {
@@ -502,13 +507,13 @@ func updateMcpServer(mcpServer *model.McpServer) error {
if err := gotenv.Write(env, path.Join(mcpServer.Dir, ".env")); err != nil {
return err
}
_ = mcpServerRepo.Save(mcpServer)
composePath := path.Join(constant.McpDir, mcpServer.Name, "docker-compose.yml")
_, _ = compose.Down(composePath)
if _, err := compose.Up(composePath); err != nil {
mcpServer.Status = constant.RuntimeError
mcpServer.Message = err.Error()
}
return mcpServerRepo.Save(mcpServer)
}