From b8fcfe2e7cded75ddb9b005b7c528c6d67bd68d5 Mon Sep 17 00:00:00 2001 From: "chenzf@pvc123.com" Date: Tue, 12 Mar 2024 21:16:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E8=B6=85=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E4=B8=8D=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/handler/admin/admin_user_handler.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/api/handler/admin/admin_user_handler.go b/api/handler/admin/admin_user_handler.go index 20312ed5..c7b2045a 100644 --- a/api/handler/admin/admin_user_handler.go +++ b/api/handler/admin/admin_user_handler.go @@ -8,6 +8,7 @@ import ( "chatplus/store/vo" "chatplus/utils" "chatplus/utils/resp" + "github.com/gin-gonic/gin" "gorm.io/gorm" ) @@ -73,6 +74,13 @@ func (h *SysUserHandler) Save(c *gin.Context) { resp.ERROR(c, types.InvalidArgs) return } + + // 默认id为1是超级管理员 + if data.Id == 1 { + resp.ERROR(c, "超级管理员不支持更新") + return + } + var user = model.AdminUser{} var res *gorm.DB var userVo vo.AdminUser @@ -136,7 +144,13 @@ func (h *SysUserHandler) ResetPass(c *gin.Context) { // Remove 删除 func (h *SysUserHandler) Remove(c *gin.Context) { id := h.GetInt(c, "id", 0) + if id > 0 { + // 默认id为1是超级管理员 + if id == 1 { + resp.ERROR(c, "超级管理员不能删除") + return + } res := h.db.Where("id = ?", id).Delete(&model.AdminUser{}) if res.Error != nil { resp.ERROR(c, "删除失败") From c920d8423df8e1a0c82a474331e31f5cbe96232d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=96=E5=BD=A6=E6=A3=8B?= Date: Wed, 13 Mar 2024 08:44:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(ui):=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SearchTable/useAsyncTable.ts | 2 +- .../src/views/Role/RoleContainer.vue | 2 +- .../src/views/SysAdmin/SysAdminContainer.vue | 20 ++++++++++--------- .../src/views/User/UserContainer.vue | 4 ++++ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gpt-vue/projects/vue-admin/src/components/SearchTable/useAsyncTable.ts b/gpt-vue/projects/vue-admin/src/components/SearchTable/useAsyncTable.ts index 0e0ebbd3..a381c071 100644 --- a/gpt-vue/projects/vue-admin/src/components/SearchTable/useAsyncTable.ts +++ b/gpt-vue/projects/vue-admin/src/components/SearchTable/useAsyncTable.ts @@ -11,7 +11,7 @@ function useAsyncTable>( ): TableReturn { const paginationState = reactive({ current: 1, - pageSize: 10, + pageSize: 20, total: 0, }); diff --git a/gpt-vue/projects/vue-admin/src/views/Role/RoleContainer.vue b/gpt-vue/projects/vue-admin/src/views/Role/RoleContainer.vue index 7f917b1c..8d83be79 100644 --- a/gpt-vue/projects/vue-admin/src/views/Role/RoleContainer.vue +++ b/gpt-vue/projects/vue-admin/src/views/Role/RoleContainer.vue @@ -37,7 +37,7 @@ const columns = [ const expandable = reactive({ title: "", - width: 80, + width: 50, }); // 数据 diff --git a/gpt-vue/projects/vue-admin/src/views/SysAdmin/SysAdminContainer.vue b/gpt-vue/projects/vue-admin/src/views/SysAdmin/SysAdminContainer.vue index b559059d..d2be7383 100644 --- a/gpt-vue/projects/vue-admin/src/views/SysAdmin/SysAdminContainer.vue +++ b/gpt-vue/projects/vue-admin/src/views/SysAdmin/SysAdminContainer.vue @@ -100,16 +100,18 @@ const handleRemove = async (id, reload) => { /> diff --git a/gpt-vue/projects/vue-admin/src/views/User/UserContainer.vue b/gpt-vue/projects/vue-admin/src/views/User/UserContainer.vue index cf8ef9f4..bec88e81 100644 --- a/gpt-vue/projects/vue-admin/src/views/User/UserContainer.vue +++ b/gpt-vue/projects/vue-admin/src/views/User/UserContainer.vue @@ -37,6 +37,7 @@ const columns: SearchTableColumns[] = [ { title: "过期时间", dataIndex: "expired_time", + width: 180, render: ({ record }) => { return dateFormat(record.expired_time); }, @@ -44,6 +45,7 @@ const columns: SearchTableColumns[] = [ { title: "注册时间", dataIndex: "created_at", + width: 180, render: ({ record }) => { return dateFormat(record.created_at); }, @@ -51,6 +53,8 @@ const columns: SearchTableColumns[] = [ { title: "操作", slotName: "actions", + width: 180, + fixed: "right", }, ]; From d6c93dd537d2827339b3759a553a3b4c8e3a6ef4 Mon Sep 17 00:00:00 2001 From: chenzifan Date: Wed, 13 Mar 2024 08:45:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/handler/admin/admin_user_handler.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/api/handler/admin/admin_user_handler.go b/api/handler/admin/admin_user_handler.go index 20312ed5..a9572dc3 100644 --- a/api/handler/admin/admin_user_handler.go +++ b/api/handler/admin/admin_user_handler.go @@ -135,9 +135,15 @@ func (h *SysUserHandler) ResetPass(c *gin.Context) { // Remove 删除 func (h *SysUserHandler) Remove(c *gin.Context) { - id := h.GetInt(c, "id", 0) - if id > 0 { - res := h.db.Where("id = ?", id).Delete(&model.AdminUser{}) + var data struct { + Id uint + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + if data.Id > 0 { + res := h.db.Where("id = ?", data.Id).Delete(&model.AdminUser{}) if res.Error != nil { resp.ERROR(c, "删除失败") return From e8d7ad58befd91a3e60c84a5d87aacb463314c26 Mon Sep 17 00:00:00 2001 From: chenzifan Date: Wed, 13 Mar 2024 08:47:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/handler/admin/admin_user_handler.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/api/handler/admin/admin_user_handler.go b/api/handler/admin/admin_user_handler.go index 8eebdb01..4a951ec3 100644 --- a/api/handler/admin/admin_user_handler.go +++ b/api/handler/admin/admin_user_handler.go @@ -8,7 +8,6 @@ import ( "chatplus/store/vo" "chatplus/utils" "chatplus/utils/resp" - "github.com/gin-gonic/gin" "gorm.io/gorm" ) @@ -150,15 +149,12 @@ func (h *SysUserHandler) Remove(c *gin.Context) { resp.ERROR(c, types.InvalidArgs) return } + // 默认id为1是超级管理员 + if data.Id == 1 { + resp.ERROR(c, "超级管理员不能删除") + return + } if data.Id > 0 { - - // 默认id为1是超级管理员 - if data.Id == 1 { - resp.ERROR(c, "超级管理员不能删除") - return - } - - res := h.db.Where("id = ?", data.Id).Delete(&model.AdminUser{}) if res.Error != nil { resp.ERROR(c, "删除失败")