|
|
@ -96,6 +96,10 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return 0, nil, err
|
|
|
|
return 0, nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return 0, nil, err
|
|
|
|
|
|
|
|
}
|
|
|
|
for _, web := range websites {
|
|
|
|
for _, web := range websites {
|
|
|
|
var (
|
|
|
|
var (
|
|
|
|
appName string
|
|
|
|
appName string
|
|
|
@ -115,10 +119,12 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
|
|
|
|
}
|
|
|
|
}
|
|
|
|
runtimeName = runtime.Name
|
|
|
|
runtimeName = runtime.Name
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sitePath := path.Join(constant.AppInstallDir, constant.AppOpenresty, nginxInstall.Name, "www", "sites", web.Alias)
|
|
|
|
websiteDTOs = append(websiteDTOs, response.WebsiteDTO{
|
|
|
|
websiteDTOs = append(websiteDTOs, response.WebsiteDTO{
|
|
|
|
Website: web,
|
|
|
|
Website: web,
|
|
|
|
AppName: appName,
|
|
|
|
AppName: appName,
|
|
|
|
RuntimeName: runtimeName,
|
|
|
|
RuntimeName: runtimeName,
|
|
|
|
|
|
|
|
SitePath: sitePath,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return total, websiteDTOs, nil
|
|
|
|
return total, websiteDTOs, nil
|
|
|
|