mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-24 02:59:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 解决应用已安装时间显示错误的问题 (#5327)

Browse Source
This commit is contained in:
zhengkunwang 2024-06-06 19:01:38 +08:00 committed by GitHub
parent d0105c7863
commit a7cf69e5a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
backend/app/dto/response/app.go
View File

@ -88,25 +88,26 @@ type AppInstalledDTO struct {
} }
type AppInstallDTO struct { type AppInstallDTO struct {
ID uint `json:"id"` ID uint `json:"id"`
Name string `json:"name"` Name string `json:"name"`
AppID uint `json:"appID"` AppID uint `json:"appID"`
AppDetailID uint `json:"appDetailID"` AppDetailID uint `json:"appDetailID"`
Version string `json:"version"` Version string `json:"version"`
Status string `json:"status"` Status string `json:"status"`
Message string `json:"message"` Message string `json:"message"`
HttpPort int `json:"httpPort"` HttpPort int `json:"httpPort"`
HttpsPort int `json:"httpsPort"` HttpsPort int `json:"httpsPort"`
Path string `json:"path"` Path string `json:"path"`
CanUpdate bool `json:"canUpdate"` CanUpdate bool `json:"canUpdate"`
Icon string `json:"icon"` Icon string `json:"icon"`
AppName string `json:"appName"` AppName string `json:"appName"`
Ready int `json:"ready"` Ready int `json:"ready"`
Total int `json:"total"` Total int `json:"total"`
AppKey string `json:"appKey"` AppKey string `json:"appKey"`
AppType string `json:"appType"` AppType string `json:"appType"`
AppStatus string `json:"appStatus"` AppStatus string `json:"appStatus"`
DockerCompose string `json:"dockerCompose"` DockerCompose string `json:"dockerCompose"`
CreatedAt time.Time `json:"createdAt"`
} }
type DatabaseConn struct { type DatabaseConn struct {

1
backend/app/service/app_utils.go
View File

@ -1254,6 +1254,7 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool)
AppKey: installed.App.Key, AppKey: installed.App.Key,
AppType: installed.App.Type, AppType: installed.App.Type,
Path: installed.GetPath(), Path: installed.GetPath(),
CreatedAt: installed.CreatedAt,
} }
if updated { if updated {
installDTO.DockerCompose = installed.DockerCompose installDTO.DockerCompose = installed.DockerCompose