Merge pull request #1133 from yesgs/main

添加用户的冻结功能

server/api/v1/system/sys_user.go

@@ -35,6 +35,11 @@ func (b *BaseApi) Login(c *gin.Context) {
 			global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
 			response.FailWithMessage("用户名不存在或者密码错误", c)
 		} else {
+			if user.Enable != 1 {
+				global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
+				response.FailWithMessage("用户被禁止登录", c)
+				return
+			}
 			b.TokenNext(c, *user)
 		}
 	} else {
@@ -119,7 +124,7 @@ func (b *BaseApi) Register(c *gin.Context) {
 			AuthorityId: v,
 		})
 	}
-	user := &system.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId, Authorities: authorities}
+	user := &system.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId, Authorities: authorities, Enable: r.Enable}
 	userReturn, err := userService.Register(*user)
 	if err != nil {
 		global.GVA_LOG.Error("注册失败!", zap.Error(err))
@@ -296,6 +301,7 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 		Phone:     user.Phone,
 		Email:     user.Email,
 		SideMode:  user.SideMode,
+		Enable:    user.Enable,
 	}); err != nil {
 		global.GVA_LOG.Error("设置失败!", zap.Error(err))
 		response.FailWithMessage("设置失败", c)
@@ -325,6 +331,7 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 		Phone:     user.Phone,
 		Email:     user.Email,
 		SideMode:  user.SideMode,
+		Enable:    user.Enable,
 	}); err != nil {
 		global.GVA_LOG.Error("设置失败!", zap.Error(err))
 		response.FailWithMessage("设置失败", c)

server/middleware/jwt.go

@@ -44,6 +44,8 @@ func JWTAuth() gin.HandlerFunc {
 			c.Abort()
 			return
 		}
+
+		// 已登录用户被管理员禁用 需要使该用户的jwt失效 此处比较消耗性能 如果需要 请自行打开
 		// 用户被删除的逻辑 需要优化 此处比较消耗性能 如果需要 请自行打开
 		//if err, _ = userService.FindUserByUuid(claims.UUID.String()); err != nil {
 		//	_ = jwtService.JsonInBlacklist(system.JwtBlacklist{Jwt: token})

server/model/system/request/sys_user.go

@@ -9,6 +9,7 @@ type Register struct {
 	NickName     string   `json:"nickName" gorm:"default:'QMPlusUser'"`
 	HeaderImg    string   `json:"headerImg" gorm:"default:'https://qmplusimg.henrongyi.top/gva_header.jpg'"`
 	AuthorityId  string   `json:"authorityId" gorm:"default:888"`
+	Enable       int      `json:"enable"`
 	AuthorityIds []string `json:"authorityIds"`
 }
 
@@ -46,5 +47,6 @@ type ChangeUserInfo struct {
 	Email        string               `json:"email"  gorm:"comment:用户邮箱"`                                                           // 用户邮箱
 	HeaderImg    string               `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
 	SideMode     string               `json:"sideMode"  gorm:"comment:用户侧边主题"`                                                      // 用户侧边主题
+	Enable       int                  `json:"enable" gorm:"comment:冻结用户"`                                                           //冻结用户
 	Authorities  []model.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
 }

server/model/system/sys_user.go

@@ -18,8 +18,9 @@ type SysUser struct {
 	AuthorityId string         `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
 	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
 	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
-	Phone       string         `json:"phone"  gorm:"comment:用户手机号"` // 用户手机号
-	Email       string         `json:"email"  gorm:"comment:用户邮箱"`  // 用户邮箱
+	Phone       string         `json:"phone"  gorm:"comment:用户手机号"`                     // 用户手机号
+	Email       string         `json:"email"  gorm:"comment:用户邮箱"`                      // 用户邮箱
+	Enable      int            `json:"enable" gorm:"default:1;comment:用户是否被冻结 1正常 2冻结"` //用户是否被冻结 1正常 2冻结
 }
 
 func (SysUser) TableName() string {

web/src/view/superAdmin/user/user.vue

@@ -33,6 +33,17 @@
             />
           </template>
         </el-table-column>
+        <el-table-column align="left" label="启用" min-width="150">
+          <template #default="scope">
+            <el-switch
+              v-model="scope.row.enable"
+              inline-prompt
+              :active-value="1"
+              :inactive-value="2"
+              @change="()=>{switchEnable(scope.row)}"
+            />
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" min-width="250" fixed="right">
           <template #default="scope">
@@ -99,6 +110,14 @@
               :clearable="false"
             />
           </el-form-item>
+          <el-form-item label="启用" prop="disabled">
+            <el-switch
+              v-model="userInfo.enable"
+              inline-prompt
+              :active-value="1"
+              :inactive-value="2"
+            />
+          </el-form-item>
           <el-form-item label="头像" label-width="80px">
             <div style="display:inline-block" @click="openHeaderChange">
               <img v-if="userInfo.headerImg" class="header-img-box" :src="(userInfo.headerImg && userInfo.headerImg.slice(0, 4) !== 'http')?path+userInfo.headerImg:userInfo.headerImg">
@@ -268,6 +287,7 @@ const userInfo = ref({
   headerImg: '',
   authorityId: '',
   authorityIds: [],
+  enable: 1,
 })
 
 const rules = ref({
@@ -349,6 +369,22 @@ const openEdit = (row) => {
   addUserDialog.value = true
 }
 
+
+const switchEnable = async(row) => {
+  userInfo.value = JSON.parse(JSON.stringify(row))
+  await nextTick()
+  const req = {
+    ...userInfo.value
+  }
+  const res = await setUserInfo(req)
+  if (res.code === 0) {
+    ElMessage({ type: 'success', message: '编辑成功' })
+    await getTableData()
+    userInfo.value.headerImg = ''
+    userInfo.value.authorityIds = []
+  }
+}
+
 </script>
 
 <style lang="scss">