实现路径规则部分功能

internal/db/models/http_location_dao.go

@@ -1,9 +1,13 @@
 package models
 
 import (
+	"encoding/json"
+	"errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/types"
 )
 
 const (
@@ -27,7 +31,7 @@ func NewHTTPLocationDAO() *HTTPLocationDAO {
 var SharedHTTPLocationDAO = NewHTTPLocationDAO()
 
 // 启用条目
-func (this *HTTPLocationDAO) EnableHTTPLocation(id uint32) error {
+func (this *HTTPLocationDAO) EnableHTTPLocation(id int64) error {
 	_, err := this.Query().
 		Pk(id).
 		Set("state", HTTPLocationStateEnabled).
@@ -36,7 +40,7 @@ func (this *HTTPLocationDAO) EnableHTTPLocation(id uint32) error {
 }
 
 // 禁用条目
-func (this *HTTPLocationDAO) DisableHTTPLocation(id uint32) error {
+func (this *HTTPLocationDAO) DisableHTTPLocation(id int64) error {
 	_, err := this.Query().
 		Pk(id).
 		Set("state", HTTPLocationStateDisabled).
@@ -45,7 +49,7 @@ func (this *HTTPLocationDAO) DisableHTTPLocation(id uint32) error {
 }
 
 // 查找启用中的条目
-func (this *HTTPLocationDAO) FindEnabledHTTPLocation(id uint32) (*HTTPLocation, error) {
+func (this *HTTPLocationDAO) FindEnabledHTTPLocation(id int64) (*HTTPLocation, error) {
 	result, err := this.Query().
 		Pk(id).
 		Attr("state", HTTPLocationStateEnabled).
@@ -57,9 +61,160 @@ func (this *HTTPLocationDAO) FindEnabledHTTPLocation(id uint32) (*HTTPLocation,
 }
 
 // 根据主键查找名称
-func (this *HTTPLocationDAO) FindHTTPLocationName(id uint32) (string, error) {
+func (this *HTTPLocationDAO) FindHTTPLocationName(id int64) (string, error) {
 	return this.Query().
 		Pk(id).
 		Result("name").
 		FindStringCol("")
 }
+
+// 创建路径规则
+func (this *HTTPLocationDAO) CreateLocation(parentId int64, name string, pattern string, description string, isBreak bool) (int64, error) {
+	op := NewHTTPLocationOperator()
+	op.IsOn = true
+	op.State = HTTPLocationStateEnabled
+	op.ParentId = parentId
+	op.Name = name
+	op.Pattern = pattern
+	op.Description = description
+	op.IsBreak = isBreak
+	_, err := this.Save(op)
+	if err != nil {
+		return 0, err
+	}
+	return types.Int64(op.Id), nil
+}
+
+// 修改路径规则
+func (this *HTTPLocationDAO) UpdateLocation(locationId int64, name string, pattern string, description string, isOn bool, isBreak bool) error {
+	if locationId <= 0 {
+		return errors.New("invalid locationId")
+	}
+	op := NewHTTPLocationOperator()
+	op.Id = locationId
+	op.Name = name
+	op.Pattern = pattern
+	op.Description = description
+	op.IsOn = isOn
+	op.IsBreak = isBreak
+	_, err := this.Save(op)
+	return err
+}
+
+// 组合配置
+func (this *HTTPLocationDAO) ComposeLocationConfig(locationId int64) (*serverconfigs.HTTPLocationConfig, error) {
+	location, err := this.FindEnabledHTTPLocation(locationId)
+	if err != nil {
+		return nil, err
+	}
+	if location == nil {
+		return nil, nil
+	}
+
+	config := &serverconfigs.HTTPLocationConfig{}
+	config.Id = int64(location.Id)
+	config.IsOn = location.IsOn == 1
+	config.Description = location.Description
+	config.Name = location.Name
+	config.Pattern = location.Pattern
+	config.URLPrefix = location.UrlPrefix
+
+	// web
+	if location.WebId > 0 {
+		webConfig, err := SharedHTTPWebDAO.ComposeWebConfig(int64(location.WebId))
+		if err != nil {
+			return nil, err
+		}
+		config.Web = webConfig
+	}
+
+	// reverse proxy
+	if IsNotNull(location.ReverseProxy) {
+		ref := &serverconfigs.ReverseProxyRef{}
+		err = json.Unmarshal([]byte(location.ReverseProxy), ref)
+		if err != nil {
+			return nil, err
+		}
+		config.ReverseProxyRef = ref
+		if ref.ReverseProxyId > 0 {
+			reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(ref.ReverseProxyId)
+			if err != nil {
+				return nil, err
+			}
+			config.ReverseProxy = reverseProxyConfig
+		}
+	}
+
+	return config, nil
+}
+
+// 查找反向代理设置
+func (this *HTTPLocationDAO) FindLocationReverseProxy(locationId int64) (*serverconfigs.ReverseProxyRef, error) {
+	refString, err := this.Query().
+		Pk(locationId).
+		Result("reverseProxy").
+		FindStringCol("")
+	if err != nil {
+		return nil, err
+	}
+	if IsNotNull(refString) {
+		ref := &serverconfigs.ReverseProxyRef{}
+		err = json.Unmarshal([]byte(refString), ref)
+		if err != nil {
+			return nil, err
+		}
+		return ref, nil
+	}
+	return nil, nil
+}
+
+// 更改反向代理设置
+func (this *HTTPLocationDAO) UpdateLocationReverseProxy(locationId int64, reverseProxyJSON []byte) error {
+	if locationId <= 0 {
+		return errors.New("invalid locationId")
+	}
+	op := NewHTTPLocationOperator()
+	op.Id = locationId
+	op.ReverseProxy = JSONBytes(reverseProxyJSON)
+	_, err := this.Save(op)
+	return err
+}
+
+// 查找WebId
+func (this *HTTPLocationDAO) FindLocationWebId(locationId int64) (int64, error) {
+	webId, err := this.Query().
+		Pk(locationId).
+		Result("webId").
+		FindIntCol(0)
+	return int64(webId), err
+}
+
+// 更改Web设置
+func (this *HTTPLocationDAO) UpdateLocationWeb(locationId int64, webId int64) error {
+	if locationId <= 0 {
+		return errors.New("invalid locationId")
+	}
+	op := NewHTTPLocationOperator()
+	op.Id = locationId
+	op.WebId = webId
+	_, err := this.Save(op)
+	return err
+}
+
+// 转换引用为配置
+func (this *HTTPLocationDAO) ConvertLocationRefs(refs []*serverconfigs.HTTPLocationRef) (locations []*serverconfigs.HTTPLocationConfig, err error) {
+	for _, ref := range refs {
+		config, err := this.ComposeLocationConfig(ref.LocationId)
+		if err != nil {
+			return nil, err
+		}
+		children, err := this.ConvertLocationRefs(ref.Children)
+		if err != nil {
+			return nil, err
+		}
+		config.Children = children
+		locations = append(locations, config)
+	}
+
+	return
+}

internal/db/models/http_location_model.go

@@ -15,6 +15,8 @@ type HTTPLocation struct {
 	Description  string `field:"description"`  // 描述
 	WebId        uint32 `field:"webId"`        // Web配置ID
 	ReverseProxy string `field:"reverseProxy"` // 反向代理
+	UrlPrefix    string `field:"urlPrefix"`    // URL前缀
+	IsBreak      uint8  `field:"isBreak"`      // 是否终止匹配
 }
 
 type HTTPLocationOperator struct {
@@ -31,6 +33,8 @@ type HTTPLocationOperator struct {
 	Description  interface{} // 描述
 	WebId        interface{} // Web配置ID
 	ReverseProxy interface{} // 反向代理
+	UrlPrefix    interface{} // URL前缀
+	IsBreak      interface{} // 是否终止匹配
 }
 
 func NewHTTPLocationOperator() *HTTPLocationOperator {

internal/db/models/http_web_dao.go

@@ -184,6 +184,24 @@ func (this *HTTPWebDAO) ComposeWebConfig(webId int64) (*serverconfigs.HTTPWebCon
 		config.FirewallRef = firewallRef
 	}
 
+	// 路径规则
+	if IsNotNull(web.Locations) {
+		refs := []*serverconfigs.HTTPLocationRef{}
+		err = json.Unmarshal([]byte(web.Locations), &refs)
+		if err != nil {
+			return nil, err
+		}
+		if len(refs) > 0 {
+			config.LocationRefs = refs
+
+			locations, err := SharedHTTPLocationDAO.ConvertLocationRefs(refs)
+			if err != nil {
+				return nil, err
+			}
+			config.Locations = locations
+		}
+	}
+
 	// TODO 更多配置
 
 	return config, nil
@@ -377,6 +395,22 @@ func (this *HTTPWebDAO) UpdateWebFirewall(webId int64, firewallJSON []byte) erro
 	return this.NotifyUpdating(webId)
 }
 
+// 更改路径规则配置
+func (this *HTTPWebDAO) UpdateWebLocations(webId int64, locationsJSON []byte) error {
+	if webId <= 0 {
+		return errors.New("invalid webId")
+	}
+	op := NewHTTPWebOperator()
+	op.Id = webId
+	op.Locations = JSONBytes(locationsJSON)
+	_, err := this.Save(op)
+	if err != nil {
+		return err
+	}
+
+	return this.NotifyUpdating(webId)
+}
+
 // 通知更新
 func (this *HTTPWebDAO) NotifyUpdating(webId int64) error {
 	err := SharedServerDAO.UpdateServerIsUpdatingWithWebId(webId)

internal/db/models/http_web_model.go

@@ -23,6 +23,7 @@ type HTTPWeb struct {
 	Gzip                   string `field:"gzip"`                   // Gzip配置
 	Cache                  string `field:"cache"`                  // 缓存配置
 	Firewall               string `field:"firewall"`               // 防火墙设置
+	Locations              string `field:"locations"`              // 路径规则配置
 }
 
 type HTTPWebOperator struct {
@@ -47,6 +48,7 @@ type HTTPWebOperator struct {
 	Gzip                   interface{} // Gzip配置
 	Cache                  interface{} // 缓存配置
 	Firewall               interface{} // 防火墙设置
+	Locations              interface{} // 路径规则配置
 }
 
 func NewHTTPWebOperator() *HTTPWebOperator {