Browse Source

同步角色用户缓存

hsun 1 year ago
parent
commit
3d1fa5d307
3 changed files with 44 additions and 0 deletions
  1. 18 0
      controllers/sys_admin.go
  2. 24 0
      controllers/sys_role.go
  3. 2 0
      utils/constants.go

+ 18 - 0
controllers/sys_admin.go

@@ -489,6 +489,10 @@ func (this *SysAdminController) Add() {
 		br.ErrMsg = "新增失败,Err:" + err.Error()
 		br.ErrMsg = "新增失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
+
+	// 同步用户缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_USER_FROM_ETA, admin.AdminName)
+
 	err = services.UpdateResearcherTagGroup(admin.AdminId, req.ResearchGroupIds)
 	err = services.UpdateResearcherTagGroup(admin.AdminId, req.ResearchGroupIds)
 	if err != nil {
 	if err != nil {
 		br.Msg = "新增失败"
 		br.Msg = "新增失败"
@@ -684,6 +688,10 @@ func (this *SysAdminController) Edit() {
 		br.ErrMsg = "更新用户信息失败, Err:" + e.Error()
 		br.ErrMsg = "更新用户信息失败, Err:" + e.Error()
 		return
 		return
 	}
 	}
+
+	// 同步用户缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_USER_FROM_ETA, adminInfo.AdminName)
+
 	// 用户登出
 	// 用户登出
 	logOutSystemUser(adminInfo.AdminId)
 	logOutSystemUser(adminInfo.AdminId)
 
 
@@ -750,6 +758,9 @@ func (this *SysAdminController) EditEnabled() {
 		}
 		}
 	}
 	}
 
 
+	// 同步用户缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_USER_FROM_ETA, adminItem.AdminName)
+
 	//用户被禁用的情况下,需要将他对应的token给过期
 	//用户被禁用的情况下,需要将他对应的token给过期
 	if adminItem.Enabled == 1 && req.Enabled == 0 {
 	if adminItem.Enabled == 1 && req.Enabled == 0 {
 		logOutSystemUser(adminItem.AdminId)
 		logOutSystemUser(adminItem.AdminId)
@@ -805,6 +816,10 @@ func (this *SysAdminController) Delete() {
 		br.ErrMsg = "删除失败,Err:" + err.Error()
 		br.ErrMsg = "删除失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
+
+	// 同步用户缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_USER_FROM_ETA, adminInfo.AdminName)
+
 	// 删除手工数据关联用户
 	// 删除手工数据关联用户
 	{
 	{
 		go data_manage.DeleteManualUser(req.AdminId)
 		go data_manage.DeleteManualUser(req.AdminId)
@@ -1040,6 +1055,9 @@ func (this *SysAdminController) Move() {
 		}
 		}
 	}
 	}
 
 
+	// 同步用户缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_USER_FROM_ETA, adminInfo.AdminName)
+
 	// 清除系统用户列表缓存key
 	// 清除系统用户列表缓存key
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)

+ 24 - 0
controllers/sys_role.go

@@ -61,6 +61,10 @@ func (this *SysRoleController) Add() {
 		br.ErrMsg = "新增失败,Err:" + err.Error()
 		br.ErrMsg = "新增失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
+
+	// 同步角色缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_ROLE_FROM_ETA, item.RoleName)
+
 	br.Ret = 200
 	br.Ret = 200
 	br.Success = true
 	br.Success = true
 	br.Msg = "新增成功"
 	br.Msg = "新增成功"
@@ -112,6 +116,10 @@ func (this *SysRoleController) Edit() {
 		br.ErrMsg = "修改失败,Err:" + err.Error()
 		br.ErrMsg = "修改失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
+
+	// 同步角色缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_ROLE_FROM_ETA, item.RoleName)
+
 	br.Ret = 200
 	br.Ret = 200
 	br.Success = true
 	br.Success = true
 	br.IsAddLog = true
 	br.IsAddLog = true
@@ -141,12 +149,28 @@ func (this *SysRoleController) Delete() {
 		br.ErrMsg = "参数错误,GroupId 小于等于0 "
 		br.ErrMsg = "参数错误,GroupId 小于等于0 "
 		return
 		return
 	}
 	}
+
+	role, e := system.GetSysRoleById(req.RoleId)
+	if e != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Msg = "角色不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "删除失败"
+		br.ErrMsg = "获取角色信息失败, Err: " + e.Error()
+		return
+	}
+
 	err = system.DeleteSysRole(req.RoleId)
 	err = system.DeleteSysRole(req.RoleId)
 	if err != nil {
 	if err != nil {
 		br.Msg = "删除失败"
 		br.Msg = "删除失败"
 		br.ErrMsg = "删除失败,Err:" + err.Error()
 		br.ErrMsg = "删除失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
+
+	// 同步角色缓存
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_SYS_ROLE_FROM_ETA, role.RoleName)
+
 	br.Ret = 200
 	br.Ret = 200
 	br.Success = true
 	br.Success = true
 	br.IsAddLog = true
 	br.IsAddLog = true

+ 2 - 0
utils/constants.go

@@ -204,6 +204,8 @@ const (
 	CACHE_KEY_DAYNEW_REFRESH          = "admin:day_new:refresh"               //每日资讯拉取企业微信聊天记录
 	CACHE_KEY_DAYNEW_REFRESH          = "admin:day_new:refresh"               //每日资讯拉取企业微信聊天记录
 	CACHE_KEY_DAYNEW_TRANSLATE        = "admin:day_new:translate"             //每日资讯中翻英
 	CACHE_KEY_DAYNEW_TRANSLATE        = "admin:day_new:translate"             //每日资讯中翻英
 	CACHE_KEY_ADMIN_OPERATE_RECORD    = "HZ_ADMIN_CACHE_ADMIN_OPERATE_RECORD" //系统用户操作日志队列
 	CACHE_KEY_ADMIN_OPERATE_RECORD    = "HZ_ADMIN_CACHE_ADMIN_OPERATE_RECORD" //系统用户操作日志队列
+	CACHE_SYNC_SYS_USER_FROM_ETA      = "hz_crm_eta:eta_admin_sync"           // 同步用户的缓存队列key
+	CACHE_SYNC_SYS_ROLE_FROM_ETA      = "hz_crm_eta:eta_role_sync"            // 同步角色的缓存队列key
 )
 )
 
 
 // 模板消息推送类型
 // 模板消息推送类型