From 645e6d663f283da1eb8b12e2092994c04cd36683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Wed, 5 Feb 2025 22:43:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20alova.js=E6=9B=BF=E6=8D=A2axios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/api/apps/gitea/index.ts | 6 ++-- web/src/api/apps/memcached/index.ts | 11 +++--- web/src/api/panel/systemctl/index.ts | 18 +++++----- web/src/views/apps/docker/IndexView.vue | 37 ++++++++++----------- web/src/views/apps/fail2ban/IndexView.vue | 37 ++++++++++----------- web/src/views/apps/frp/IndexView.vue | 25 ++++++-------- web/src/views/apps/gitea/IndexView.vue | 19 ++++------- web/src/views/apps/memcached/IndexView.vue | 18 ++++------ web/src/views/apps/mysql/IndexView.vue | 12 +++---- web/src/views/apps/nginx/IndexView.vue | 8 ++--- web/src/views/apps/php/PhpView.vue | 8 ++--- web/src/views/apps/podman/IndexView.vue | 8 ++--- web/src/views/apps/postgresql/IndexView.vue | 12 +++---- web/src/views/apps/pureftpd/IndexView.vue | 8 ++--- web/src/views/apps/redis/IndexView.vue | 8 ++--- web/src/views/apps/rsync/IndexView.vue | 8 ++--- web/src/views/apps/supervisor/IndexView.vue | 8 ++--- 17 files changed, 99 insertions(+), 152 deletions(-) diff --git a/web/src/api/apps/gitea/index.ts b/web/src/api/apps/gitea/index.ts index 1bde6e4a..bd262959 100644 --- a/web/src/api/apps/gitea/index.ts +++ b/web/src/api/apps/gitea/index.ts @@ -1,8 +1,8 @@ -import { request } from '@/utils' +import { http } from '@/utils' export default { // 获取配置 - config: (): any => request.get('/apps/gitea/config'), + config: (): any => http.Get('/apps/gitea/config'), // 保存配置 - saveConfig: (config: string): any => request.post('/apps/gitea/config', { config }) + saveConfig: (config: string): any => http.Post('/apps/gitea/config', { config }) } diff --git a/web/src/api/apps/memcached/index.ts b/web/src/api/apps/memcached/index.ts index 209f6370..02a9125f 100644 --- a/web/src/api/apps/memcached/index.ts +++ b/web/src/api/apps/memcached/index.ts @@ -1,8 +1,7 @@ import { http } from '@/utils' -// 负载状态 -export const getLoad = () => http.Get('/apps/memcached/load') -// 获取配置 -export const getConfig = () => http.Get('/apps/memcached/config') -// 保存配置 -export const updateConfig = (config: string) => http.Post('/apps/memcached/config', { config }) +export default { + getLoad: (): any => http.Get('/apps/memcached/load'), + getConfig: (): any => http.Get('/apps/memcached/config'), + updateConfig: (config: string): any => http.Post('/apps/memcached/config', { config }) +} diff --git a/web/src/api/panel/systemctl/index.ts b/web/src/api/panel/systemctl/index.ts index 8617960b..3eff5911 100644 --- a/web/src/api/panel/systemctl/index.ts +++ b/web/src/api/panel/systemctl/index.ts @@ -1,20 +1,20 @@ -import { request } from '@/utils' +import { http } from '@/utils' export default { // 服务状态 - status: (service: string): any => request.get('/systemctl/status', { params: { service } }), + status: (service: string): any => http.Get('/systemctl/status', { params: { service } }), // 是否启用服务 - isEnabled: (service: string): any => request.get('/systemctl/isEnabled', { params: { service } }), + isEnabled: (service: string): any => http.Get('/systemctl/isEnabled', { params: { service } }), // 启用服务 - enable: (service: string): any => request.post('/systemctl/enable', { service }), + enable: (service: string): any => http.Post('/systemctl/enable', { service }), // 禁用服务 - disable: (service: string): any => request.post('/systemctl/disable', { service }), + disable: (service: string): any => http.Post('/systemctl/disable', { service }), // 重启服务 - restart: (service: string): any => request.post('/systemctl/restart', { service }), + restart: (service: string): any => http.Post('/systemctl/restart', { service }), // 重载服务 - reload: (service: string): any => request.post('/systemctl/reload', { service }), + reload: (service: string): any => http.Post('/systemctl/reload', { service }), // 启动服务 - start: (service: string): any => request.post('/systemctl/start', { service }), + start: (service: string): any => http.Post('/systemctl/start', { service }), // 停止服务 - stop: (service: string): any => request.post('/systemctl/stop', { service }) + stop: (service: string): any => http.Post('/systemctl/stop', { service }) } diff --git a/web/src/views/apps/docker/IndexView.vue b/web/src/views/apps/docker/IndexView.vue index 5f768bcc..a63642fa 100644 --- a/web/src/views/apps/docker/IndexView.vue +++ b/web/src/views/apps/docker/IndexView.vue @@ -24,39 +24,38 @@ const statusStr = computed(() => { }) const getStatus = async () => { - await systemctl.status('docker').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('docker') } const getIsEnabled = async () => { - await systemctl.isEnabled('docker').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('docker') } const handleSaveConfig = async () => { - useRequest(() => docker.updateConfig(config.value)).onSuccess(() => { + useRequest(docker.updateConfig(config.value)).onSuccess(() => { window.$message.success('保存成功') }) } -const handleStart = async () => { - await systemctl.start('docker') - window.$message.success('启动成功') - await getStatus() +const handleStart = () => { + useRequest(systemctl.start('docker')).onSuccess(() => { + window.$message.success('启动成功') + getStatus() + }) } -const handleStop = async () => { - await systemctl.stop('docker') - window.$message.success('停止成功') - await getStatus() +const handleStop = () => { + useRequest(systemctl.stop('docker')).onSuccess(() => { + window.$message.success('停止成功') + getStatus() + }) } -const handleRestart = async () => { - await systemctl.restart('docker') - window.$message.success('重启成功') - await getStatus() +const handleRestart = () => { + useRequest(systemctl.restart('docker')).onSuccess(() => { + window.$message.success('重启成功') + getStatus() + }) } const handleIsEnabled = async () => { diff --git a/web/src/views/apps/fail2ban/IndexView.vue b/web/src/views/apps/fail2ban/IndexView.vue index e1458739..e8bf784c 100644 --- a/web/src/views/apps/fail2ban/IndexView.vue +++ b/web/src/views/apps/fail2ban/IndexView.vue @@ -195,15 +195,11 @@ const { loading, data, page, total, pageSize, pageCount, refresh } = usePaginati ) const getStatus = async () => { - await systemctl.status('fail2ban').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('fail2ban') } const getIsEnabled = async () => { - await systemctl.isEnabled('fail2ban').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('fail2ban') } const handleStart = async () => { @@ -241,17 +237,19 @@ const handleReload = async () => { await getStatus() } -const handleAddJail = async () => { - await fail2ban.add(addJailModel.value) - await refresh() - window.$message.success('添加成功') - addJailModal.value = false +const handleAddJail = () => { + useRequest(fail2ban.add(addJailModel.value)).onSuccess(() => { + refresh() + window.$message.success('添加成功') + addJailModal.value = false + }) } -const handleDeleteJail = async (name: string) => { - await fail2ban.delete(name) - await refresh() - window.$message.success('删除成功') +const handleDeleteJail = (name: string) => { + useRequest(fail2ban.delete(name)).onSuccess(() => { + refresh() + window.$message.success('删除成功') + }) } const getJailInfo = async (name: string) => { @@ -261,10 +259,11 @@ const getJailInfo = async (name: string) => { jailBanedList.value = data.baned_list } -const handleUnBan = async (name: string, ip: string) => { - await fail2ban.unban(name, ip) - window.$message.success('解封成功') - await getJailInfo(name) +const handleUnBan = (name: string, ip: string) => { + useRequest(fail2ban.unban(name, ip)).onSuccess(() => { + window.$message.success('解封成功') + getJailInfo(name) + }) } onMounted(() => { diff --git a/web/src/views/apps/frp/IndexView.vue b/web/src/views/apps/frp/IndexView.vue index 5269b600..34c9ea70 100644 --- a/web/src/views/apps/frp/IndexView.vue +++ b/web/src/views/apps/frp/IndexView.vue @@ -31,21 +31,13 @@ const statusStr = computed(() => { }) const getStatus = async () => { - await systemctl.status('frps').then((res: any) => { - status.value.frps = res.data - }) - await systemctl.status('frpc').then((res: any) => { - status.value.frpc = res.data - }) + status.value.frps = await systemctl.status('frps') + status.value.frpc = await systemctl.status('frpc') } const getIsEnabled = async () => { - await systemctl.isEnabled('frps').then((res: any) => { - isEnabled.value.frps = res.data - }) - await systemctl.isEnabled('frpc').then((res: any) => { - isEnabled.value.frpc = res.data - }) + isEnabled.value.frps = await systemctl.isEnabled('frps') + isEnabled.value.frpc = await systemctl.isEnabled('frpc') } const getConfig = async () => { @@ -53,9 +45,12 @@ const getConfig = async () => { config.value.frpc = await frp.config('frpc') } -const handleSaveConfig = async (service: string) => { - await frp.saveConfig(service, config.value[service as keyof typeof config.value]) - window.$message.success('保存成功') +const handleSaveConfig = (service: string) => { + useRequest(frp.saveConfig(service, config.value[service as keyof typeof config.value])).onSuccess( + () => { + window.$message.success('保存成功') + } + ) } const handleStart = async (name: string) => { diff --git a/web/src/views/apps/gitea/IndexView.vue b/web/src/views/apps/gitea/IndexView.vue index 60fb595f..4ef07674 100644 --- a/web/src/views/apps/gitea/IndexView.vue +++ b/web/src/views/apps/gitea/IndexView.vue @@ -19,26 +19,21 @@ const statusStr = computed(() => { }) const getStatus = async () => { - await systemctl.status('gitea').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('gitea') } const getIsEnabled = async () => { - await systemctl.isEnabled('gitea').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('gitea') } const getConfig = async () => { - gitea.config().then((res: any) => { - config.value = res.data - }) + config.value = await gitea.config() } -const handleSaveConfig = async () => { - await gitea.saveConfig(config.value) - window.$message.success('保存成功') +const handleSaveConfig = () => { + useRequest(gitea.saveConfig(config.value)).onSuccess(() => { + window.$message.success('保存成功') + }) } const handleStart = async () => { diff --git a/web/src/views/apps/memcached/IndexView.vue b/web/src/views/apps/memcached/IndexView.vue index 64f20f22..0054ff99 100644 --- a/web/src/views/apps/memcached/IndexView.vue +++ b/web/src/views/apps/memcached/IndexView.vue @@ -6,7 +6,7 @@ defineOptions({ import Editor from '@guolao/vue-monaco-editor' import { NButton, NDataTable, NPopconfirm } from 'naive-ui' -import { getConfig, getLoad, updateConfig } from '@/api/apps/memcached' +import memcached from '@/api/apps/memcached' import systemctl from '@/api/panel/systemctl' const currentTab = ref('status') @@ -36,30 +36,26 @@ const loadColumns: any = [ } ] -const { data: load }: { data: any } = useRequest(getLoad, { +const { data: load } = useRequest(memcached.getLoad, { initialData: [] }) const getStatus = async () => { - await systemctl.status('memcached').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('memcached') } const getIsEnabled = async () => { - await systemctl.isEnabled('memcached').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('memcached') } -const { data: config }: { data: any } = useRequest(getConfig, { +const { data: config } = useRequest(memcached.getConfig, { initialData: { config: '' } }) -const handleSaveConfig = async () => { - useRequest(() => updateConfig(config.value)).onSuccess(() => { +const handleSaveConfig = () => { + useRequest(memcached.updateConfig(config.value)).onSuccess(() => { window.$message.success('保存成功') }) } diff --git a/web/src/views/apps/mysql/IndexView.vue b/web/src/views/apps/mysql/IndexView.vue index 96c95a2b..cf98ed3c 100644 --- a/web/src/views/apps/mysql/IndexView.vue +++ b/web/src/views/apps/mysql/IndexView.vue @@ -46,16 +46,12 @@ const getLoad = async () => { return data } -const getIsEnabled = async () => { - await systemctl.isEnabled('mysqld').then((res: any) => { - isEnabled.value = res.data - }) +const getStatus = async () => { + status.value = await systemctl.status('mysqld') } -const getStatus = async () => { - await systemctl.status('mysqld').then((res: any) => { - status.value = res.data - }) +const getIsEnabled = async () => { + isEnabled.value = await systemctl.isEnabled('mysqld') } const getRootPassword = async () => { diff --git a/web/src/views/apps/nginx/IndexView.vue b/web/src/views/apps/nginx/IndexView.vue index 3f97d997..32ae53ca 100644 --- a/web/src/views/apps/nginx/IndexView.vue +++ b/web/src/views/apps/nginx/IndexView.vue @@ -47,15 +47,11 @@ const getLoad = async () => { } const getStatus = async () => { - await systemctl.status('nginx').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('nginx') } const getIsEnabled = async () => { - await systemctl.isEnabled('nginx').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('nginx') } const getErrorLog = async () => { diff --git a/web/src/views/apps/php/PhpView.vue b/web/src/views/apps/php/PhpView.vue index 93686c92..51be070d 100644 --- a/web/src/views/apps/php/PhpView.vue +++ b/web/src/views/apps/php/PhpView.vue @@ -140,15 +140,11 @@ const getExtensions = async () => { } const getStatus = async () => { - await systemctl.status(`php-fpm-${version.value}`).then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status(`php-fpm-${version.value}`) } const getIsEnabled = async () => { - await systemctl.isEnabled(`php-fpm-${version.value}`).then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled(`php-fpm-${version.value}`) } const getErrorLog = async () => { diff --git a/web/src/views/apps/podman/IndexView.vue b/web/src/views/apps/podman/IndexView.vue index ac79cc49..b7cb1b42 100644 --- a/web/src/views/apps/podman/IndexView.vue +++ b/web/src/views/apps/podman/IndexView.vue @@ -20,15 +20,11 @@ const statusStr = computed(() => { }) const getStatus = async () => { - await systemctl.status('podman').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('podman') } const getIsEnabled = async () => { - await systemctl.isEnabled('podman').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('podman') } const getConfig = async () => { diff --git a/web/src/views/apps/postgresql/IndexView.vue b/web/src/views/apps/postgresql/IndexView.vue index 57d77353..4bcc674a 100644 --- a/web/src/views/apps/postgresql/IndexView.vue +++ b/web/src/views/apps/postgresql/IndexView.vue @@ -46,16 +46,12 @@ const getLoad = async () => { return data } -const getIsEnabled = async () => { - await systemctl.isEnabled('postgresql').then((res: any) => { - isEnabled.value = res.data - }) +const getStatus = async () => { + status.value = await systemctl.status('postgresql') } -const getStatus = async () => { - await systemctl.status('postgresql').then((res: any) => { - status.value = res.data - }) +const getIsEnabled = async () => { + isEnabled.value = await systemctl.isEnabled('postgresql') } const getLog = async () => { diff --git a/web/src/views/apps/pureftpd/IndexView.vue b/web/src/views/apps/pureftpd/IndexView.vue index 19a13398..30aee896 100644 --- a/web/src/views/apps/pureftpd/IndexView.vue +++ b/web/src/views/apps/pureftpd/IndexView.vue @@ -118,15 +118,11 @@ const userColumns: any = [ const users = ref([] as User[]) const getStatus = async () => { - await systemctl.status('pure-ftpd').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('pure-ftpd') } const getIsEnabled = async () => { - await systemctl.isEnabled('pure-ftpd').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('pure-ftpd') } const getPort = async () => { diff --git a/web/src/views/apps/redis/IndexView.vue b/web/src/views/apps/redis/IndexView.vue index eb108a56..c1b159bc 100644 --- a/web/src/views/apps/redis/IndexView.vue +++ b/web/src/views/apps/redis/IndexView.vue @@ -45,15 +45,11 @@ const getLoad = async () => { } const getStatus = async () => { - await systemctl.status('redis').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('redis') } const getIsEnabled = async () => { - await systemctl.isEnabled('redis').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('redis') } const getConfig = async () => { diff --git a/web/src/views/apps/rsync/IndexView.vue b/web/src/views/apps/rsync/IndexView.vue index 81f59d27..8d3f8380 100644 --- a/web/src/views/apps/rsync/IndexView.vue +++ b/web/src/views/apps/rsync/IndexView.vue @@ -155,15 +155,11 @@ const onPageSizeChange = (pageSize: number) => { } const getStatus = async () => { - await systemctl.status('rsyncd').then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status('rsyncd') } const getIsEnabled = async () => { - await systemctl.isEnabled('rsyncd').then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled('rsyncd') } const getConfig = async () => { diff --git a/web/src/views/apps/supervisor/IndexView.vue b/web/src/views/apps/supervisor/IndexView.vue index 3e3b7e1b..fd8717cb 100644 --- a/web/src/views/apps/supervisor/IndexView.vue +++ b/web/src/views/apps/supervisor/IndexView.vue @@ -237,15 +237,11 @@ const onPageSizeChange = (pageSize: number) => { } const getStatus = async () => { - await systemctl.status(serviceName.value).then((res: any) => { - status.value = res.data - }) + status.value = await systemctl.status(serviceName.value) } const getIsEnabled = async () => { - await systemctl.isEnabled(serviceName.value).then((res: any) => { - isEnabled.value = res.data - }) + isEnabled.value = await systemctl.isEnabled(serviceName.value) } const getConfig = async () => {