修改反向代理实现

internal/db/models/http_location_dao.go

@@ -0,0 +1,65 @@
+package models
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/dbs"
+)
+
+const (
+	HTTPLocationStateEnabled  = 1 // 已启用
+	HTTPLocationStateDisabled = 0 // 已禁用
+)
+
+type HTTPLocationDAO dbs.DAO
+
+func NewHTTPLocationDAO() *HTTPLocationDAO {
+	return dbs.NewDAO(&HTTPLocationDAO{
+		DAOObject: dbs.DAOObject{
+			DB:     Tea.Env,
+			Table:  "edgeHTTPLocations",
+			Model:  new(HTTPLocation),
+			PkName: "id",
+		},
+	}).(*HTTPLocationDAO)
+}
+
+var SharedHTTPLocationDAO = NewHTTPLocationDAO()
+
+// 启用条目
+func (this *HTTPLocationDAO) EnableHTTPLocation(id uint32) error {
+	_, err := this.Query().
+		Pk(id).
+		Set("state", HTTPLocationStateEnabled).
+		Update()
+	return err
+}
+
+// 禁用条目
+func (this *HTTPLocationDAO) DisableHTTPLocation(id uint32) error {
+	_, err := this.Query().
+		Pk(id).
+		Set("state", HTTPLocationStateDisabled).
+		Update()
+	return err
+}
+
+// 查找启用中的条目
+func (this *HTTPLocationDAO) FindEnabledHTTPLocation(id uint32) (*HTTPLocation, error) {
+	result, err := this.Query().
+		Pk(id).
+		Attr("state", HTTPLocationStateEnabled).
+		Find()
+	if result == nil {
+		return nil, err
+	}
+	return result.(*HTTPLocation), err
+}
+
+// 根据主键查找名称
+func (this *HTTPLocationDAO) FindHTTPLocationName(id uint32) (string, error) {
+	return this.Query().
+		Pk(id).
+		Result("name").
+		FindStringCol("")
+}

internal/db/models/http_location_dao_test.go

@@ -0,0 +1,5 @@
+package models
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+)

internal/db/models/http_location_model.go

@@ -0,0 +1,38 @@
+package models
+
+// 路径规则配置
+type HTTPLocation struct {
+	Id           uint32 `field:"id"`           // ID
+	TemplateId   uint32 `field:"templateId"`   // 模版ID
+	AdminId      uint32 `field:"adminId"`      // 管理员ID
+	UserId       uint32 `field:"userId"`       // 用户ID
+	ParentId     uint32 `field:"parentId"`     // 父级ID
+	State        uint8  `field:"state"`        // 状态
+	CreatedAt    uint64 `field:"createdAt"`    // 创建时间
+	Pattern      string `field:"pattern"`      // 匹配规则
+	IsOn         uint8  `field:"isOn"`         // 是否启用
+	Name         string `field:"name"`         // 名称
+	Description  string `field:"description"`  // 描述
+	WebId        uint32 `field:"webId"`        // Web配置ID
+	ReverseProxy string `field:"reverseProxy"` // 反向代理
+}
+
+type HTTPLocationOperator struct {
+	Id           interface{} // ID
+	TemplateId   interface{} // 模版ID
+	AdminId      interface{} // 管理员ID
+	UserId       interface{} // 用户ID
+	ParentId     interface{} // 父级ID
+	State        interface{} // 状态
+	CreatedAt    interface{} // 创建时间
+	Pattern      interface{} // 匹配规则
+	IsOn         interface{} // 是否启用
+	Name         interface{} // 名称
+	Description  interface{} // 描述
+	WebId        interface{} // Web配置ID
+	ReverseProxy interface{} // 反向代理
+}
+
+func NewHTTPLocationOperator() *HTTPLocationOperator {
+	return &HTTPLocationOperator{}
+}

internal/db/models/http_location_model_ext.go

@@ -0,0 +1 @@
+package models

internal/db/models/reverse_proxy_dao.go

@@ -71,6 +71,7 @@ func (this *ReverseProxyDAO) ComposeReverseProxyConfig(reverseProxyId int64) (*s
 	}
 
 	config := &serverconfigs.ReverseProxyConfig{}
+	config.Id = int64(reverseProxy.Id)
 	config.IsOn = reverseProxy.IsOn == 1
 
 	schedulingConfig := &serverconfigs.SchedulingConfig{}
@@ -121,6 +122,7 @@ func (this *ReverseProxyDAO) ComposeReverseProxyConfig(reverseProxyId int64) (*s
 // 创建反向代理
 func (this *ReverseProxyDAO) CreateReverseProxy(schedulingJSON []byte, primaryOriginsJSON []byte, backupOriginsJSON []byte) (int64, error) {
 	op := NewReverseProxyOperator()
+	op.IsOn = false
 	op.State = ReverseProxyStateEnabled
 	if len(schedulingJSON) > 0 {
 		op.Scheduling = string(schedulingJSON)

internal/db/models/server_dao.go

@@ -69,7 +69,7 @@ func (this *ServerDAO) FindEnabledServerType(serverId int64) (string, error) {
 }
 
 // 创建服务
-func (this *ServerDAO) CreateServer(adminId int64, userId int64, serverType serverconfigs.ServerType, name string, description string, serverNamesJSON string, httpJSON string, httpsJSON string, tcpJSON string, tlsJSON string, unixJSON string, udpJSON string, webId int64, reverseProxyId int64, clusterId int64, includeNodesJSON string, excludeNodesJSON string) (serverId int64, err error) {
+func (this *ServerDAO) CreateServer(adminId int64, userId int64, serverType serverconfigs.ServerType, name string, description string, serverNamesJSON string, httpJSON string, httpsJSON string, tcpJSON string, tlsJSON string, unixJSON string, udpJSON string, webId int64, reverseProxyJSON []byte, clusterId int64, includeNodesJSON string, excludeNodesJSON string) (serverId int64, err error) {
 	uniqueId, err := this.genUniqueId()
 	if err != nil {
 		return 0, err
@@ -83,29 +83,31 @@ func (this *ServerDAO) CreateServer(adminId int64, userId int64, serverType serv
 	op.Type = serverType
 	op.Description = description
 
-	if len(serverNamesJSON) > 0 {
+	if IsNotNull(serverNamesJSON) {
 		op.ServerNames = serverNamesJSON
 	}
-	if len(httpJSON) > 0 {
+	if IsNotNull(httpJSON) {
 		op.Http = httpJSON
 	}
-	if len(httpsJSON) > 0 {
+	if IsNotNull(httpsJSON) {
 		op.Https = httpsJSON
 	}
-	if len(tcpJSON) > 0 {
+	if IsNotNull(tcpJSON) {
 		op.Tcp = tcpJSON
 	}
-	if len(tlsJSON) > 0 {
+	if IsNotNull(tlsJSON) {
 		op.Tls = tlsJSON
 	}
-	if len(unixJSON) > 0 {
+	if IsNotNull(unixJSON) {
 		op.Unix = unixJSON
 	}
-	if len(udpJSON) > 0 {
+	if IsNotNull(udpJSON) {
 		op.Udp = udpJSON
 	}
 	op.WebId = webId
-	op.ReverseProxyId = reverseProxyId
+	if len(reverseProxyJSON) > 0 {
+		op.ReverseProxy = reverseProxyJSON
+	}
 
 	op.ClusterId = clusterId
 	if len(includeNodesJSON) > 0 {
@@ -324,14 +326,14 @@ func (this *ServerDAO) UpdateServerNames(serverId int64, config []byte) error {
 }
 
 // 修改反向代理配置
-func (this *ServerDAO) UpdateServerReverseProxy(serverId int64, reverseProxyId int64) error {
+func (this *ServerDAO) UpdateServerReverseProxy(serverId int64, config []byte) error {
 	if serverId <= 0 {
 		return errors.New("serverId should not be smaller than 0")
 	}
-	_, err := this.Query().
+	op := NewServerOperator()
-		Pk(serverId).
+	op.Id = serverId
-		Set("reverseProxyId", reverseProxyId).
+	op.ReverseProxy = JSONBytes(config)
-		Update()
+	_, err := this.Save(op)
 	if err != nil {
 		return err
 	}
@@ -482,8 +484,15 @@ func (this *ServerDAO) ComposeServerConfig(serverId int64) (*serverconfigs.Serve
 	}
 
 	// ReverseProxy
-	if server.ReverseProxyId > 0 {
+	if IsNotNull(server.ReverseProxy) {
-		reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(int64(server.ReverseProxyId))
+		reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+		err = json.Unmarshal([]byte(server.ReverseProxy), reverseProxyRef)
+		if err != nil {
+			return nil, err
+		}
+		config.ReverseProxyRef = reverseProxyRef
+
+		reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(reverseProxyRef.ReverseProxyId)
 		if err != nil {
 			return nil, err
 		}
@@ -509,7 +518,7 @@ func (this *ServerDAO) RenewServerConfig(serverId int64) error {
 }
 
 // 根据条件获取反向代理配置
-func (this *ServerDAO) FindReverseProxyConfig(serverId int64) (*serverconfigs.ReverseProxyConfig, error) {
+func (this *ServerDAO) FindReverseProxyRef(serverId int64) (*serverconfigs.ReverseProxyRef, error) {
 	reverseProxy, err := this.Query().
 		Pk(serverId).
 		Result("reverseProxy").
@@ -520,7 +529,7 @@ func (this *ServerDAO) FindReverseProxyConfig(serverId int64) (*serverconfigs.Re
 	if len(reverseProxy) == 0 || reverseProxy == "null" {
 		return nil, nil
 	}
-	config := &serverconfigs.ReverseProxyConfig{}
+	config := &serverconfigs.ReverseProxyRef{}
 	err = json.Unmarshal([]byte(reverseProxy), config)
 	return config, err
 }

internal/db/models/server_model.go

@@ -18,7 +18,7 @@ type Server struct {
 	Unix         string `field:"unix"`         // Unix配置
 	Udp          string `field:"udp"`          // UDP配置
 	WebId        uint32 `field:"webId"`        // WEB配置
-	ReverseProxyId uint32 `field:"reverseProxyId"` // 反向代理配置
+	ReverseProxy string `field:"reverseProxy"` // 反向代理配置
 	GroupIds     string `field:"groupIds"`     // 分组ID列表
 	Config       string `field:"config"`       // 服务配置，自动生成
 	ClusterId    uint32 `field:"clusterId"`    // 集群ID
@@ -47,7 +47,7 @@ type ServerOperator struct {
 	Unix         interface{} // Unix配置
 	Udp          interface{} // UDP配置
 	WebId        interface{} // WEB配置
-	ReverseProxyId interface{} // 反向代理配置
+	ReverseProxy interface{} // 反向代理配置
 	GroupIds     interface{} // 分组ID列表
 	Config       interface{} // 服务配置，自动生成
 	ClusterId    interface{} // 集群ID

internal/rpc/services/service_server.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 )
 
 type ServerService struct {
@@ -18,7 +19,7 @@ func (this *ServerService) CreateServer(ctx context.Context, req *pb.CreateServe
 	if err != nil {
 		return nil, err
 	}
-	serverId, err := models.SharedServerDAO.CreateServer(req.AdminId, req.UserId, req.Type, req.Name, req.Description, string(req.ServerNamesJON), string(req.HttpJSON), string(req.HttpsJSON), string(req.TcpJSON), string(req.TlsJSON), string(req.UnixJSON), string(req.UdpJSON), req.WebId, req.ReverseProxyId, req.ClusterId, string(req.IncludeNodesJSON), string(req.ExcludeNodesJSON))
+	serverId, err := models.SharedServerDAO.CreateServer(req.AdminId, req.UserId, req.Type, req.Name, req.Description, string(req.ServerNamesJON), string(req.HttpJSON), string(req.HttpsJSON), string(req.TcpJSON), string(req.TlsJSON), string(req.UnixJSON), string(req.UdpJSON), req.WebId, req.ReverseProxyJSON, req.ClusterId, string(req.IncludeNodesJSON), string(req.ExcludeNodesJSON))
 	if err != nil {
 		return nil, err
 	}
@@ -340,7 +341,7 @@ func (this *ServerService) UpdateServerReverseProxy(ctx context.Context, req *pb
 	}
 
 	// 修改配置
-	err = models.SharedServerDAO.UpdateServerReverseProxy(req.ServerId, req.ReverseProxyId)
+	err = models.SharedServerDAO.UpdateServerReverseProxy(req.ServerId, req.ReverseProxyJSON)
 	if err != nil {
 		return nil, err
 	}
@@ -511,7 +512,7 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
 		UnixJSON:         []byte(server.Unix),
 		UdpJSON:          []byte(server.Udp),
 		WebId:            int64(server.WebId),
-		ReverseProxyId: int64(server.ReverseProxyId),
+		ReverseProxyJSON: []byte(server.ReverseProxy),
 
 		IncludeNodes: []byte(server.IncludeNodes),
 		ExcludeNodes: []byte(server.ExcludeNodes),
@@ -539,26 +540,53 @@ func (this *ServerService) FindEnabledServerType(ctx context.Context, req *pb.Fi
 }
 
 // 查找反向代理设置
-func (this *ServerService) FindServerReverseProxyConfig(ctx context.Context, req *pb.FindServerReverseProxyConfigRequest) (*pb.FindServerReverseProxyConfigResponse, error) {
+func (this *ServerService) FindAndInitServerReverseProxyConfig(ctx context.Context, req *pb.FindAndInitServerReverseProxyConfigRequest) (*pb.FindAndInitServerReverseProxyConfigResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
 		return nil, err
 	}
 
-	reverseProxy, err := models.SharedServerDAO.FindReverseProxyConfig(req.ServerId)
+	reverseProxyRef, err := models.SharedServerDAO.FindReverseProxyRef(req.ServerId)
 	if err != nil {
 		return nil, err
 	}
 
-	if reverseProxy == nil {
+	if reverseProxyRef == nil {
-		return &pb.FindServerReverseProxyConfigResponse{Config: nil}, nil
+		reverseProxyId, err := models.SharedReverseProxyDAO.CreateReverseProxy(nil, nil, nil)
-	}
-
-	configData, err := json.Marshal(reverseProxy)
 		if err != nil {
 			return nil, err
 		}
-	return &pb.FindServerReverseProxyConfigResponse{Config: configData}, nil
+
+		reverseProxyRef = &serverconfigs.ReverseProxyRef{
+			IsOn:           false,
+			ReverseProxyId: reverseProxyId,
+		}
+		refJSON, err := json.Marshal(reverseProxyRef)
+		if err != nil {
+			return nil, err
+		}
+		err = models.SharedServerDAO.UpdateServerReverseProxy(req.ServerId, refJSON)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	reverseProxyConfig, err := models.SharedReverseProxyDAO.ComposeReverseProxyConfig(reverseProxyRef.ReverseProxyId)
+	if err != nil {
+		return nil, err
+	}
+
+	configJSON, err := json.Marshal(reverseProxyConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	refJSON, err := json.Marshal(reverseProxyRef)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.FindAndInitServerReverseProxyConfigResponse{ReverseProxy: configJSON, ReverseProxyRef: refJSON}, nil
 }
 
 // 初始化Web设置