diff --git a/internal/data/cron.go b/internal/data/cron.go index 553ce375..c405cd6b 100644 --- a/internal/data/cron.go +++ b/internal/data/cron.go @@ -40,7 +40,7 @@ func (r *cronRepo) Count() (int64, error) { func (r *cronRepo) List(page, limit uint) ([]*biz.Cron, int64, error) { var cron []*biz.Cron var total int64 - err := app.Orm.Model(&biz.Cert{}).Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&cron).Error + err := app.Orm.Model(&biz.Cron{}).Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&cron).Error return cron, total, err } diff --git a/internal/service/info.go b/internal/service/info.go index 892d5193..ae651faf 100644 --- a/internal/service/info.go +++ b/internal/service/info.go @@ -2,13 +2,13 @@ package service import ( "fmt" - "github.com/spf13/cast" "net/http" "regexp" "strings" "github.com/go-rat/chix" "github.com/hashicorp/go-version" + "github.com/spf13/cast" "github.com/TheTNB/panel/internal/app" "github.com/TheTNB/panel/internal/biz" diff --git a/web/src/api/apps/mysql/index.ts b/web/src/api/apps/mysql/index.ts index 427eb328..ed59b508 100644 --- a/web/src/api/apps/mysql/index.ts +++ b/web/src/api/apps/mysql/index.ts @@ -22,43 +22,5 @@ export default { rootPassword: (): Promise> => request.get('/apps/mysql/rootPassword'), // 修改 root 密码 setRootPassword: (password: string): Promise> => - request.post('/apps/mysql/rootPassword', { password }), - // 数据库列表 - databases: (page: number, limit: number): Promise> => - request.get('/apps/mysql/databases', { params: { page, limit } }), - // 创建数据库 - addDatabase: (database: any): Promise> => - request.post('/apps/mysql/databases', database), - // 删除数据库 - deleteDatabase: (database: string): Promise> => - request.delete('/apps/mysql/databases', { params: { database } }), - // 备份列表 - backups: (page: number, limit: number): Promise> => - request.get('/apps/mysql/backups', { params: { page, limit } }), - // 创建备份 - createBackup: (database: string): Promise> => - request.post('/apps/mysql/backups', { database }), - // 上传备份 - uploadBackup: (backup: any): Promise> => - request.put('/apps/mysql/backups', backup), - // 删除备份 - deleteBackup: (name: string): Promise> => - request.delete('/apps/mysql/backups', { params: { name } }), - // 还原备份 - restoreBackup: (backup: string, database: string): Promise> => - request.post('/apps/mysql/backups/restore', { backup, database }), - // 用户列表 - users: (page: number, limit: number): Promise> => - request.get('/apps/mysql/users', { params: { page, limit } }), - // 创建用户 - addUser: (user: any): Promise> => request.post('/apps/mysql/users', user), - // 删除用户 - deleteUser: (user: string): Promise> => - request.delete('/apps/mysql/users', { params: { user } }), - // 设置用户密码 - setUserPassword: (user: string, password: string): Promise> => - request.post('/apps/mysql/users/password', { user, password }), - // 设置用户权限 - setUserPrivileges: (user: string, database: string): Promise> => - request.post('/apps/mysql/users/privileges', { user, database }) + request.post('/apps/mysql/rootPassword', { password }) } diff --git a/web/src/api/apps/postgresql/index.ts b/web/src/api/apps/postgresql/index.ts index d36a662e..1764009e 100644 --- a/web/src/api/apps/postgresql/index.ts +++ b/web/src/api/apps/postgresql/index.ts @@ -18,40 +18,5 @@ export default { // 获取日志 log: (): Promise> => request.get('/apps/postgresql/log'), // 清空错误日志 - clearLog: (): Promise> => request.post('/apps/postgresql/clearLog'), - // 数据库列表 - databases: (page: number, limit: number): Promise> => - request.get('/apps/postgresql/databases', { params: { page, limit } }), - // 创建数据库 - addDatabase: (database: any): Promise> => - request.post('/apps/postgresql/databases', database), - // 删除数据库 - deleteDatabase: (database: string): Promise> => - request.delete('/apps/postgresql/databases', { params: { database } }), - // 备份列表 - backups: (page: number, limit: number): Promise> => - request.get('/apps/postgresql/backups', { params: { page, limit } }), - // 创建备份 - createBackup: (database: string): Promise> => - request.post('/apps/postgresql/backups', { database }), - // 上传备份 - uploadBackup: (backup: any): Promise> => - request.put('/apps/postgresql/backups', backup), - // 删除备份 - deleteBackup: (name: string): Promise> => - request.delete('/apps/postgresql/backups', { params: { name } }), - // 还原备份 - restoreBackup: (backup: string, database: string): Promise> => - request.post('/apps/postgresql/backups/restore', { backup, database }), - // 角色列表 - roles: (page: number, limit: number): Promise> => - request.get('/apps/postgresql/roles', { params: { page, limit } }), - // 创建角色 - addRole: (user: any): Promise> => request.post('/apps/postgresql/roles', user), - // 删除角色 - deleteRole: (user: string): Promise> => - request.delete('/apps/postgresql/roles', { params: { user } }), - // 设置角色密码 - setRolePassword: (user: string, password: string): Promise> => - request.post('/apps/postgresql/roles/password', { user, password }) + clearLog: (): Promise> => request.post('/apps/postgresql/clearLog') } diff --git a/web/src/api/panel/cron/index.ts b/web/src/api/panel/cron/index.ts index b9460897..47377a1d 100644 --- a/web/src/api/panel/cron/index.ts +++ b/web/src/api/panel/cron/index.ts @@ -5,19 +5,19 @@ import { request } from '@/utils' export default { // 获取任务列表 list: (page: number, limit: number): Promise> => - request.get('/cron/list', { params: { page, limit } }), + request.get('/cron', { params: { page, limit } }), // 获取任务脚本 - script: (id: number): Promise> => request.get('/cron/' + id), - // 添加任务 - add: (task: any): Promise> => request.post('/cron/add', task), + get: (id: number): Promise> => request.get('/cron/' + id), + // 创建任务 + create: (task: any): Promise> => request.post('/cron', task), // 修改任务 update: (id: number, name: string, time: string, script: string): Promise> => request.put('/cron/' + id, { name, time, script }), // 删除任务 delete: (id: number): Promise> => request.delete('/cron/' + id), // 获取任务日志 - log: (id: number): Promise> => request.get('/cron/log/' + id), + log: (id: number): Promise> => request.get('/cron/' + id + '/log'), // 修改任务状态 status: (id: number, status: boolean): Promise> => - request.post('/cron/status', { id, status }) + request.post('/cron/' + id + '/status', { status }) } diff --git a/web/src/i18n/zh_CN.json b/web/src/i18n/zh_CN.json index f0bb10b8..58e7ed9e 100644 --- a/web/src/i18n/zh_CN.json +++ b/web/src/i18n/zh_CN.json @@ -348,8 +348,8 @@ "actions": "操作" }, "create": { - "trigger": "新建网站", - "title": "新建网站", + "trigger": "创建网站", + "title": "创建网站", "fields": { "name": { "label": "网站名", diff --git a/web/src/views/apps/mysql/IndexView.vue b/web/src/views/apps/mysql/IndexView.vue index 6527c7da..c784a1d1 100644 --- a/web/src/views/apps/mysql/IndexView.vue +++ b/web/src/views/apps/mysql/IndexView.vue @@ -1,17 +1,11 @@