feat: add reset password function to user list page

api/handler/admin/user_handler.go

@@ -28,12 +28,24 @@ func NewUserHandler(app *core.AppServer, db *gorm.DB) *UserHandler {
 func (h *UserHandler) List(c *gin.Context) {
 	page := h.GetInt(c, "page", 1)
 	pageSize := h.GetInt(c, "page_size", 20)
+	mobile := h.GetTrim(c, "mobile")
+	username := h.GetTrim(c, "username")
+
 	offset := (page - 1) * pageSize
 	var items []model.User
 	var users = make([]vo.User, 0)
 	var total int64
-	h.db.Model(&model.User{}).Count(&total)
+
-	res := h.db.Offset(offset).Limit(pageSize).Find(&items)
+	session := h.db.Session(&gorm.Session{})
+	if mobile != "" {
+		session = session.Where("mobile LIKE ?", "%"+mobile+"%")
+	}
+	if username != "" {
+		session = session.Where("username LIKE ?", "%"+username+"%")
+	}
+
+	session.Model(&model.User{}).Count(&total)
+	res := session.Offset(offset).Limit(pageSize).Find(&items)
 	if res.Error == nil {
 		for _, item := range items {
 			var user vo.User
@@ -83,6 +95,34 @@ func (h *UserHandler) Update(c *gin.Context) {
 	resp.SUCCESS(c)
 }
 
+// ResetPass 重置密码
+func (h *UserHandler) ResetPass(c *gin.Context) {
+	var data struct {
+		Id       uint
+		Password string
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+
+	var user model.User
+	res := h.db.First(&user, data.Id)
+	if res.Error != nil {
+		resp.ERROR(c, "No user found")
+		return
+	}
+
+	password := utils.GenPassword(data.Password, user.Salt)
+	user.Password = password
+	res = h.db.Updates(&user)
+	if res.Error != nil {
+		resp.ERROR(c)
+	} else {
+		resp.SUCCESS(c)
+	}
+}
+
 func (h *UserHandler) Remove(c *gin.Context) {
 	id := h.GetInt(c, "id", 0)
 	if id > 0 {

api/main.go

@@ -218,6 +218,7 @@ func main() {
 			group.POST("update", h.Update)
 			group.GET("remove", h.Remove)
 			group.GET("loginLog", h.LoginLog)
+			group.POST("resetPass", h.ResetPass)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.ChatRoleHandler) {
 			group := s.Engine.Group("/api/admin/role/")

docker/docker-compose.yaml

@@ -2,8 +2,7 @@ version: '3'
 services:
   # 后端 API 程序
   chatgpt-plus-go:
-    image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:v3.0.4
+    image: chatgpt-plus-go:v3.0.5
-    #    image: chatgpt-plus-go:v3.0.2
     container_name: chatgpt-plus-go
     restart: always
     environment:
@@ -17,13 +16,13 @@ services:
 
   # 前端应用
   chatgpt-vue:
-    image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:v3.0.4
+    image: chatgpt-plus-vue:v3.0.5
-    #    image: chatgpt-plus-vue:v3.0.2
     container_name: chatgpt-plus-vue
     restart: always
     ports:
       - "8080:8080"
     volumes:
+      - /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime
       - ./logs/nginx:/var/log/nginx
       - ./conf/nginx/conf.d:/etc/nginx/conf.d
       - ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf

web/src/views/admin/RoleList.vue

@@ -36,7 +36,7 @@
           </template>
         </el-table-column>
         <el-table-column label="打招呼信息" prop="hello_msg"/>
-        <el-table-column label="操作" width="180" align="right">
+        <el-table-column label="操作" width="150" align="right">
           <template #default="scope">
             <el-button size="small" type="primary" @click="rowEdit(scope.$index, scope.row)">编辑</el-button>
             <el-popconfirm title="确定要删除当前角色吗?" @confirm="removeRole(scope.row)">

web/src/views/admin/UserList.vue

@@ -1,5 +1,11 @@
 <template>
   <div class="container user-list" v-loading="loading">
+    <div class="handle-box">
+      <el-input v-model="query.username" placeholder="用户名" class="handle-input mr10"></el-input>
+      <el-input v-model="query.mobile" placeholder="手机号码" class="handle-input mr10"></el-input>
+      <el-button type="primary" :icon="Search" @click="handleSearch">搜索</el-button>
+    </div>
+
     <el-row>
       <el-table :data="users.items" border class="table" :row-key="row => row.id"
                 @selection-change="handleSelectionChange">
@@ -27,10 +33,13 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" width="180">
+        <el-table-column fixed="right" label="操作" width="200">
           <template #default="scope">
-            <el-button size="small" type="primary" @click="userEdit(scope.row)">编辑</el-button>
+            <el-button-group class="ml-4">
-            <el-button size="small" type="danger" @click="removeUser(scope.row)">删除</el-button>
+              <el-button size="small" type="primary" @click="userEdit(scope.row)">编辑</el-button>
+              <el-button size="small" type="danger" @click="removeUser(scope.row)">删除</el-button>
+              <el-button size="small" type="success" @click="resetPass(scope.row)">重置密码</el-button>
+            </el-button-group>
           </template>
         </el-table-column>
       </el-table>
@@ -101,6 +110,29 @@
             </span>
       </template>
     </el-dialog>
+
+    <el-dialog
+        v-model="showResetPassDialog"
+        title="重置密码"
+        width="50%"
+    >
+      <el-form label-width="100px" ref="userEditFormRef">
+        <el-form-item label="用户名：">
+          <el-input v-model="pass.username" autocomplete="off" readonly disabled/>
+        </el-form-item>
+
+        <el-form-item label="新密码：">
+          <el-input v-model="pass.password" autocomplete="off"/>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+            <span class="dialog-footer">
+              <el-button type="primary" @click="doResetPass">提交</el-button>
+            </span>
+      </template>
+
+    </el-dialog>
   </div>
 </template>
 
@@ -109,13 +141,17 @@ import {nextTick, onMounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage, ElMessageBox} from "element-plus";
 import {dateFormat, disabledDate, removeArrayItem} from "@/utils/libs";
+import {Plus, Search} from "@element-plus/icons-vue";
 
 // 变量定义
-const users = ref({page: 1, page_size: 15})
+const users = ref({page: 1, page_size: 15, items: []})
+const query = ref({username: '', mobile: '', page: 1, page_size: 15})
 
 const user = ref({chat_roles: []})
+const pass = ref({username: '', password: '', id: 0})
 const roles = ref([])
 const showUserEditDialog = ref(false)
+const showResetPassDialog = ref(false)
 const rules = reactive({
   nickname: [{required: true, message: '请输入昵称', trigger: 'change',}],
   calls: [
@@ -143,7 +179,9 @@ onMounted(() => {
 })
 
 const fetchUserList = function (page, pageSize) {
-  httpGet('/api/admin/user/list', {page: page, page_size: pageSize}).then((res) => {
+  query.value.page = page
+  query.value.page_size = pageSize
+  httpGet('/api/admin/user/list', query.value).then((res) => {
     if (res.data) {
       // 初始化数据
       const arr = res.data.items;
@@ -160,6 +198,10 @@ const fetchUserList = function (page, pageSize) {
   })
 }
 
+const handleSearch = () => {
+  fetchUserList(users.value.page, users.value.page_size)
+}
+
 // 删除用户
 const removeUser = function (user) {
   ElMessageBox.confirm(
@@ -212,11 +254,38 @@ const handleSelectionChange = function (rows) {
   // TODO: 批量删除操作
   console.log(rows)
 }
+
+const resetPass = (row) => {
+  showResetPassDialog.value = true
+  pass.value.id = row.id
+  pass.value.username = row.username
+}
+
+const doResetPass = () => {
+  httpPost('/api/admin/user/resetPass', pass.value).then(() => {
+    ElMessage.success('操作成功！')
+    showResetPassDialog.value = false
+  }).catch((e) => {
+    ElMessage.error('操作失败，' + e.message)
+  })
+}
+
 </script>
 
 <style lang="stylus" scoped>
 .user-list {
 
+  .handle-box {
+    .handle-input {
+      max-width 150px;
+      margin-right 10px;
+    }
+  }
+
+  .table {
+    width 100%
+  }
+
   .opt-box {
     padding-bottom: 10px;
 

web/src/views/admin/demo/Table.vue

@@ -11,8 +11,8 @@
         <el-button type="primary" :icon="Search" @click="handleSearch">搜索</el-button>
         <el-button type="primary" :icon="Plus">新增</el-button>
       </div>
-      <el-table :data="tableData" border class="table" ref="multipleTable" header-cell-class-name="table-header">
+      <el-table :data="tableData" border class="table" style="width: 100%" header-cell-class-name="table-header">
-        <el-table-column prop="id" label="ID" width="55" align="center"></el-table-column>
+        <el-table-column prop="id" fixed label="ID" width="55" align="center"></el-table-column>
         <el-table-column prop="name" label="姓名"></el-table-column>
         <el-table-column label="头像(查看大图)" align="center">
           <template #default="scope">
@@ -38,7 +38,7 @@
         </el-table-column>
 
         <el-table-column prop="date" label="注册时间"></el-table-column>
-        <el-table-column label="操作" width="220" align="center">
+        <el-table-column label="操作" fixed="right" align="center">
           <template #default="scope">
             <el-button text :icon="Edit" @click="handleEdit(scope.$index, scope.row)">
               编辑