阶段性提交

This commit is contained in:
GoEdgeLab
2020-09-15 14:44:52 +08:00
parent e3501a5a68
commit 4807a6672f
27 changed files with 1354 additions and 115 deletions

View File

@@ -26,6 +26,8 @@ type RPCClient struct {
serverClients []pb.ServerServiceClient serverClients []pb.ServerServiceClient
apiNodeClients []pb.APINodeServiceClient apiNodeClients []pb.APINodeServiceClient
originNodeClients []pb.OriginServerServiceClient originNodeClients []pb.OriginServerServiceClient
httpWebClients []pb.HTTPWebServiceClient
reverseProxyClients []pb.ReverseProxyServiceClient
} }
func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) { func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
@@ -41,6 +43,8 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
serverClients := []pb.ServerServiceClient{} serverClients := []pb.ServerServiceClient{}
apiNodeClients := []pb.APINodeServiceClient{} apiNodeClients := []pb.APINodeServiceClient{}
originNodeClients := []pb.OriginServerServiceClient{} originNodeClients := []pb.OriginServerServiceClient{}
httpWebClients := []pb.HTTPWebServiceClient{}
reverseProxyClients := []pb.ReverseProxyServiceClient{}
conns := []*grpc.ClientConn{} conns := []*grpc.ClientConn{}
for _, endpoint := range apiConfig.RPC.Endpoints { for _, endpoint := range apiConfig.RPC.Endpoints {
@@ -64,6 +68,8 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
serverClients = append(serverClients, pb.NewServerServiceClient(conn)) serverClients = append(serverClients, pb.NewServerServiceClient(conn))
apiNodeClients = append(apiNodeClients, pb.NewAPINodeServiceClient(conn)) apiNodeClients = append(apiNodeClients, pb.NewAPINodeServiceClient(conn))
originNodeClients = append(originNodeClients, pb.NewOriginServerServiceClient(conn)) originNodeClients = append(originNodeClients, pb.NewOriginServerServiceClient(conn))
httpWebClients = append(httpWebClients, pb.NewHTTPWebServiceClient(conn))
reverseProxyClients = append(reverseProxyClients, pb.NewReverseProxyServiceClient(conn))
} }
return &RPCClient{ return &RPCClient{
@@ -76,6 +82,8 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
serverClients: serverClients, serverClients: serverClients,
apiNodeClients: apiNodeClients, apiNodeClients: apiNodeClients,
originNodeClients: originNodeClients, originNodeClients: originNodeClients,
httpWebClients: httpWebClients,
reverseProxyClients: reverseProxyClients,
}, nil }, nil
} }
@@ -135,6 +143,20 @@ func (this *RPCClient) OriginServerRPC() pb.OriginServerServiceClient {
return nil return nil
} }
func (this *RPCClient) HTTPWebRPC() pb.HTTPWebServiceClient {
if len(this.httpWebClients) > 0 {
return this.httpWebClients[rands.Int(0, len(this.httpWebClients)-1)]
}
return nil
}
func (this *RPCClient) ReverseProxyRPC() pb.ReverseProxyServiceClient {
if len(this.reverseProxyClients) > 0 {
return this.reverseProxyClients[rands.Int(0, len(this.reverseProxyClients)-1)]
}
return nil
}
func (this *RPCClient) Context(adminId int64) context.Context { func (this *RPCClient) Context(adminId int64) context.Context {
ctx := context.Background() ctx := context.Background()
m := maps.Map{ m := maps.Map{

View File

@@ -1,8 +1,8 @@
package servers package servers
import ( import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/actions"
"regexp" "regexp"
@@ -61,7 +61,7 @@ func (this *AddOriginPopupAction) RunPost(params struct {
Id: resp.OriginId, Id: resp.OriginId,
IsOn: true, IsOn: true,
Addr: &serverconfigs.NetworkAddressConfig{ Addr: &serverconfigs.NetworkAddressConfig{
Protocol: params.Protocol, Protocol: serverconfigs.Protocol(params.Protocol),
Host: host, Host: host,
PortRange: port, PortRange: port,
}, },

View File

@@ -66,13 +66,16 @@ func (this *CreateAction) RunPost(params struct {
// TODO 验证集群ID // TODO 验证集群ID
// 配置
serverConfig := &serverconfigs.ServerConfig{}
serverConfig.IsOn = true
serverConfig.Name = params.Name
serverConfig.Description = params.Description
// 端口地址 // 端口地址
var httpConfig *serverconfigs.HTTPProtocolConfig = nil
var httpsConfig *serverconfigs.HTTPSProtocolConfig = nil
var tcpConfig *serverconfigs.TCPProtocolConfig = nil
var tlsConfig *serverconfigs.TLSProtocolConfig = nil
var unixConfig *serverconfigs.UnixProtocolConfig = nil
var udpConfig *serverconfigs.UDPProtocolConfig = nil
var webId int64 = 0
var reverseProxyId int64 = 0
switch params.ServerType { switch params.ServerType {
case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeHTTPWeb: case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeHTTPWeb:
listen := []*serverconfigs.NetworkAddressConfig{} listen := []*serverconfigs.NetworkAddressConfig{}
@@ -80,27 +83,30 @@ func (this *CreateAction) RunPost(params struct {
if err != nil { if err != nil {
this.Fail("端口地址解析失败:" + err.Error()) this.Fail("端口地址解析失败:" + err.Error())
} }
if len(listen) == 0 {
this.Fail("至少需要绑定一个端口")
}
for _, addr := range listen { for _, addr := range listen {
switch addr.Protocol { switch addr.Protocol.Primary() {
case serverconfigs.ProtocolHTTP, serverconfigs.ProtocolHTTP4, serverconfigs.ProtocolHTTP6: case serverconfigs.ProtocolHTTP:
if serverConfig.HTTP == nil { if httpConfig == nil {
serverConfig.HTTP = &serverconfigs.HTTPProtocolConfig{ httpConfig = &serverconfigs.HTTPProtocolConfig{
BaseProtocol: serverconfigs.BaseProtocol{ BaseProtocol: serverconfigs.BaseProtocol{
IsOn: true, IsOn: true,
}, },
} }
} }
serverConfig.HTTP.AddListen(addr) httpConfig.AddListen(addr)
case serverconfigs.ProtocolHTTPS, serverconfigs.ProtocolHTTPS4, serverconfigs.ProtocolHTTPS6: case serverconfigs.ProtocolHTTPS:
if serverConfig.HTTPS == nil { if httpsConfig == nil {
serverConfig.HTTPS = &serverconfigs.HTTPSProtocolConfig{ httpsConfig = &serverconfigs.HTTPSProtocolConfig{
BaseProtocol: serverconfigs.BaseProtocol{ BaseProtocol: serverconfigs.BaseProtocol{
IsOn: true, IsOn: true,
}, },
} }
} }
serverConfig.HTTPS.AddListen(addr) httpsConfig.AddListen(addr)
} }
} }
case serverconfigs.ServerTypeTCPProxy: case serverconfigs.ServerTypeTCPProxy:
@@ -109,27 +115,30 @@ func (this *CreateAction) RunPost(params struct {
if err != nil { if err != nil {
this.Fail("端口地址解析失败:" + err.Error()) this.Fail("端口地址解析失败:" + err.Error())
} }
if len(listen) == 0 {
this.Fail("至少需要绑定一个端口")
}
for _, addr := range listen { for _, addr := range listen {
switch addr.Protocol { switch addr.Protocol.Primary() {
case serverconfigs.ProtocolTCP, serverconfigs.ProtocolTCP4, serverconfigs.ProtocolTCP6: case serverconfigs.ProtocolTCP:
if serverConfig.TCP == nil { if tcpConfig == nil {
serverConfig.TCP = &serverconfigs.TCPProtocolConfig{ tcpConfig = &serverconfigs.TCPProtocolConfig{
BaseProtocol: serverconfigs.BaseProtocol{ BaseProtocol: serverconfigs.BaseProtocol{
IsOn: true, IsOn: true,
}, },
} }
} }
serverConfig.TCP.AddListen(addr) tcpConfig.AddListen(addr)
case serverconfigs.ProtocolTLS, serverconfigs.ProtocolTLS4, serverconfigs.ProtocolTLS6: case serverconfigs.ProtocolTLS:
if serverConfig.TLS == nil { if tlsConfig == nil {
serverConfig.TLS = &serverconfigs.TLSProtocolConfig{ tlsConfig = &serverconfigs.TLSProtocolConfig{
BaseProtocol: serverconfigs.BaseProtocol{ BaseProtocol: serverconfigs.BaseProtocol{
IsOn: true, IsOn: true,
}, },
} }
} }
serverConfig.TLS.AddListen(addr) tlsConfig.AddListen(addr)
} }
} }
default: default:
@@ -139,46 +148,44 @@ func (this *CreateAction) RunPost(params struct {
// TODO 证书 // TODO 证书
// 域名 // 域名
serverNames := []*serverconfigs.ServerNameConfig{} if len(params.ServerNames) > 0 {
err := json.Unmarshal([]byte(params.ServerNames), &serverNames) serverNames := []*serverconfigs.ServerNameConfig{}
if err != nil { err := json.Unmarshal([]byte(params.ServerNames), &serverNames)
this.Fail("域名解析失败:" + err.Error()) if err != nil {
this.Fail("域名解析失败:" + err.Error())
}
} }
serverConfig.ServerNames = serverNames
// 源站地址 // 源站地址
switch params.ServerType { switch params.ServerType {
case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeTCPProxy: case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeTCPProxy:
origins := []*serverconfigs.OriginServerConfig{} origins := []*serverconfigs.OriginServerConfig{}
err = json.Unmarshal([]byte(params.Origins), &origins) err := json.Unmarshal([]byte(params.Origins), &origins)
if err != nil { if err != nil {
this.Fail("源站地址解析失败:" + err.Error()) this.Fail("源站地址解析失败:" + err.Error())
} }
serverConfig.ReverseProxy = &serverconfigs.ReverseProxyConfig{
IsOn: true, resp, err := this.RPC().ReverseProxyRPC().CreateReverseProxy(this.AdminContext(), &pb.CreateReverseProxyRequest{
Origins: origins, SchedulingJSON: nil,
PrimaryOriginsJSON: []byte(params.Origins),
BackupOriginsJSON: nil,
})
if err != nil {
this.ErrorPage(err)
return
} }
reverseProxyId = resp.ReverseProxyId
} }
// Web地址 // Web地址
switch params.ServerType { switch params.ServerType {
case serverconfigs.ServerTypeHTTPWeb: case serverconfigs.ServerTypeHTTPWeb:
serverConfig.Web = &serverconfigs.WebConfig{ webResp, err := this.RPC().HTTPWebRPC().CreateHTTPWeb(this.AdminContext(), &pb.CreateHTTPWebRequest{Root: params.WebRoot})
IsOn: true, if err != nil {
Root: params.WebRoot, this.ErrorPage(err)
return
} }
} webId = webResp.WebId
// 校验
err = serverConfig.Init()
if err != nil {
this.Fail("配置校验失败:" + err.Error())
}
serverConfigJSON, err := serverConfig.AsJSON()
if err != nil {
this.ErrorPage(err)
return
} }
// 包含条件 // 包含条件
@@ -197,17 +204,68 @@ func (this *CreateAction) RunPost(params struct {
return return
} }
_, err = this.RPC().ServerRPC().CreateServer(this.AdminContext(), &pb.CreateServerRequest{ req := &pb.CreateServerRequest{
UserId: 0, UserId: 0,
AdminId: this.AdminId(), AdminId: this.AdminId(),
Type: params.ServerType, Type: params.ServerType,
Name: params.Name, Name: params.Name,
ServerNamesJON: []byte(params.ServerNames),
Description: params.Description, Description: params.Description,
ClusterId: params.ClusterId, ClusterId: params.ClusterId,
Config: serverConfigJSON,
IncludeNodesJSON: includeNodesJSON, IncludeNodesJSON: includeNodesJSON,
ExcludeNodesJSON: excludeNodesJSON, ExcludeNodesJSON: excludeNodesJSON,
}) WebId: webId,
ReverseProxyId: reverseProxyId,
}
if httpConfig != nil {
data, err := json.Marshal(httpConfig)
if err != nil {
this.ErrorPage(err)
return
}
req.HttpJSON = data
}
if httpsConfig != nil {
data, err := json.Marshal(httpsConfig)
if err != nil {
this.ErrorPage(err)
return
}
req.HttpsJSON = data
}
if tcpConfig != nil {
data, err := json.Marshal(tcpConfig)
if err != nil {
this.ErrorPage(err)
return
}
req.TcpJSON = data
}
if tlsConfig != nil {
data, err := json.Marshal(tlsConfig)
if err != nil {
this.ErrorPage(err)
return
}
req.TlsJSON = data
}
if unixConfig != nil {
data, err := json.Marshal(unixConfig)
if err != nil {
this.ErrorPage(err)
return
}
req.UnixJSON = data
}
if udpConfig != nil {
data, err := json.Marshal(udpConfig)
if err != nil {
this.ErrorPage(err)
return
}
req.UdpJSON = data
}
_, err = this.RPC().ServerRPC().CreateServer(this.AdminContext(), req)
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)
return return

View File

@@ -2,12 +2,10 @@ package servers
import ( import (
"encoding/json" "encoding/json"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/logs"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
"strings"
) )
type IndexAction struct { type IndexAction struct {
@@ -39,70 +37,57 @@ func (this *IndexAction) RunGet(params struct{}) {
} }
serverMaps := []maps.Map{} serverMaps := []maps.Map{}
for _, server := range serversResp.Servers { for _, server := range serversResp.Servers {
// 服务名 config := &serverconfigs.ServerConfig{}
serverConfig := &serverconfigs.ServerConfig{} err = json.Unmarshal(server.Config, config)
err = json.Unmarshal(server.Config, &serverConfig)
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)
return return
} }
err = serverConfig.Init()
if err != nil {
logs.Println("init server '" + serverConfig.Name + "' error: " + err.Error())
}
serverTypeNames := []string{}
// 端口列表 // 端口列表
portMaps := []maps.Map{} portMaps := []maps.Map{}
if serverConfig.HTTP != nil && serverConfig.HTTP.IsOn { if len(server.HttpJSON) > 0 && config.HTTP.IsOn {
serverTypeNames = append(serverTypeNames, "HTTP") for _, listen := range config.HTTP.Listen {
for _, listen := range serverConfig.HTTP.Listen {
portMaps = append(portMaps, maps.Map{ portMaps = append(portMaps, maps.Map{
"protocol": listen.Protocol, "protocol": listen.Protocol,
"portRange": listen.PortRange, "portRange": listen.PortRange,
}) })
} }
} }
if serverConfig.HTTPS != nil && serverConfig.HTTPS.IsOn { if config.HTTPS != nil && config.HTTPS.IsOn {
serverTypeNames = append(serverTypeNames, "HTTPS") for _, listen := range config.HTTPS.Listen {
for _, listen := range serverConfig.HTTPS.Listen {
portMaps = append(portMaps, maps.Map{ portMaps = append(portMaps, maps.Map{
"protocol": listen.Protocol, "protocol": listen.Protocol,
"portRange": listen.PortRange, "portRange": listen.PortRange,
}) })
} }
} }
if serverConfig.TCP != nil && serverConfig.TCP.IsOn { if config.TCP != nil && config.TCP.IsOn {
serverTypeNames = append(serverTypeNames, "TCP") for _, listen := range config.TCP.Listen {
for _, listen := range serverConfig.TCP.Listen {
portMaps = append(portMaps, maps.Map{ portMaps = append(portMaps, maps.Map{
"protocol": listen.Protocol, "protocol": listen.Protocol,
"portRange": listen.PortRange, "portRange": listen.PortRange,
}) })
} }
} }
if serverConfig.TLS != nil && serverConfig.TLS.IsOn { if config.TLS != nil && config.TLS.IsOn {
serverTypeNames = append(serverTypeNames, "TLS") for _, listen := range config.TLS.Listen {
for _, listen := range serverConfig.TLS.Listen {
portMaps = append(portMaps, maps.Map{ portMaps = append(portMaps, maps.Map{
"protocol": listen.Protocol, "protocol": listen.Protocol,
"portRange": listen.PortRange, "portRange": listen.PortRange,
}) })
} }
} }
if serverConfig.Unix != nil && serverConfig.Unix.IsOn { if config.Unix != nil && config.Unix.IsOn {
serverTypeNames = append(serverTypeNames, "Unix") for _, listen := range config.Unix.Listen {
for _, listen := range serverConfig.Unix.Listen {
portMaps = append(portMaps, maps.Map{ portMaps = append(portMaps, maps.Map{
"protocol": listen.Protocol, "protocol": listen.Protocol,
"portRange": listen.Host, "portRange": listen.Host,
}) })
} }
} }
if serverConfig.UDP != nil && serverConfig.UDP.IsOn { if config.UDP != nil && config.UDP.IsOn {
serverTypeNames = append(serverTypeNames, "UDP") for _, listen := range config.UDP.Listen {
for _, listen := range serverConfig.UDP.Listen {
portMaps = append(portMaps, maps.Map{ portMaps = append(portMaps, maps.Map{
"protocol": listen.Protocol, "protocol": listen.Protocol,
"portRange": listen.PortRange, "portRange": listen.PortRange,
@@ -118,7 +103,7 @@ func (this *IndexAction) RunGet(params struct{}) {
"name": server.Cluster.Name, "name": server.Cluster.Name,
}, },
"ports": portMaps, "ports": portMaps,
"serverTypeName": strings.Join(serverTypeNames, "+"), "serverTypeName": serverconfigs.FindServerType(server.Type).GetString("name"),
}) })
} }
this.Data["servers"] = serverMaps this.Data["servers"] = serverMaps

View File

@@ -0,0 +1,140 @@
package origins
import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/actions"
"regexp"
"strings"
)
// 添加源站
type AddPopupAction struct {
actionutils.ParentAction
}
func (this *AddPopupAction) RunGet(params struct {
ServerId int64
ReverseProxyId int64
OriginType string
}) {
this.Data["reverseProxyId"] = params.ReverseProxyId
this.Data["originType"] = params.OriginType
serverTypeResp, err := this.RPC().ServerRPC().FindEnabledServerType(this.AdminContext(), &pb.FindEnabledServerTypeRequest{ServerId: params.ServerId})
if err != nil {
this.ErrorPage(err)
return
}
serverType := serverTypeResp.Type
this.Data["serverType"] = serverType
this.Show()
}
func (this *AddPopupAction) RunPost(params struct {
OriginType string
ReverseProxyId int64
Protocol string
Addr string
Must *actions.Must
}) {
params.Must.
Field("addr", params.Addr).
Require("请输入源站地址")
addr := regexp.MustCompile(`\s+`).ReplaceAllString(params.Addr, "")
portIndex := strings.LastIndex(params.Addr, ":")
if portIndex < 0 {
this.Fail("地址中需要带有端口")
}
host := addr[:portIndex]
port := addr[portIndex+1:]
resp, err := this.RPC().OriginServerRPC().CreateOriginServer(this.AdminContext(), &pb.CreateOriginServerRequest{
Name: "",
Addr: &pb.NetworkAddress{
Protocol: params.Protocol,
Host: host,
PortRange: port,
},
Description: "",
})
if err != nil {
this.ErrorPage(err)
return
}
originId := resp.OriginId
originConfigResp, err := this.RPC().OriginServerRPC().FindEnabledOriginServerConfig(this.AdminContext(), &pb.FindEnabledOriginServerConfigRequest{OriginId: originId})
if err != nil {
this.ErrorPage(err)
return
}
originConfigData := originConfigResp.Config
var originConfig = &serverconfigs.OriginServerConfig{}
err = json.Unmarshal(originConfigData, originConfig)
if err != nil {
this.ErrorPage(err)
return
}
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxy(this.AdminContext(), &pb.FindEnabledReverseProxyRequest{ReverseProxyId: params.ReverseProxyId})
if err != nil {
this.ErrorPage(err)
return
}
reverseProxy := reverseProxyResp.ReverseProxy
if reverseProxy == nil {
this.ErrorPage(errors.New("reverse proxy should not be nil"))
return
}
origins := []*serverconfigs.OriginServerConfig{}
switch params.OriginType {
case "primary":
if len(reverseProxy.PrimaryOriginsJSON) > 0 {
err = json.Unmarshal(reverseProxy.PrimaryOriginsJSON, &origins)
if err != nil {
this.ErrorPage(err)
return
}
}
case "backup":
if len(reverseProxy.BackupOriginsJSON) > 0 {
err = json.Unmarshal(reverseProxy.BackupOriginsJSON, &origins)
if err != nil {
this.ErrorPage(err)
return
}
}
}
origins = append(origins, originConfig)
originsData, err := json.Marshal(origins)
if err != nil {
this.ErrorPage(err)
return
}
switch params.OriginType {
case "primary":
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyPrimaryOrigins(this.AdminContext(), &pb.UpdateReverseProxyPrimaryOriginsRequest{
ReverseProxyId: params.ReverseProxyId,
OriginsJSON: originsData,
})
case "backup":
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyBackupOrigins(this.AdminContext(), &pb.UpdateReverseProxyBackupOriginsRequest{
ReverseProxyId: params.ReverseProxyId,
OriginsJSON: originsData,
})
}
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -0,0 +1,85 @@
package origins
import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
)
type DeleteAction struct {
actionutils.ParentAction
}
func (this *DeleteAction) RunPost(params struct {
ReverseProxyId int64
OriginId int64
OriginType string
}) {
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxy(this.AdminContext(), &pb.FindEnabledReverseProxyRequest{ReverseProxyId: params.ReverseProxyId})
if err != nil {
this.ErrorPage(err)
return
}
reverseProxy := reverseProxyResp.ReverseProxy
if reverseProxy == nil {
this.ErrorPage(errors.New("reverse proxy is nil"))
return
}
origins := []*serverconfigs.OriginServerConfig{}
switch params.OriginType {
case "primary":
err = json.Unmarshal(reverseProxy.PrimaryOriginsJSON, &origins)
if err != nil {
this.ErrorPage(err)
return
}
case "backup":
err = json.Unmarshal(reverseProxy.BackupOriginsJSON, &origins)
if err != nil {
this.ErrorPage(err)
return
}
default:
this.ErrorPage(errors.New("invalid origin type '" + params.OriginType + "'"))
return
}
result := []*serverconfigs.OriginServerConfig{}
for _, origin := range origins {
if origin.Id == params.OriginId {
continue
}
result = append(result, origin)
}
resultData, err := json.Marshal(result)
if err != nil {
this.ErrorPage(err)
return
}
switch params.OriginType {
case "primary":
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyPrimaryOrigins(this.AdminContext(), &pb.UpdateReverseProxyPrimaryOriginsRequest{
ReverseProxyId: params.ReverseProxyId,
OriginsJSON: resultData,
})
if err != nil {
this.ErrorPage(err)
return
}
case "backup":
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyBackupOrigins(this.AdminContext(), &pb.UpdateReverseProxyBackupOriginsRequest{
ReverseProxyId: params.ReverseProxyId,
OriginsJSON: resultData,
})
if err != nil {
this.ErrorPage(err)
return
}
}
this.Success()
}

View File

@@ -0,0 +1,18 @@
package origins
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
"github.com/iwind/TeaGo"
)
func init() {
TeaGo.BeforeStart(func(server *TeaGo.Server) {
server.
Helper(helpers.NewUserMustAuth()).
Prefix("/servers/server/settings/origins").
GetPost("/addPopup", new(AddPopupAction)).
Post("/delete", new(DeleteAction)).
GetPost("/updatePopup", new(UpdatePopupAction)).
EndAll()
})
}

View File

@@ -0,0 +1,178 @@
package origins
import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/maps"
"regexp"
"strings"
)
// 修改源站
type UpdatePopupAction struct {
actionutils.ParentAction
}
func (this *UpdatePopupAction) Init() {
this.Nav("", "", "")
}
func (this *UpdatePopupAction) RunGet(params struct {
ServerId int64
ReverseProxyId int64
OriginType string
OriginId int64
}) {
this.Data["originType"] = params.OriginType
this.Data["reverseProxyId"] = params.ReverseProxyId
this.Data["originId"] = params.OriginId
serverTypeResp, err := this.RPC().ServerRPC().FindEnabledServerType(this.AdminContext(), &pb.FindEnabledServerTypeRequest{
ServerId: params.ServerId,
})
if err != nil {
this.ErrorPage(err)
return
}
this.Data["serverType"] = serverTypeResp.Type
// 源站信息
originResp, err := this.RPC().OriginServerRPC().FindEnabledOriginServerConfig(this.AdminContext(), &pb.FindEnabledOriginServerConfigRequest{OriginId: params.OriginId})
if err != nil {
this.ErrorPage(err)
return
}
configData := originResp.Config
config := &serverconfigs.OriginServerConfig{}
err = json.Unmarshal(configData, config)
if err != nil {
this.ErrorPage(err)
return
}
this.Data["origin"] = maps.Map{
"id": config.Id,
"protocol": config.Addr.Protocol,
"addr": config.Addr.Host + ":" + config.Addr.PortRange,
}
this.Show()
}
func (this *UpdatePopupAction) RunPost(params struct {
OriginType string
OriginId int64
ReverseProxyId int64
Protocol string
Addr string
Must *actions.Must
}) {
params.Must.
Field("addr", params.Addr).
Require("请输入源站地址")
addr := regexp.MustCompile(`\s+`).ReplaceAllString(params.Addr, "")
portIndex := strings.LastIndex(params.Addr, ":")
if portIndex < 0 {
this.Fail("地址中需要带有端口")
}
host := addr[:portIndex]
port := addr[portIndex+1:]
_, err := this.RPC().OriginServerRPC().UpdateOriginServer(this.AdminContext(), &pb.UpdateOriginServerRequest{
OriginId: params.OriginId,
Name: "",
Addr: &pb.NetworkAddress{
Protocol: params.Protocol,
Host: host,
PortRange: port,
},
Description: "",
})
if err != nil {
this.ErrorPage(err)
return
}
originConfigResp, err := this.RPC().OriginServerRPC().FindEnabledOriginServerConfig(this.AdminContext(), &pb.FindEnabledOriginServerConfigRequest{OriginId: params.OriginId})
if err != nil {
this.ErrorPage(err)
return
}
originConfigData := originConfigResp.Config
var originConfig = &serverconfigs.OriginServerConfig{}
err = json.Unmarshal(originConfigData, originConfig)
if err != nil {
this.ErrorPage(err)
return
}
// 查找反向代理信息
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxy(this.AdminContext(), &pb.FindEnabledReverseProxyRequest{ReverseProxyId: params.ReverseProxyId})
if err != nil {
this.ErrorPage(err)
return
}
reverseProxy := reverseProxyResp.ReverseProxy
if reverseProxy == nil {
this.ErrorPage(errors.New("reverse proxy should not be nil"))
return
}
origins := []*serverconfigs.OriginServerConfig{}
switch params.OriginType {
case "primary":
if len(reverseProxy.PrimaryOriginsJSON) > 0 {
err = json.Unmarshal(reverseProxy.PrimaryOriginsJSON, &origins)
if err != nil {
this.ErrorPage(err)
return
}
}
case "backup":
if len(reverseProxy.BackupOriginsJSON) > 0 {
err = json.Unmarshal(reverseProxy.BackupOriginsJSON, &origins)
if err != nil {
this.ErrorPage(err)
return
}
}
}
for index, origin := range origins {
if origin.Id == params.OriginId {
origins[index] = originConfig
}
}
// 保存
originsData, err := json.Marshal(origins)
if err != nil {
this.ErrorPage(err)
return
}
switch params.OriginType {
case "primary":
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyPrimaryOrigins(this.AdminContext(), &pb.UpdateReverseProxyPrimaryOriginsRequest{
ReverseProxyId: params.ReverseProxyId,
OriginsJSON: originsData,
})
case "backup":
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyBackupOrigins(this.AdminContext(), &pb.UpdateReverseProxyBackupOriginsRequest{
ReverseProxyId: params.ReverseProxyId,
OriginsJSON: originsData,
})
}
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -1,22 +1,89 @@
package reverseProxy package reverseProxy
import ( import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/maps"
) )
// 源站列表
type IndexAction struct { type IndexAction struct {
actionutils.ParentAction actionutils.ParentAction
} }
func (this *IndexAction) Init() { func (this *IndexAction) Init() {
this.Nav("", "setting", "index") this.FirstMenu("index")
this.SecondMenu("reverseProxy")
} }
func (this *IndexAction) RunGet(params struct { func (this *IndexAction) RunGet(params struct {
ServerId int64 ServerId int64
}) { }) {
// TODO server, _, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId)
if !isOk {
return
}
this.Data["serverType"] = server.Type
this.Data["reverseProxyId"] = server.ReverseProxyId
if server.ReverseProxyId <= 0 {
// TODO 应该在界面上提示用户开启
this.ErrorPage(errors.New("reverse proxy should not be nil"))
return
}
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxy(this.AdminContext(), &pb.FindEnabledReverseProxyRequest{ReverseProxyId: server.ReverseProxyId})
if err != nil {
this.ErrorPage(err)
return
}
reverseProxy := reverseProxyResp.ReverseProxy
if reverseProxy == nil {
// TODO 应该在界面上提示用户开启
this.ErrorPage(errors.New("reverse proxy should not be nil"))
return
}
primaryOrigins := []*serverconfigs.OriginServerConfig{}
backupOrigins := []*serverconfigs.OriginServerConfig{}
if len(reverseProxy.PrimaryOriginsJSON) > 0 {
err = json.Unmarshal(reverseProxy.PrimaryOriginsJSON, &primaryOrigins)
if err != nil {
this.ErrorPage(err)
return
}
}
if len(reverseProxy.BackupOriginsJSON) > 0 {
err = json.Unmarshal(reverseProxy.BackupOriginsJSON, &backupOrigins)
if err != nil {
this.ErrorPage(err)
return
}
}
primaryOriginMaps := []maps.Map{}
backupOriginMaps := []maps.Map{}
for _, originConfig := range primaryOrigins {
m := maps.Map{
"id": originConfig.Id,
"weight": originConfig.Weight,
"addr": originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
}
primaryOriginMaps = append(primaryOriginMaps, m)
}
for _, originConfig := range backupOrigins {
m := maps.Map{
"id": originConfig.Id,
"weight": originConfig.Weight,
"addr": originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
}
backupOriginMaps = append(backupOriginMaps, m)
}
this.Data["primaryOrigins"] = primaryOriginMaps
this.Data["backupOrigins"] = backupOriginMaps
this.Show() this.Show()
} }

View File

@@ -11,8 +11,12 @@ func init() {
server. server.
Helper(helpers.NewUserMustAuth()). Helper(helpers.NewUserMustAuth()).
Helper(serverutils.NewServerHelper()). Helper(serverutils.NewServerHelper()).
Data("mainTab", "setting").
Data("secondMenuItem", "reverseProxy").
Prefix("/servers/server/settings/reverseProxy"). Prefix("/servers/server/settings/reverseProxy").
Get("", new(IndexAction)). Get("", new(IndexAction)).
GetPost("/scheduling", new(SchedulingAction)).
GetPost("/updateSchedulingPopup", new(UpdateSchedulingPopupAction)).
EndAll() EndAll()
}) })
} }

View File

@@ -0,0 +1,59 @@
package reverseProxy
import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/schedulingconfigs"
)
type SchedulingAction struct {
actionutils.ParentAction
}
func (this *SchedulingAction) Init() {
this.FirstMenu("scheduling")
}
func (this *SchedulingAction) RunGet(params struct {
ServerId int64
}) {
server, _, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId)
if !isOk {
return
}
if server.ReverseProxyId <= 0 {
// TODO 在界面上提示用户未开通,并提供开通按钮,用户点击后开通
this.WriteString("此服务尚未开通反向代理功能")
return
}
this.Data["reverseProxyId"] = server.ReverseProxyId
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxyConfig(this.AdminContext(), &pb.FindEnabledReverseProxyConfigRequest{
ReverseProxyId: server.ReverseProxyId,
})
if err != nil {
this.ErrorPage(err)
return
}
reverseProxy := &serverconfigs.ReverseProxyConfig{}
err = json.Unmarshal(reverseProxyResp.Config, reverseProxy)
if err != nil {
this.ErrorPage(err)
return
}
schedulingCode := reverseProxy.FindSchedulingConfig().Code
schedulingMap := schedulingconfigs.FindSchedulingType(schedulingCode)
if schedulingMap == nil {
this.ErrorPage(errors.New("invalid scheduling code '" + schedulingCode + "'"))
return
}
this.Data["scheduling"] = schedulingMap
this.Show()
}

View File

@@ -0,0 +1,155 @@
package reverseProxy
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/schedulingconfigs"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps"
"github.com/iwind/TeaGo/types"
)
// 修改调度算法
type UpdateSchedulingPopupAction struct {
actionutils.ParentAction
}
func (this *UpdateSchedulingPopupAction) Init() {
}
func (this *UpdateSchedulingPopupAction) RunGet(params struct {
Type string
ServerId int64
ReverseProxyId int64
}) {
this.Data["dataType"] = params.Type
this.Data["serverId"] = params.ServerId
this.Data["reverseProxyId"] = params.ReverseProxyId
_, serverConfig, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId)
if !isOk {
return
}
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxyConfig(this.AdminContext(), &pb.FindEnabledReverseProxyConfigRequest{
ReverseProxyId: params.ReverseProxyId,
})
if err != nil {
this.ErrorPage(err)
return
}
configData := reverseProxyResp.Config
reverseProxyConfig := &serverconfigs.ReverseProxyConfig{}
err = json.Unmarshal(configData, reverseProxyConfig)
if err != nil {
this.ErrorPage(err)
return
}
schedulingObject := &serverconfigs.SchedulingConfig{
Code: "random",
Options: nil,
}
if reverseProxyConfig.Scheduling != nil {
schedulingObject = reverseProxyConfig.Scheduling
}
this.Data["scheduling"] = schedulingObject
// 调度类型
schedulingTypes := []maps.Map{}
for _, m := range schedulingconfigs.AllSchedulingTypes() {
networks, ok := m["networks"]
if !ok {
continue
}
if !types.IsSlice(networks) {
continue
}
if (serverConfig.IsHTTP() && lists.Contains(networks, "http")) ||
(serverConfig.IsTCP() && lists.Contains(networks, "tcp")) ||
(serverConfig.IsUDP() && lists.Contains(networks, "udp")) ||
(serverConfig.IsUnix() && lists.Contains(networks, "unix")) {
schedulingTypes = append(schedulingTypes, m)
}
}
this.Data["schedulingTypes"] = schedulingTypes
this.Show()
}
func (this *UpdateSchedulingPopupAction) RunPost(params struct {
ServerId int64
ReverseProxyId int64
Type string
HashKey string
StickyType string
StickyParam string
Must *actions.Must
}) {
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxyConfig(this.AdminContext(), &pb.FindEnabledReverseProxyConfigRequest{ReverseProxyId: params.ReverseProxyId})
if err != nil {
this.ErrorPage(err)
return
}
configData := reverseProxyResp.Config
reverseProxy := &serverconfigs.ReverseProxyConfig{}
err = json.Unmarshal(configData, reverseProxy)
if err != nil {
this.ErrorPage(err)
return
}
if reverseProxy.Scheduling == nil {
reverseProxy.FindSchedulingConfig()
}
options := maps.Map{}
if params.Type == "hash" {
params.Must.
Field("hashKey", params.HashKey).
Require("请输入Key")
options["key"] = params.HashKey
} else if params.Type == "sticky" {
params.Must.
Field("stickyType", params.StickyType).
Require("请选择参数类型").
Field("stickyParam", params.StickyParam).
Require("请输入参数名").
Match("^[a-zA-Z0-9]+$", "参数名只能是英文字母和数字的组合").
MaxCharacters(50, "参数名长度不能超过50位")
options["type"] = params.StickyType
options["param"] = params.StickyParam
}
if schedulingconfigs.FindSchedulingType(params.Type) == nil {
this.Fail("不支持此种算法")
}
reverseProxy.Scheduling.Code = params.Type
reverseProxy.Scheduling.Options = options
schedulingData, err := json.Marshal(reverseProxy.Scheduling)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxyScheduling(this.AdminContext(), &pb.UpdateReverseProxySchedulingRequest{
ReverseProxyId: params.ReverseProxyId,
SchedulingJSON: schedulingData,
})
if err != nil {
this.ErrorPage(err)
}
this.Success()
}

View File

@@ -49,40 +49,201 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must Must *actions.Must
}) { }) {
_, config, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId) serverId := params.ServerId
server, _, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId)
if !isOk { if !isOk {
return return
} }
listen := []*serverconfigs.NetworkAddressConfig{} addresses := []*serverconfigs.NetworkAddressConfig{}
err := json.Unmarshal([]byte(params.Addresses), &listen) err := json.Unmarshal([]byte(params.Addresses), &addresses)
if err != nil { if err != nil {
this.Fail("端口地址解析失败:" + err.Error()) this.Fail("端口地址解析失败:" + err.Error())
} }
if config.IsHTTP() { switch server.Type {
config.HTTP.Listen = listen case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeHTTPWeb:
} else if config.IsTCP() { var httpConfig = &serverconfigs.HTTPProtocolConfig{}
config.TCP.Listen = listen if len(server.HttpJSON) > 0 {
} else if config.IsUnix() { err = json.Unmarshal(server.HttpJSON, httpConfig)
config.Unix.Listen = listen if err != nil {
} else if config.IsUDP() { this.ErrorPage(err)
config.UDP.Listen = listen return
} }
httpConfig.Listen = []*serverconfigs.NetworkAddressConfig{}
} else {
httpConfig.IsOn = true
}
configData, err := config.AsJSON() var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
if err != nil { if len(server.HttpsJSON) > 0 {
this.ErrorPage(err) err = json.Unmarshal(server.HttpsJSON, httpsConfig)
return if err != nil {
} this.ErrorPage(err)
return
}
httpsConfig.Listen = []*serverconfigs.NetworkAddressConfig{}
} else {
httpsConfig.IsOn = true
}
_, err = this.RPC().ServerRPC().UpdateServerConfig(this.AdminContext(), &pb.UpdateServerConfigRequest{ for _, addr := range addresses {
ServerId: params.ServerId, switch addr.Protocol.Primary() {
Config: configData, case serverconfigs.ProtocolHTTP:
}) httpConfig.AddListen(addr)
if err != nil { case serverconfigs.ProtocolHTTPS:
this.ErrorPage(err) httpsConfig.AddListen(addr)
return }
}
httpData, err := json.Marshal(httpConfig)
if err != nil {
this.ErrorPage(err)
return
}
httpsData, err := json.Marshal(httpsConfig)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ServerRPC().UpdateServerHTTP(this.AdminContext(), &pb.UpdateServerHTTPRequest{
ServerId: serverId,
Config: httpData,
})
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ServerRPC().UpdateServerHTTPS(this.AdminContext(), &pb.UpdateServerHTTPSRequest{
ServerId: serverId,
Config: httpsData,
})
if err != nil {
this.ErrorPage(err)
return
}
case serverconfigs.ServerTypeTCPProxy:
tcpProxy := &serverconfigs.TCPProtocolConfig{}
if len(server.TcpJSON) > 0 {
err = json.Unmarshal(server.TcpJSON, tcpProxy)
if err != nil {
this.ErrorPage(err)
return
}
tcpProxy.Listen = []*serverconfigs.NetworkAddressConfig{}
} else {
tcpProxy.IsOn = true
}
tlsProxy := &serverconfigs.TLSProtocolConfig{}
if len(server.TlsJSON) > 0 {
err = json.Unmarshal(server.TlsJSON, tlsProxy)
if err != nil {
this.ErrorPage(err)
return
}
tlsProxy.Listen = []*serverconfigs.NetworkAddressConfig{}
} else {
tlsProxy.IsOn = true
}
for _, addr := range addresses {
switch addr.Protocol.Primary() {
case serverconfigs.ProtocolTCP:
tcpProxy.AddListen(addr)
case serverconfigs.ProtocolTLS:
tlsProxy.AddListen(addr)
}
}
tcpData, err := json.Marshal(tcpProxy)
if err != nil {
this.ErrorPage(err)
return
}
tlsData, err := json.Marshal(tlsProxy)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ServerRPC().UpdateServerTCP(this.AdminContext(), &pb.UpdateServerTCPRequest{
ServerId: serverId,
Config: tcpData,
})
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ServerRPC().UpdateServerTLS(this.AdminContext(), &pb.UpdateServerTLSRequest{
ServerId: serverId,
Config: tlsData,
})
if err != nil {
this.ErrorPage(err)
return
}
case serverconfigs.ServerTypeUnixProxy:
unixConfig := &serverconfigs.UnixProtocolConfig{}
if len(server.UnixJSON) > 0 {
err = json.Unmarshal(server.UnixJSON, unixConfig)
if err != nil {
this.ErrorPage(err)
return
}
unixConfig.Listen = []*serverconfigs.NetworkAddressConfig{}
}
for _, addr := range addresses {
switch addr.Protocol.Primary() {
case serverconfigs.ProtocolUnix:
unixConfig.AddListen(addr)
}
}
unixData, err := json.Marshal(unixConfig)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ServerRPC().UpdateServerUnix(this.AdminContext(), &pb.UpdateServerUnixRequest{
ServerId: serverId,
Config: unixData,
})
if err != nil {
this.ErrorPage(err)
return
}
case serverconfigs.ServerTypeUDPProxy:
udpConfig := &serverconfigs.UDPProtocolConfig{}
if len(server.UdpJSON) > 0 {
err = json.Unmarshal(server.UdpJSON, udpConfig)
if err != nil {
this.ErrorPage(err)
return
}
udpConfig.Listen = []*serverconfigs.NetworkAddressConfig{}
}
for _, addr := range addresses {
switch addr.Protocol.Primary() {
case serverconfigs.ProtocolUDP:
udpConfig.AddListen(addr)
}
}
udpData, err := json.Marshal(udpConfig)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().ServerRPC().UpdateServerUDP(this.AdminContext(), &pb.UpdateServerUDPRequest{
ServerId: serverId,
Config: udpData,
})
if err != nil {
this.ErrorPage(err)
return
}
} }
this.Success() this.Success()

View File

@@ -35,6 +35,7 @@ import (
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/http" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/http"
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/https" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/https"
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations"
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/origins"
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/pages" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/pages"
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/reverseProxy" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/reverseProxy"
_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/stat" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/stat"

View File

@@ -0,0 +1,84 @@
Vue.component("origin-list-box", {
props: ["v-primary-origins", "v-backup-origins", "v-server-type", "v-params"],
data: function () {
return {
primaryOrigins: this.vPrimaryOrigins,
backupOrigins: this.vBackupOrigins
}
},
methods: {
createPrimaryOrigin: function () {
teaweb.popup("/servers/server/settings/origins/addPopup?originType=primary&" + this.vParams, {
callback: function (resp) {
window.location.reload()
}
})
},
createBackupOrigin: function () {
teaweb.popup("/servers/server/settings/origins/addPopup?originType=backup&" + this.vParams, {
callback: function (resp) {
window.location.reload()
}
})
},
updateOrigin: function (originId, originType) {
teaweb.popup("/servers/server/settings/origins/updatePopup?originType=" + originType + "&" + this.vParams + "&originId=" + originId, {
callback: function (resp) {
window.location.reload()
}
})
},
deleteOrigin: function (originId, originType) {
let that = this
teaweb.confirm("确定要删除此源站吗?", function () {
Tea.action("/servers/server/settings/origins/delete?" + that.vParams + "&originId=" + originId + "&originType=" + originType)
.post()
.success(function () {
window.location.reload()
})
})
}
},
template: `<div>
<h3>主要源站 <a href="" @click.prevent="createPrimaryOrigin()">[添加主要源站]</a> </h3>
<p class="comment" v-if="primaryOrigins.length == 0">暂时还没有优先源站。</p>
<origin-list-table v-if="primaryOrigins.length > 0" :v-origins="vPrimaryOrigins" :v-origin-type="'primary'" @deleteOrigin="deleteOrigin" @updateOrigin="updateOrigin"></origin-list-table>
<h3>备用源站 <a href="" @click.prevent="createBackupOrigin()">[添加备用源站]</a></h3>
<p class="comment" v-if="backupOrigins.length == 0" :v-origins="primaryOrigins">暂时还没有备用源站。</p>
<origin-list-table v-if="backupOrigins.length > 0" :v-origins="backupOrigins" :v-origin-type="'backup'" @deleteOrigin="deleteOrigin" @updateOrigin="updateOrigin"></origin-list-table>
</div>`
})
Vue.component("origin-list-table", {
props: ["v-origins", "v-origin-type"],
data: function () {
return {}
},
methods: {
deleteOrigin: function (originId) {
this.$emit("deleteOrigin", originId, this.vOriginType)
},
updateOrigin: function (originId) {
this.$emit("updateOrigin", originId, this.vOriginType)
}
},
template: `
<table class="ui table selectable">
<thead>
<tr>
<th>源站地址</th>
<th>权重</th>
<th class="two op">操作</th>
</tr>
</thead>
<tr v-for="origin in vOrigins">
<td>{{origin.addr}}</td>
<td>{{origin.weight}}</td>
<td>
<a href="" @click.prevent="updateOrigin(origin.id)">修改</a> &nbsp;
<a href="" @click.prevent="deleteOrigin(origin.id)">删除</a>
</td>
</tr>
</table>`
})

View File

@@ -0,0 +1,34 @@
Vue.component("origin-scheduling-view-box", {
props: ["v-scheduling", "v-params"],
data: function () {
let scheduling = this.vScheduling
if (scheduling == null) {
scheduling = {}
}
return {
scheduling: scheduling
}
},
methods: {
update: function () {
teaweb.popup("/servers/server/settings/reverseProxy/updateSchedulingPopup?" + this.vParams, {
height: "21em",
callback: function () {
window.location.reload()
},
})
}
},
template: `<div>
<div class="margin"></div>
<table class="ui table selectable definition">
<tr>
<td class="title">当前正在使用的算法</td>
<td>
{{scheduling.name}} &nbsp; <a href="" @click.prevent="update()"><span>[修改]</span></a>
<p class="comment">{{scheduling.description}}</p>
</td>
</tr>
</table>
</div>`
})

View File

@@ -8,7 +8,7 @@
<td>源站协议</td> <td>源站协议</td>
<td> <td>
<!-- HTTP --> <!-- HTTP -->
<select class="ui dropdown auto-width" name="protocol" v-if="serverType == 'httpProxy'"> <select class="ui dropdown auto-width" name="protocol" v-if="serverType == 'httpProxy' || serverType == 'httpWeb'">
<option value="http">HTTP</option> <option value="http">HTTP</option>
<option value="https">HTTPS</option> <option value="https">HTTPS</option>
</select> </select>

View File

@@ -51,7 +51,7 @@
</tbody> </tbody>
<!-- 域名 --> <!-- 域名 -->
<tr> <tr v-if="serverType == 'httpProxy' || serverType == 'httpWeb'">
<td>绑定域名</td> <td>绑定域名</td>
<td> <td>
<input type="hidden" name="serverNames" :value="JSON.stringify(serverNames)"/> <input type="hidden" name="serverNames" :value="JSON.stringify(serverNames)"/>

View File

@@ -0,0 +1,34 @@
{$layout "layout_popup"}
<h3>添加源站地址</h3>
<form class="ui form" data-tea-action="$" data-tea-success="success">
<input type="hidden" name="reverseProxyId" :value="reverseProxyId"/>
<input type="hidden" name="originType" :value="originType"/>
<table class="ui table selectable definition">
<tr>
<td>源站协议</td>
<td>
<!-- HTTP -->
<select class="ui dropdown auto-width" name="protocol" v-if="serverType == 'httpProxy' || serverType == 'httpWeb'">
<option value="http">HTTP</option>
<option value="https">HTTPS</option>
</select>
<!-- TCP -->
<select class="ui dropdown auto-width" name="protocol" v-if="serverType == 'tcpProxy'">
<option value="tcp">TCP</option>
<option value="tls">TLS</option>
</select>
</td>
</tr>
<tr>
<td class="title">源站地址</td>
<td>
<input type="text" name="addr" ref="focus"/>
<p class="comment">源站服务器地址通常是一个IP或域名加端口<span v-if="serverType == 'httpProxy'">,不需要加 http:// 或 https://</span></p>
</td>
</tr>
</table>
<submit-btn></submit-btn>
</form>

View File

@@ -0,0 +1,3 @@
Tea.context(function () {
this.success = NotifyPopup;
});

View File

@@ -0,0 +1,36 @@
{$layout "layout_popup"}
<h3>添加源站地址</h3>
<form class="ui form" data-tea-action="$" data-tea-success="success">
<input type="hidden" name="reverseProxyId" :value="reverseProxyId"/>
<input type="hidden" name="originType" :value="originType"/>
<input type="hidden" name="originId" :value="originId"/>
<table class="ui table selectable definition">
<tr>
<td>源站协议</td>
<td>
<!-- HTTP -->
<select class="ui dropdown auto-width" name="protocol" v-model="origin.protocol" v-if="serverType == 'httpProxy' || serverType == 'httpWeb'">
<option value="http">HTTP</option>
<option value="https">HTTPS</option>
</select>
<!-- TCP -->
<select class="ui dropdown auto-width" name="protocol" v-model="origin.protocol" v-if="serverType == 'tcpProxy'">
<option value="tcp">TCP</option>
<option value="tls">TLS</option>
</select>
</td>
</tr>
<tr>
<td class="title">源站地址</td>
<td>
<input type="text" name="addr" ref="focus" v-model="origin.addr"/>
<p class="comment">源站服务器地址通常是一个IP或域名加端口<span v-if="serverType == 'httpProxy'">,不需要加 http:// 或 https://</span></p>
</td>
</tr>
</table>
<submit-btn></submit-btn>
</form>

View File

@@ -0,0 +1,3 @@
Tea.context(function () {
this.success = NotifyPopup;
});

View File

@@ -0,0 +1,4 @@
<first-menu>
<menu-item :href="'/servers/server/settings/reverseProxy?serverId=' + serverId" code="index">源站列表</menu-item>
<menu-item :href="'/servers/server/settings/reverseProxy/scheduling?serverId=' + serverId" code="scheduling">调度算法</menu-item>
</first-menu>

View File

@@ -1,7 +1,8 @@
{$layout} {$layout}
{$template "/left_menu"} {$template "/left_menu"}
<div class="right-box"> <div class="right-box">
<p class="ui message">此功能暂未开放,敬请期待。</p> {$template "menu"}
<origin-list-box :v-primary-origins="primaryOrigins" :v-backup-origins="backupOrigins" :v-server-type="serverType" :v-params="'type=server&serverId=' + serverId + '&reverseProxyId=' + reverseProxyId"></origin-list-box>
</div> </div>

View File

@@ -0,0 +1,8 @@
{$layout}
{$template "/left_menu"}
<div class="right-box">
{$template "menu"}
<origin-scheduling-view-box :v-scheduling="scheduling" :v-params="'type=server&serverId=' + serverId + '&reverseProxyId=' + reverseProxyId"></origin-scheduling-view-box>
</div>

View File

@@ -0,0 +1,60 @@
{$layout "layout_popup"}
<h3>修改调度算法</h3>
<form class="ui form" data-tea-action="$" data-tea-success="success">
<input type="hidden" name="dataType" :value="dataType"/>
<input type="hidden" name="serverId" :value="serverId"/>
<input type="hidden" name="reverseProxyId" :value="reverseProxyId"/>
<table class="ui table selectable definition">
<tr>
<td class="title">选择调度算法</td>
<td>
<select class="ui dropdown auto-width" name="type" v-model="selectedType"
@change="changeSchedulingType()">
<option v-for="schedulingType in schedulingTypes"
:value="schedulingType.code">{{schedulingType.name}}</option>
</select>
<p class="comment">{{schedulingTypeDescription}}</p>
</td>
</tr>
<tr v-if="selectedType == 'hash'">
<td>
Key
</td>
<td>
<input type="text" name="hashKey" v-model="hashKey" maxlength="500"/>
<p class="comment">用来计算Hash的字符串其中可以使用变量。</p>
</td>
</tr>
<tr v-if="selectedType == 'hash'">
<td>常用变量</td>
<td>
<select class="ui dropdown" style="width:12em" v-model="hashVar" @change="changeHashVar()">
<option></option>
<option value="${remoteAddr}">客户端IP</option>
<option value="${host}${requestURI}">请求URL</option>
</select>
</td>
</tr>
<tr v-if="selectedType == 'sticky'">
<td>参数类型</td>
<td>
<select class="ui dropdown" style="width:12em" name="stickyType" v-model="stickyType">
<option value="cookie">Cookie</option>
<option value="header">HTTP Header</option>
<option value="argument">URL参数</option>
</select>
</td>
</tr>
<tr v-if="selectedType == 'sticky'">
<td>参数名</td>
<td>
<input type="text" name="stickyParam" v-model="stickyParam" maxlength="50"/>
<p class="comment">记录或指定后端服务器的参数名只能是英文字母和数字的组合不允许有下划线因为在HTTP Header中下划线是不标准的</p>
</td>
</tr>
</table>
<submit-btn></submit-btn>
</form>

View File

@@ -0,0 +1,39 @@
Tea.context(function () {
var that = this;
this.success = NotifyPopup
this.selectedType = this.scheduling.code;
this.schedulingTypeDescription = null;
this.changeSchedulingType = function () {
this.schedulingTypeDescription = this.schedulingTypes.$find(function (k, v) {
return v.code == that.selectedType;
}).description;
};
this.changeSchedulingType();
// hash
this.hashKey = "";
this.hashVar = "";
if (this.scheduling.code == "hash") {
this.hashKey = this.scheduling.options.key;
} else {
this.hashKey = "${remoteAddr}";
}
this.changeHashVar = function () {
if (this.hashVar.length > 0) {
this.hashKey = this.hashVar;
}
};
// sticky
if (this.scheduling.code == "sticky") {
this.stickyType = this.scheduling.options.type;
this.stickyParam = this.scheduling.options.param;
} else {
this.stickyType = "cookie";
this.stickyParam = "Origin";
}
});