xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-11 03:33:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

插件增加静态文件目录自动映射，优化插件模板引擎与主模块的耦合关系

Browse Source
This commit is contained in:
孟帅
2023-06-14 18:09:49 +08:00
parent a232986311
commit 564107b980
29 changed files with 210 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
server/internal/library/addons/install.go
View File

@@ -23,11 +23,12 @@ type InstallRecord struct {
UpdatedAt *gtime.Time `json:"updatedAt" description:"更新时间"`
}
func GetModel(ctx context.Context) *gdb.Model {
return g.Model("sys_addons_install").Ctx(ctx)
}
func ScanInstall(m Module) (record *InstallRecord, err error) {
err = g.Model("sys_addons_install").
Ctx(m.Ctx()).
Where("name", m.GetSkeleton().Name).
Scan(&record)
err = GetModel(m.Ctx()).Where("name", m.GetSkeleton().Name).Scan(&record)
return
}
@@ -59,23 +60,14 @@ func Install(m Module) (err error) {
"version": m.GetSkeleton().Version,
"status": consts.AddonsInstallStatusOk,
}
return g.DB().Transaction(m.Ctx(), func(ctx context.Context, tx gdb.TX) error {
if record != nil {
_, err = g.Model("sys_addons_install").
Ctx(m.Ctx()).
Where("id", record.Id).
Delete()
_, _ = GetModel(m.Ctx()).Where("id", record.Id).Delete()
}
_, err = g.Model("sys_addons_install").
Ctx(m.Ctx()).
Data(data).
Insert()
if err != nil {
if _, err = GetModel(m.Ctx()).Data(data).Insert(); err != nil {
return err
}
return m.Install(ctx)
})
}
@@ -94,18 +86,10 @@ func Upgrade(m Module) (err error) {
data := g.Map{
"version": m.GetSkeleton().Version,
}
return g.DB().Transaction(m.Ctx(), func(ctx context.Context, tx gdb.TX) error {
_, err = g.Model("sys_addons_install").
Ctx(m.Ctx()).
Where("id", record.Id).
Data(data).
Update()
if err != nil {
if _, err = GetModel(m.Ctx()).Where("id", record.Id).Data(data).Update(); err != nil {
return err
}
return m.Upgrade(ctx)
})
}
@@ -125,18 +109,10 @@ func UnInstall(m Module) (err error) {
"version": m.GetSkeleton().Version,
"status": consts.AddonsInstallStatusUn,
}
return g.DB().Transaction(m.Ctx(), func(ctx context.Context, tx gdb.TX) error {
_, err = g.Model("sys_addons_install").
Ctx(m.Ctx()).
Where("id", record.Id).
Data(data).
Update()
if err != nil {
if _, err = GetModel(m.Ctx()).Where("id", record.Id).Data(data).Update(); err != nil {
return err
}
return m.UnInstall(ctx)
})
}