TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-28 10:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

路径规则改成路由规则

Browse Source
This commit is contained in:
GoEdgeLab
2021-07-13 14:30:30 +08:00
parent b47a286b9e
commit 185a7fdb4b
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/db/models/http_location_dao.go
View File

@@ -83,7 +83,7 @@ func (this *HTTPLocationDAO) FindHTTPLocationName(tx *dbs.Tx, id int64) (string,
FindStringCol("") FindStringCol("")
} }
// CreateLocation 创建路径规则 // CreateLocation 创建路由规则
func (this *HTTPLocationDAO) CreateLocation(tx *dbs.Tx, parentId int64, name string, pattern string, description string, isBreak bool, condsJSON []byte) (int64, error) { func (this *HTTPLocationDAO) CreateLocation(tx *dbs.Tx, parentId int64, name string, pattern string, description string, isBreak bool, condsJSON []byte) (int64, error) {
op := NewHTTPLocationOperator() op := NewHTTPLocationOperator()
op.IsOn = true op.IsOn = true
@@ -105,7 +105,7 @@ func (this *HTTPLocationDAO) CreateLocation(tx *dbs.Tx, parentId int64, name str
return types.Int64(op.Id), nil return types.Int64(op.Id), nil
} }
// UpdateLocation 修改路径规则 // UpdateLocation 修改路由规则
func (this *HTTPLocationDAO) UpdateLocation(tx *dbs.Tx, locationId int64, name string, pattern string, description string, isOn bool, isBreak bool, condsJSON []byte) error { func (this *HTTPLocationDAO) UpdateLocation(tx *dbs.Tx, locationId int64, name string, pattern string, description string, isOn bool, isBreak bool, condsJSON []byte) error {
if locationId <= 0 { if locationId <= 0 {
return errors.New("invalid locationId") return errors.New("invalid locationId")

2
internal/db/models/http_location_model.go
View File

@@ -1,6 +1,6 @@
package models package models
// 路径规则配置 // HTTPLocation 路由规则配置
type HTTPLocation struct { type HTTPLocation struct {
Id uint32 `field:"id"` // ID Id uint32 `field:"id"` // ID
TemplateId uint32 `field:"templateId"` // 模版ID TemplateId uint32 `field:"templateId"` // 模版ID

4
internal/db/models/http_web_dao.go
View File

@@ -247,7 +247,7 @@ func (this *HTTPWebDAO) ComposeWebConfig(tx *dbs.Tx, webId int64) (*serverconfig
} }
} }
// 路径规则 // 路由规则
if IsNotNull(web.Locations) { if IsNotNull(web.Locations) {
refs := []*serverconfigs.HTTPLocationRef{} refs := []*serverconfigs.HTTPLocationRef{}
err = json.Unmarshal([]byte(web.Locations), &refs) err = json.Unmarshal([]byte(web.Locations), &refs)
@@ -563,7 +563,7 @@ func (this *HTTPWebDAO) UpdateWebFirewall(tx *dbs.Tx, webId int64, firewallJSON
return this.NotifyUpdate(tx, webId) return this.NotifyUpdate(tx, webId)
} }
// UpdateWebLocations 更改路径规则配置 // UpdateWebLocations 更改路由规则配置
func (this *HTTPWebDAO) UpdateWebLocations(tx *dbs.Tx, webId int64, locationsJSON []byte) error { func (this *HTTPWebDAO) UpdateWebLocations(tx *dbs.Tx, webId int64, locationsJSON []byte) error {
if webId <= 0 { if webId <= 0 {
return errors.New("invalid webId") return errors.New("invalid webId")

4
internal/db/models/http_web_model.go
View File

@@ -23,7 +23,7 @@ type HTTPWeb struct {
Gzip string `field:"gzip"` // Gzip配置 Gzip string `field:"gzip"` // Gzip配置
Cache string `field:"cache"` // 缓存配置 Cache string `field:"cache"` // 缓存配置
Firewall string `field:"firewall"` // 防火墙设置 Firewall string `field:"firewall"` // 防火墙设置
Locations string `field:"locations"` // 路径规则配置 Locations string `field:"locations"` // 路由规则配置
Websocket string `field:"websocket"` // Websocket设置 Websocket string `field:"websocket"` // Websocket设置
RewriteRules string `field:"rewriteRules"` // 重写规则配置 RewriteRules string `field:"rewriteRules"` // 重写规则配置
HostRedirects string `field:"hostRedirects"` // 域名跳转 HostRedirects string `field:"hostRedirects"` // 域名跳转
@@ -53,7 +53,7 @@ type HTTPWebOperator struct {
Gzip interface{} // Gzip配置 Gzip interface{} // Gzip配置
Cache interface{} // 缓存配置 Cache interface{} // 缓存配置
Firewall interface{} // 防火墙设置 Firewall interface{} // 防火墙设置
Locations interface{} // 路径规则配置 Locations interface{} // 路由规则配置
Websocket interface{} // Websocket设置 Websocket interface{} // Websocket设置
RewriteRules interface{} // 重写规则配置 RewriteRules interface{} // 重写规则配置
HostRedirects interface{} // 域名跳转 HostRedirects interface{} // 域名跳转

10
internal/rpc/services/service_http_location.go
View File

@@ -9,12 +9,12 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
) )
// HTTPLocationService 路径规则相关服务 // HTTPLocationService 路由规则相关服务
type HTTPLocationService struct { type HTTPLocationService struct {
BaseService BaseService
} }
// CreateHTTPLocation 创建路径规则 // CreateHTTPLocation 创建路由规则
func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb.CreateHTTPLocationRequest) (*pb.CreateHTTPLocationResponse, error) { func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb.CreateHTTPLocationRequest) (*pb.CreateHTTPLocationResponse, error) {
// 校验请求 // 校验请求
_, err := this.ValidateAdmin(ctx, 0) _, err := this.ValidateAdmin(ctx, 0)
@@ -32,7 +32,7 @@ func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb
return &pb.CreateHTTPLocationResponse{LocationId: locationId}, nil return &pb.CreateHTTPLocationResponse{LocationId: locationId}, nil
} }
// UpdateHTTPLocation 修改路径规则 // UpdateHTTPLocation 修改路由规则
func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb.UpdateHTTPLocationRequest) (*pb.RPCSuccess, error) { func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb.UpdateHTTPLocationRequest) (*pb.RPCSuccess, error) {
// 校验请求 // 校验请求
_, err := this.ValidateAdmin(ctx, 0) _, err := this.ValidateAdmin(ctx, 0)
@@ -50,7 +50,7 @@ func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb
return this.Success() return this.Success()
} }
// FindEnabledHTTPLocationConfig 查找路径规则配置 // FindEnabledHTTPLocationConfig 查找路由规则配置
func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Context, req *pb.FindEnabledHTTPLocationConfigRequest) (*pb.FindEnabledHTTPLocationConfigResponse, error) { func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Context, req *pb.FindEnabledHTTPLocationConfigRequest) (*pb.FindEnabledHTTPLocationConfigResponse, error) {
// 校验请求 // 校验请求
_, err := this.ValidateAdmin(ctx, 0) _, err := this.ValidateAdmin(ctx, 0)
@@ -71,7 +71,7 @@ func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Conte
return &pb.FindEnabledHTTPLocationConfigResponse{LocationJSON: configJSON}, nil return &pb.FindEnabledHTTPLocationConfigResponse{LocationJSON: configJSON}, nil
} }
// DeleteHTTPLocation 删除路径规则 // DeleteHTTPLocation 删除路由规则
func (this *HTTPLocationService) DeleteHTTPLocation(ctx context.Context, req *pb.DeleteHTTPLocationRequest) (*pb.RPCSuccess, error) { func (this *HTTPLocationService) DeleteHTTPLocation(ctx context.Context, req *pb.DeleteHTTPLocationRequest) (*pb.RPCSuccess, error) {
// 校验请求 // 校验请求
_, err := this.ValidateAdmin(ctx, 0) _, err := this.ValidateAdmin(ctx, 0)

2
internal/rpc/services/service_http_web.go
View File

@@ -376,7 +376,7 @@ func (this *HTTPWebService) UpdateHTTPWebFirewall(ctx context.Context, req *pb.U
return this.Success() return this.Success()
} }
// UpdateHTTPWebLocations 更改路径规则设置 // UpdateHTTPWebLocations 更改路由规则设置
func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.UpdateHTTPWebLocationsRequest) (*pb.RPCSuccess, error) { func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.UpdateHTTPWebLocationsRequest) (*pb.RPCSuccess, error) {
// 校验请求 // 校验请求
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)