1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-08 14:37:29 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Unify the response body of the API interface (#8158)

Browse source
This commit is contained in:
蘭 2025-03-14 22:38:40 +08:00 • committed by GitHub
parent e64b3f2d7d
commit 23f83068f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
agent/app/api/v2/app_install.go
View file

@ -27,7 +27,10 @@ func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
helper.InternalServer(c, err) helper.InternalServer(c, err)
return return
} }
helper.SuccessWithData(c, list) helper.SuccessWithData(c, dto.PageResult{
Items: list,
Total: int64(len(list)),
})
} else { } else {
total, list, err := appInstallService.Page(req) total, list, err := appInstallService.Page(req)
if err != nil { if err != nil {

5
agent/app/api/v2/php_extensions.go
View file

@ -26,7 +26,10 @@ func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
helper.InternalServer(c, err) helper.InternalServer(c, err)
return return
} }
helper.SuccessWithData(c, list) helper.SuccessWithData(c, dto.PageResult{
Total: int64(len(list)),
Items: list,
})
} else { } else {
total, list, err := phpExtensionsService.Page(req) total, list, err := phpExtensionsService.Page(req)
if err != nil { if err != nil {

2
core/cmd/server/main.go
View file

@ -23,7 +23,7 @@ import (
// @description Custom Token Format, Format: md5('1panel' + API-Key + UnixTimestamp). // @description Custom Token Format, Format: md5('1panel' + API-Key + UnixTimestamp).
// @description ``` // @description ```
// @description eg: // @description eg:
// @description curl -X GET "http://localhost:4004/api/v1/resource" \ // @description curl -X GET "http://localhost:4004/api/v1/dashboard/current" \
// @description -H "1Panel-Token: <1panel_token>" \ // @description -H "1Panel-Token: <1panel_token>" \
// @description -H "1Panel-Timestamp: <current_unix_timestamp>" // @description -H "1Panel-Timestamp: <current_unix_timestamp>"
// @description ``` // @description ```

2
frontend/src/api/modules/app.ts
View file

@ -64,7 +64,7 @@ export const appInstalledDeleteCheck = (appInstallId: number) => {
}; };
export const getAppInstalled = (search: App.AppInstalledSearch) => { export const getAppInstalled = (search: App.AppInstalledSearch) => {
return http.post<App.AppInstalled[]>('apps/installed/search', search); return http.post<ResPage<App.AppInstalled>>('apps/installed/search', search);
}; };
export const installedOp = (op: App.AppInstalledOp) => { export const installedOp = (op: App.AppInstalledOp) => {

2
frontend/src/api/modules/runtime.ts
View file

@ -51,7 +51,7 @@ export const SearchPHPExtensions = (req: ReqPage) => {
}; };
export const ListPHPExtensions = (req: Runtime.PHPExtensionsList) => { export const ListPHPExtensions = (req: Runtime.PHPExtensionsList) => {
return http.post<Runtime.PHPExtensions[]>(`/runtimes/php/extensions/search`, req); return http.post<ResPage<Runtime.PHPExtensions>>(`/runtimes/php/extensions/search`, req);
}; };
export const CreatePHPExtensions = (req: Runtime.PHPExtensionsCreate) => { export const CreatePHPExtensions = (req: Runtime.PHPExtensionsCreate) => {

2
frontend/src/views/website/runtime/php/create/index.vue
View file

@ -451,7 +451,7 @@ const listPHPExtensions = async () => {
page: 1, page: 1,
pageSize: 100, pageSize: 100,
}); });
phpExtensions.value = res.data; phpExtensions.value = res.data.items;
} catch (error) {} } catch (error) {}
}; };

6
frontend/src/views/website/website/create/index.vue
View file

@ -729,10 +729,10 @@ const changeType = (type: string) => {
const searchAppInstalled = (appType: string) => { const searchAppInstalled = (appType: string) => {
getAppInstalled({ type: appType, unused: true, all: true, page: 1, pageSize: 100 }).then((res) => { getAppInstalled({ type: appType, unused: true, all: true, page: 1, pageSize: 100 }).then((res) => {
appInstalls.value = res.data; appInstalls.value = res.data.items;
website.value.appInstallId = undefined; website.value.appInstallId = undefined;
if (appType == 'website' && res.data && res.data.length > 0) { if (appType == 'website' && res.data.items && res.data.items.length > 0) {
website.value.appInstallId = res.data[0].id; website.value.appInstallId = res.data.items[0].id;
} }
}); });
}; };