初步实现对象存储源站

internal/web/actions/default/servers/addOriginPopup.go

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
 	"net/url"
 	"regexp"
@@ -27,6 +28,8 @@ func (this *AddOriginPopupAction) RunGet(params struct {
 }) {
 	this.Data["serverType"] = params.ServerType
 
+	this.getOSSHook()
+
 	this.Show()
 }
 
@@ -40,50 +43,93 @@ func (this *AddOriginPopupAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
-	params.Must.
-		Field("addr", params.Addr).
-		Require("请输入源站地址")
-
-	var addr = params.Addr
-
-	// 是否是完整的地址
-	if (params.Protocol == "http" || params.Protocol == "https") && regexp.MustCompile(`^(http|https)://`).MatchString(addr) {
-		u, err := url.Parse(addr)
-		if err == nil {
-			addr = u.Host
-		}
+	ossConfig, goNext, err := this.postOSSHook(params.Protocol)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if !goNext {
+		return
 	}
 
-	addr = regexp.MustCompile(`\s+`).ReplaceAllString(addr, "")
-	var portIndex = strings.LastIndex(addr, ":")
-	if portIndex < 0 {
-		if params.Protocol == "http" {
-			addr += ":80"
-		} else if params.Protocol == "https" {
-			addr += ":443"
-		} else {
-			this.Fail("地址中需要带有端口")
-		}
-		portIndex = strings.LastIndex(addr, ":")
+	// 初始化
+	var pbAddr = &pb.NetworkAddress{
+		Protocol: params.Protocol,
 	}
-	var host = addr[:portIndex]
-	var port = addr[portIndex+1:]
+	var addrConfig = &serverconfigs.NetworkAddressConfig{
+		Protocol: serverconfigs.Protocol(params.Protocol),
+	}
+	var ossJSON []byte
 
-	// 检查端口号
-	if port == "0" {
-		this.Fail("端口号不能为0")
-	}
-	if !configutils.HasVariables(port) {
-		// 必须是整数
-		if !regexp.MustCompile(`^\d+$`).MatchString(port) {
-			this.Fail("端口号只能为整数")
+	if ossConfig != nil { // OSS
+		ossJSON, err = json.Marshal(ossConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
 		}
-		var portInt = types.Int(port)
-		if portInt == 0 {
+		err = ossConfig.Init()
+		if err != nil {
+			this.Fail("校验OSS配置时出错：" + err.Error())
+			return
+		}
+	} else { // 普通源站
+		params.Must.
+			Field("addr", params.Addr).
+			Require("请输入源站地址")
+
+		var addr = params.Addr
+
+		// 是否是完整的地址
+		if (params.Protocol == "http" || params.Protocol == "https") && regexp.MustCompile(`^(http|https)://`).MatchString(addr) {
+			u, err := url.Parse(addr)
+			if err == nil {
+				addr = u.Host
+			}
+		}
+
+		addr = regexp.MustCompile(`\s+`).ReplaceAllString(addr, "")
+		var portIndex = strings.LastIndex(addr, ":")
+		if portIndex < 0 {
+			if params.Protocol == "http" {
+				addr += ":80"
+			} else if params.Protocol == "https" {
+				addr += ":443"
+			} else {
+				this.Fail("地址中需要带有端口")
+			}
+			portIndex = strings.LastIndex(addr, ":")
+		}
+		var host = addr[:portIndex]
+		var port = addr[portIndex+1:]
+
+		// 检查端口号
+		if port == "0" {
 			this.Fail("端口号不能为0")
 		}
-		if portInt > 65535 {
-			this.Fail("端口号不能大于65535")
+		if !configutils.HasVariables(port) {
+			// 必须是整数
+			if !regexp.MustCompile(`^\d+$`).MatchString(port) {
+				this.Fail("端口号只能为整数")
+			}
+			var portInt = types.Int(port)
+			if portInt == 0 {
+				this.Fail("端口号不能为0")
+			}
+			if portInt > 65535 {
+				this.Fail("端口号不能大于65535")
+			}
+		}
+
+		pbAddr = &pb.NetworkAddress{
+			Protocol:  params.Protocol,
+			Host:      host,
+			PortRange: port,
+		}
+
+		addrConfig = &serverconfigs.NetworkAddressConfig{
+			Protocol:  serverconfigs.Protocol(params.Protocol),
+			Host:      host,
+			PortRange: port,
 		}
 	}
 
@@ -103,12 +149,9 @@ func (this *AddOriginPopupAction) RunPost(params struct {
 	}
 
 	resp, err := this.RPC().OriginRPC().CreateOrigin(this.AdminContext(), &pb.CreateOriginRequest{
-		Name: "",
-		Addr: &pb.NetworkAddress{
-			Protocol:  params.Protocol,
-			Host:      host,
-			PortRange: port,
-		},
+		Name:        "",
+		Addr:        pbAddr,
+		OssJSON:     ossJSON,
 		Description: "",
 		Weight:      10,
 		IsOn:        true,
@@ -124,14 +167,16 @@ func (this *AddOriginPopupAction) RunPost(params struct {
 	var origin = &serverconfigs.OriginConfig{
 		Id:   resp.OriginId,
 		IsOn: true,
-		Addr: &serverconfigs.NetworkAddressConfig{
-			Protocol:  serverconfigs.Protocol(params.Protocol),
-			Host:      host,
-			PortRange: port,
-		},
+		Addr: addrConfig,
+		OSS:  ossConfig,
 	}
 
-	this.Data["origin"] = origin
+	this.Data["origin"] = maps.Map{
+		"id":          resp.OriginId,
+		"isOn":        true,
+		"addr":        addrConfig,
+		"addrSummary": origin.AddrSummary(),
+	}
 
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "创建源站 %d", resp.OriginId)

internal/web/actions/default/servers/addOriginPopup_ext.go

@@ -0,0 +1,18 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package servers
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ossconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func (this *AddOriginPopupAction) getOSSHook() {
+	this.Data["ossTypes"] = []maps.Map{}
+}
+
+func (this *AddOriginPopupAction) postOSSHook(protocol string) (config *ossconfigs.OSSConfig, goNext bool, err error) {
+	goNext = true
+	return
+}

internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/index.go

@@ -59,7 +59,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,
@@ -76,7 +77,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,

internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/index.go

@@ -59,7 +59,8 @@ func (this *IndexAction) RunGet(params struct {
 		m := maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,
@@ -76,7 +77,8 @@ func (this *IndexAction) RunGet(params struct {
 		m := maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,

internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/index.go

@@ -59,7 +59,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,
@@ -76,7 +77,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,

internal/web/actions/default/servers/server/settings/locations/reverseProxy/index.go

@@ -60,7 +60,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,
@@ -77,7 +78,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,

internal/web/actions/default/servers/server/settings/origins/addPopup.go

@@ -47,6 +47,9 @@ func (this *AddPopupAction) RunGet(params struct {
 	// 是否为HTTP
 	this.Data["isHTTP"] = serverType == "httpProxy" || serverType == "httpWeb"
 
+	// OSS
+	this.getOSSHook()
+
 	this.Show()
 }
 
@@ -76,104 +79,142 @@ func (this *AddPopupAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
-	params.Must.
-		Field("addr", params.Addr).
-		Require("请输入源站地址")
-
-	var addr = params.Addr
-
-	// 是否是完整的地址
-	if (params.Protocol == "http" || params.Protocol == "https") && regexp.MustCompile(`^(http|https)://`).MatchString(addr) {
-		u, err := url.Parse(addr)
-		if err == nil {
-			addr = u.Host
-		}
-	}
-
-	addr = strings.ReplaceAll(addr, "：", ":")
-	addr = regexp.MustCompile(`\s+`).ReplaceAllString(addr, "")
-	var portIndex = strings.LastIndex(addr, ":")
-	if portIndex < 0 {
-		if params.Protocol == "http" {
-			addr += ":80"
-		} else if params.Protocol == "https" {
-			addr += ":443"
-		} else {
-			this.FailField("addr", "源站地址中需要带有端口")
-		}
-		portIndex = strings.LastIndex(addr, ":")
-	}
-	var host = addr[:portIndex]
-	var port = addr[portIndex+1:]
-
-	// 检查端口号
-	if port == "0" {
-		this.FailField("addr", "源站端口号不能为0")
-	}
-	if !configutils.HasVariables(port) {
-		// 必须是整数
-		if !regexp.MustCompile(`^\d+$`).MatchString(port) {
-			this.FailField("addr", "源站端口号只能为整数")
-		}
-		var portInt = types.Int(port)
-		if portInt == 0 {
-			this.FailField("addr", "源站端口号不能为0")
-		}
-		if portInt > 65535 {
-			this.FailField("addr", "源站端口号不能大于65535")
-		}
-	}
-
-	connTimeoutJSON, err := (&shared.TimeDuration{
-		Count: int64(params.ConnTimeout),
-		Unit:  shared.TimeDurationUnitSecond,
-	}).AsJSON()
+	ossConfig, goNext, err := this.postOSSHook(params.Protocol)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-
-	readTimeoutJSON, err := (&shared.TimeDuration{
-		Count: int64(params.ReadTimeout),
-		Unit:  shared.TimeDurationUnitSecond,
-	}).AsJSON()
-	if err != nil {
-		this.ErrorPage(err)
+	if !goNext {
 		return
 	}
 
-	idleTimeoutJSON, err := (&shared.TimeDuration{
-		Count: int64(params.IdleTimeout),
-		Unit:  shared.TimeDurationUnitSecond,
-	}).AsJSON()
-	if err != nil {
-		this.ErrorPage(err)
-		return
+	// 初始化
+	var pbAddr = &pb.NetworkAddress{
+		Protocol: params.Protocol,
 	}
+	var connTimeoutJSON []byte
+	var readTimeoutJSON []byte
+	var idleTimeoutJSON []byte
+	var certRefJSON []byte
 
-	// 证书
-	var certIds = []int64{}
-	if len(params.CertIdsJSON) > 0 {
-		err = json.Unmarshal(params.CertIdsJSON, &certIds)
+	var ossJSON []byte = nil
+	if ossConfig != nil { // OSS
+		ossJSON, err = json.Marshal(ossConfig)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-	}
-	var certRefJSON []byte
-	if len(certIds) > 0 {
-		var certId = certIds[0]
-		if certId > 0 {
-			var certRef = &sslconfigs.SSLCertRef{
-				IsOn:   true,
-				CertId: certId,
+		err = ossConfig.Init()
+		if err != nil {
+			this.Fail("校验OSS配置时出错：" + err.Error())
+			return
+		}
+	} else { // 普通源站
+		params.Must.
+			Field("addr", params.Addr).
+			Require("请输入源站地址")
+
+		var addr = params.Addr
+
+		// 是否是完整的地址
+		if (params.Protocol == "http" || params.Protocol == "https") && regexp.MustCompile(`^(http|https)://`).MatchString(addr) {
+			u, err := url.Parse(addr)
+			if err == nil {
+				addr = u.Host
 			}
-			certRefJSON, err = json.Marshal(certRef)
+		}
+
+		addr = strings.ReplaceAll(addr, "：", ":")
+		addr = regexp.MustCompile(`\s+`).ReplaceAllString(addr, "")
+		var portIndex = strings.LastIndex(addr, ":")
+		if portIndex < 0 {
+			if params.Protocol == "http" {
+				addr += ":80"
+			} else if params.Protocol == "https" {
+				addr += ":443"
+			} else {
+				this.FailField("addr", "源站地址中需要带有端口")
+			}
+			portIndex = strings.LastIndex(addr, ":")
+		}
+		var host = addr[:portIndex]
+		var port = addr[portIndex+1:]
+
+		// 检查端口号
+		if port == "0" {
+			this.FailField("addr", "源站端口号不能为0")
+		}
+		if !configutils.HasVariables(port) {
+			// 必须是整数
+			if !regexp.MustCompile(`^\d+$`).MatchString(port) {
+				this.FailField("addr", "源站端口号只能为整数")
+			}
+			var portInt = types.Int(port)
+			if portInt == 0 {
+				this.FailField("addr", "源站端口号不能为0")
+			}
+			if portInt > 65535 {
+				this.FailField("addr", "源站端口号不能大于65535")
+			}
+		}
+
+		connTimeoutJSON, err = (&shared.TimeDuration{
+			Count: int64(params.ConnTimeout),
+			Unit:  shared.TimeDurationUnitSecond,
+		}).AsJSON()
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		readTimeoutJSON, err = (&shared.TimeDuration{
+			Count: int64(params.ReadTimeout),
+			Unit:  shared.TimeDurationUnitSecond,
+		}).AsJSON()
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		idleTimeoutJSON, err = (&shared.TimeDuration{
+			Count: int64(params.IdleTimeout),
+			Unit:  shared.TimeDurationUnitSecond,
+		}).AsJSON()
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		// 证书
+		var certIds = []int64{}
+		if len(params.CertIdsJSON) > 0 {
+			err = json.Unmarshal(params.CertIdsJSON, &certIds)
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
 		}
+
+		if len(certIds) > 0 {
+			var certId = certIds[0]
+			if certId > 0 {
+				var certRef = &sslconfigs.SSLCertRef{
+					IsOn:   true,
+					CertId: certId,
+				}
+				certRefJSON, err = json.Marshal(certRef)
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+			}
+		}
+
+		pbAddr = &pb.NetworkAddress{
+			Protocol:  params.Protocol,
+			Host:      host,
+			PortRange: port,
+		}
 	}
 
 	// 专属域名
@@ -192,12 +233,9 @@ func (this *AddPopupAction) RunPost(params struct {
 	}
 
 	createResp, err := this.RPC().OriginRPC().CreateOrigin(this.AdminContext(), &pb.CreateOriginRequest{
-		Name: params.Name,
-		Addr: &pb.NetworkAddress{
-			Protocol:  params.Protocol,
-			Host:      host,
-			PortRange: port,
-		},
+		Name:            params.Name,
+		Addr:            pbAddr,
+		OssJSON:         ossJSON,
 		Description:     params.Description,
 		Weight:          params.Weight,
 		IsOn:            params.IsOn,

internal/web/actions/default/servers/server/settings/origins/addPopup_ext.go

@@ -0,0 +1,18 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package origins
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ossconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func (this *AddPopupAction) getOSSHook() {
+	this.Data["ossTypes"] = []maps.Map{}
+}
+
+func (this *AddPopupAction) postOSSHook(protocol string) (config *ossconfigs.OSSConfig, goNext bool, err error) {
+	goNext = true
+	return
+}

internal/web/actions/default/servers/server/settings/origins/updatePopup.go

@@ -94,10 +94,14 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		config.Cert.KeyData = nil
 	}
 
+	var addr = ""
+	if len(config.Addr.Host) > 0 && len(config.Addr.PortRange) > 0 {
+		addr = config.Addr.Host + ":" + config.Addr.PortRange
+	}
 	this.Data["origin"] = maps.Map{
 		"id":           config.Id,
 		"protocol":     config.Addr.Protocol,
-		"addr":         config.Addr.Host + ":" + config.Addr.PortRange,
+		"addr":         addr,
 		"weight":       config.Weight,
 		"name":         config.Name,
 		"description":  config.Description,
@@ -111,8 +115,12 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		"domains":      config.Domains,
 		"host":         config.RequestHost,
 		"followPort":   config.FollowPort,
+		"oss":          config.OSS,
 	}
 
+	// OSS
+	this.getOSSHook()
+
 	this.Show()
 }
 
@@ -143,103 +151,144 @@ func (this *UpdatePopupAction) RunPost(params struct {
 
 	Must *actions.Must
 }) {
-	params.Must.
-		Field("addr", params.Addr).
-		Require("请输入源站地址")
-
-	var addr = params.Addr
-
-	// 是否是完整的地址
-	if (params.Protocol == "http" || params.Protocol == "https") && regexp.MustCompile(`^(http|https)://`).MatchString(addr) {
-		u, err := url.Parse(addr)
-		if err == nil {
-			addr = u.Host
-		}
-	}
-
-	addr = strings.ReplaceAll(addr, "：", ":")
-	addr = regexp.MustCompile(`\s+`).ReplaceAllString(addr, "")
-	portIndex := strings.LastIndex(addr, ":")
-	if portIndex < 0 {
-		if params.Protocol == "http" {
-			addr += ":80"
-		} else if params.Protocol == "https" {
-			addr += ":443"
-		} else {
-			this.FailField("addr", "源站地址中需要带有端口")
-		}
-		portIndex = strings.LastIndex(addr, ":")
-	}
-	var host = addr[:portIndex]
-	var port = addr[portIndex+1:]
-	// 检查端口号
-	if port == "0" {
-		this.FailField("addr", "源站端口号不能为0")
-	}
-	if !configutils.HasVariables(port) {
-		// 必须是整数
-		if !regexp.MustCompile(`^\d+$`).MatchString(port) {
-			this.FailField("addr", "源站端口号只能为整数")
-		}
-		var portInt = types.Int(port)
-		if portInt == 0 {
-			this.FailField("addr", "源站端口号不能为0")
-		}
-		if portInt > 65535 {
-			this.FailField("addr", "源站端口号不能大于65535")
-		}
-	}
-
-	connTimeoutJSON, err := (&shared.TimeDuration{
-		Count: int64(params.ConnTimeout),
-		Unit:  shared.TimeDurationUnitSecond,
-	}).AsJSON()
+	ossConfig, goNext, err := this.postOSSHook(params.Protocol)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-
-	readTimeoutJSON, err := (&shared.TimeDuration{
-		Count: int64(params.ReadTimeout),
-		Unit:  shared.TimeDurationUnitSecond,
-	}).AsJSON()
-	if err != nil {
-		this.ErrorPage(err)
+	if !goNext {
 		return
 	}
 
-	idleTimeoutJSON, err := (&shared.TimeDuration{
-		Count: int64(params.IdleTimeout),
-		Unit:  shared.TimeDurationUnitSecond,
-	}).AsJSON()
-	if err != nil {
-		this.ErrorPage(err)
-		return
+	var ossJSON []byte = nil
+	var connTimeoutJSON []byte
+	var readTimeoutJSON []byte
+	var idleTimeoutJSON []byte
+	var certRefJSON []byte
+	var pbAddr = &pb.NetworkAddress{
+		Protocol: params.Protocol,
 	}
 
-	// 证书
-	var certIds = []int64{}
-	if len(params.CertIdsJSON) > 0 {
-		err = json.Unmarshal(params.CertIdsJSON, &certIds)
+	if ossConfig != nil { // OSS
+		ossJSON, err = json.Marshal(ossConfig)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-	}
-	var certRefJSON []byte
-	if len(certIds) > 0 {
-		var certId = certIds[0]
-		if certId > 0 {
-			var certRef = &sslconfigs.SSLCertRef{
-				IsOn:   true,
-				CertId: certId,
+		err = ossConfig.Init()
+		if err != nil {
+			this.Fail("校验OSS配置时出错：" + err.Error())
+			return
+		}
+	} else { // 普通源站
+		params.Must.
+			Field("addr", params.Addr).
+			Require("请输入源站地址")
+
+		var addr = params.Addr
+
+		// 是否是完整的地址
+		if (params.Protocol == "http" || params.Protocol == "https") && regexp.MustCompile(`^(http|https)://`).MatchString(addr) {
+			u, err := url.Parse(addr)
+			if err == nil {
+				addr = u.Host
 			}
-			certRefJSON, err = json.Marshal(certRef)
+		}
+
+		addr = strings.ReplaceAll(addr, "：", ":")
+		addr = regexp.MustCompile(`\s+`).ReplaceAllString(addr, "")
+		portIndex := strings.LastIndex(addr, ":")
+		if portIndex < 0 {
+			if params.Protocol == "http" {
+				addr += ":80"
+			} else if params.Protocol == "https" {
+				addr += ":443"
+			} else {
+				this.FailField("addr", "源站地址中需要带有端口")
+			}
+			portIndex = strings.LastIndex(addr, ":")
+		}
+		var host = addr[:portIndex]
+		var port = addr[portIndex+1:]
+		// 检查端口号
+		if port == "0" {
+			this.FailField("addr", "源站端口号不能为0")
+			return
+		}
+		if !configutils.HasVariables(port) {
+			// 必须是整数
+			if !regexp.MustCompile(`^\d+$`).MatchString(port) {
+				this.FailField("addr", "源站端口号只能为整数")
+				return
+			}
+			var portInt = types.Int(port)
+			if portInt == 0 {
+				this.FailField("addr", "源站端口号不能为0")
+				return
+			}
+			if portInt > 65535 {
+				this.FailField("addr", "源站端口号不能大于65535")
+				return
+			}
+		}
+
+		pbAddr = &pb.NetworkAddress{
+			Protocol:  params.Protocol,
+			Host:      host,
+			PortRange: port,
+		}
+
+		connTimeoutJSON, err = (&shared.TimeDuration{
+			Count: int64(params.ConnTimeout),
+			Unit:  shared.TimeDurationUnitSecond,
+		}).AsJSON()
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		readTimeoutJSON, err = (&shared.TimeDuration{
+			Count: int64(params.ReadTimeout),
+			Unit:  shared.TimeDurationUnitSecond,
+		}).AsJSON()
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		idleTimeoutJSON, err = (&shared.TimeDuration{
+			Count: int64(params.IdleTimeout),
+			Unit:  shared.TimeDurationUnitSecond,
+		}).AsJSON()
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		// 证书
+		var certIds = []int64{}
+		if len(params.CertIdsJSON) > 0 {
+			err = json.Unmarshal(params.CertIdsJSON, &certIds)
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
 		}
+
+		if len(certIds) > 0 {
+			var certId = certIds[0]
+			if certId > 0 {
+				var certRef = &sslconfigs.SSLCertRef{
+					IsOn:   true,
+					CertId: certId,
+				}
+				certRefJSON, err = json.Marshal(certRef)
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+			}
+		}
 	}
 
 	// 专属域名
@@ -258,13 +307,10 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().OriginRPC().UpdateOrigin(this.AdminContext(), &pb.UpdateOriginRequest{
-		OriginId: params.OriginId,
-		Name:     params.Name,
-		Addr: &pb.NetworkAddress{
-			Protocol:  params.Protocol,
-			Host:      host,
-			PortRange: port,
-		},
+		OriginId:        params.OriginId,
+		Name:            params.Name,
+		Addr:            pbAddr,
+		OssJSON:         ossJSON,
 		Description:     params.Description,
 		Weight:          params.Weight,
 		IsOn:            params.IsOn,

internal/web/actions/default/servers/server/settings/origins/updatePopup_ext.go

@@ -0,0 +1,18 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package origins
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ossconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func (this *UpdatePopupAction) getOSSHook() {
+	this.Data["ossTypes"] = []maps.Map{}
+}
+
+func (this *UpdatePopupAction) postOSSHook(protocol string) (config *ossconfigs.OSSConfig, goNext bool, err error) {
+	goNext = true
+	return
+}

internal/web/actions/default/servers/server/settings/reverseProxy/index.go

@@ -87,7 +87,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,
@@ -104,7 +105,8 @@ func (this *IndexAction) RunGet(params struct {
 		var m = maps.Map{
 			"id":         originConfig.Id,
 			"weight":     originConfig.Weight,
-			"addr":       originConfig.Addr.Protocol.String() + "://" + originConfig.Addr.Host + ":" + originConfig.Addr.PortRange,
+			"addr":       originConfig.AddrSummary(),
+			"isOSS":      originConfig.IsOSS(),
 			"name":       originConfig.Name,
 			"isOn":       originConfig.IsOn,
 			"domains":    originConfig.Domains,