添加快捷添加和删除网站源站API

This commit is contained in:
刘祥超
2024-01-12 11:50:10 +08:00
parent 1f2c9a6b3a
commit a3c0b43bc4
5 changed files with 298 additions and 12 deletions

View File

@@ -538,6 +538,17 @@ func (this *OriginDAO) CheckUserOrigin(tx *dbs.Tx, userId int64, originId int64)
return SharedReverseProxyDAO.CheckUserReverseProxy(tx, userId, reverseProxyId)
}
// ExistsOrigin 检查源站是否存在
func (this *OriginDAO) ExistsOrigin(tx *dbs.Tx, originId int64) (bool, error) {
if originId <= 0 {
return false, nil
}
return this.Query(tx).
Pk(originId).
State(OriginStateEnabled).
Exist()
}
// NotifyUpdate 通知更新
func (this *OriginDAO) NotifyUpdate(tx *dbs.Tx, originId int64) error {
reverseProxyId, err := SharedReverseProxyDAO.FindReverseProxyContainsOriginId(tx, originId)

View File

@@ -376,14 +376,14 @@ func (this *ReverseProxyDAO) UpdateReverseProxyScheduling(tx *dbs.Tx, reversePro
}
// UpdateReverseProxyPrimaryOrigins 修改主要源站
func (this *ReverseProxyDAO) UpdateReverseProxyPrimaryOrigins(tx *dbs.Tx, reverseProxyId int64, origins []byte) error {
func (this *ReverseProxyDAO) UpdateReverseProxyPrimaryOrigins(tx *dbs.Tx, reverseProxyId int64, originRefs []byte) error {
if reverseProxyId <= 0 {
return errors.New("invalid reverseProxyId")
}
var op = NewReverseProxyOperator()
op.Id = reverseProxyId
if len(origins) > 0 {
op.PrimaryOrigins = origins
if len(originRefs) > 0 {
op.PrimaryOrigins = originRefs
} else {
op.PrimaryOrigins = "[]"
}

View File

@@ -1 +1,31 @@
package models
import (
"encoding/json"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/logs"
)
// DecodePrimaryOrigins 解析主要源站
func (this *ReverseProxy) DecodePrimaryOrigins() []*serverconfigs.OriginRef {
var refs = []*serverconfigs.OriginRef{}
if IsNotNull(this.PrimaryOrigins) {
err := json.Unmarshal(this.PrimaryOrigins, &refs)
if err != nil {
logs.Error(err)
}
}
return refs
}
// DecodeBackupOrigins 解析备用源站
func (this *ReverseProxy) DecodeBackupOrigins() []*serverconfigs.OriginRef {
var refs = []*serverconfigs.OriginRef{}
if IsNotNull(this.BackupOrigins) {
err := json.Unmarshal(this.BackupOrigins, &refs)
if err != nil {
logs.Error(err)
}
}
return refs
}

View File

@@ -757,14 +757,14 @@ func (this *ServerDAO) UpdateServerAuditing(tx *dbs.Tx, serverId int64, result *
return this.NotifyDNSUpdate(tx, serverId)
}
// UpdateServerReverseProxy 修改反向代理配置
func (this *ServerDAO) UpdateServerReverseProxy(tx *dbs.Tx, serverId int64, config []byte) error {
// UpdateServerReverseProxyRef 修改反向代理配置
func (this *ServerDAO) UpdateServerReverseProxyRef(tx *dbs.Tx, serverId int64, reverseProxyRefJSON []byte) error {
if serverId <= 0 {
return errors.New("serverId should not be smaller than 0")
}
var op = NewServerOperator()
op.Id = serverId
op.ReverseProxy = JSONBytes(config)
op.ReverseProxy = JSONBytes(reverseProxyRefJSON)
err := this.Save(tx, op)
if err != nil {
return err
@@ -773,6 +773,28 @@ func (this *ServerDAO) UpdateServerReverseProxy(tx *dbs.Tx, serverId int64, conf
return this.NotifyUpdate(tx, serverId)
}
// CreateServerReverseProxyRef 创建反向代理配置
func (this *ServerDAO) CreateServerReverseProxyRef(tx *dbs.Tx, userId int64, serverId int64) (reverseProxyId int64, err error) {
reverseProxyId, err = SharedReverseProxyDAO.CreateReverseProxy(tx, 0, userId, nil, []byte("[]"), []byte("[]"))
if err != nil {
return 0, err
}
var reverseProxyRef = &serverconfigs.ReverseProxyRef{
IsPrior: false,
IsOn: true,
ReverseProxyId: reverseProxyId,
}
reverseProxyRefJSON, err := json.Marshal(reverseProxyRef)
if err != nil {
return 0, err
}
err = this.UpdateServerReverseProxyRef(tx, serverId, reverseProxyRefJSON)
if err != nil {
return 0, err
}
return reverseProxyId, nil
}
// CountAllEnabledServers 计算所有可用服务数量
func (this *ServerDAO) CountAllEnabledServers(tx *dbs.Tx) (int64, error) {
return this.Query(tx).
@@ -1362,8 +1384,8 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, ignoreCer
return config, nil
}
// FindReverseProxyRef 根据条件获取反向代理配置
func (this *ServerDAO) FindReverseProxyRef(tx *dbs.Tx, serverId int64) (*serverconfigs.ReverseProxyRef, error) {
// FindServerReverseProxyRef 根据条件获取反向代理配置
func (this *ServerDAO) FindServerReverseProxyRef(tx *dbs.Tx, serverId int64) (*serverconfigs.ReverseProxyRef, error) {
reverseProxy, err := this.Query(tx).
Pk(serverId).
Result("reverseProxy").
@@ -1374,7 +1396,7 @@ func (this *ServerDAO) FindReverseProxyRef(tx *dbs.Tx, serverId int64) (*serverc
if len(reverseProxy) == 0 || reverseProxy == "null" {
return nil, nil
}
config := &serverconfigs.ReverseProxyRef{}
var config = &serverconfigs.ReverseProxyRef{}
err = json.Unmarshal([]byte(reverseProxy), config)
return config, err
}
@@ -2998,6 +3020,17 @@ func (this *ServerDAO) CheckServerPlanQuota(tx *dbs.Tx, serverId int64, countSer
return nil
}
// ExistsServer 检查网站是否存在
func (this *ServerDAO) ExistsServer(tx *dbs.Tx, serverId int64) (bool, error) {
if serverId <= 0 {
return false, nil
}
return this.Query(tx).
Pk(serverId).
State(ServerStateEnabled).
Exist()
}
// NotifyUpdate 同步服务所在的集群
func (this *ServerDAO) NotifyUpdate(tx *dbs.Tx, serverId int64) error {
if serverId <= 0 {