TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-29 01:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现Web静态文件分发

Browse Source
This commit is contained in:
刘祥超
2020-09-26 11:21:43 +08:00
parent 50731984ec
commit 8b11e7172a
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,16 @@ func (this *HTTPWebDAO) ComposeWebConfig(webId int64) (*serverconfigs.HTTPWebCon
config := &serverconfigs.HTTPWebConfig{}
config.Id = webId
config.IsOn = web.IsOn == 1
config.Root = web.Root
// root
if IsNotNull(web.Root) {
rootConfig := &serverconfigs.HTTPRootConfig{}
err = json.Unmarshal([]byte(web.Root), rootConfig)
if err != nil {
return nil, err
}
config.Root = rootConfig
}
// gzip
if IsNotNull(web.Gzip) {
@@ -255,10 +264,10 @@ func (this *HTTPWebDAO) ComposeWebConfig(webId int64) (*serverconfigs.HTTPWebCon
}
// 创建Web配置
func (this *HTTPWebDAO) CreateWeb(root string) (int64, error) {
func (this *HTTPWebDAO) CreateWeb(rootJSON []byte) (int64, error) {
op := NewHTTPWebOperator()
op.State = HTTPWebStateEnabled
op.Root = root
op.Root = rootJSON
_, err := this.Save(op)
if err != nil {
return 0, err
@@ -267,13 +276,13 @@ func (this *HTTPWebDAO) CreateWeb(root string) (int64, error) {
}
// 修改Web配置
func (this *HTTPWebDAO) UpdateWeb(webId int64, root string) error {
func (this *HTTPWebDAO) UpdateWeb(webId int64, rootJSON []byte) error {
if webId <= 0 {
return errors.New("invalid webId")
}
op := NewHTTPWebOperator()
op.Id = webId
op.Root = root
op.Root = rootJSON
_, err := this.Save(op)
return err
}

8
internal/db/models/server_dao.go
View File

@@ -129,6 +129,12 @@ func (this *ServerDAO) CreateServer(adminId int64, userId int64, serverType serv
}
serverId = types.Int64(op.Id)
_, err = this.RenewServerConfig(serverId)
if err != nil {
return serverId, err
}
return serverId, nil
}
@@ -320,7 +326,7 @@ func (this *ServerDAO) InitServerWeb(serverId int64) (int64, error) {
return 0, errors.New("serverId should not be smaller than 0")
}
webId, err := SharedHTTPWebDAO.CreateWeb("")
webId, err := SharedHTTPWebDAO.CreateWeb(nil)
if err != nil {
return 0, err
}