refactor(redis): 重命名 RedisHelper 为 CsRedisHelper

重命名 RedisHelper 类为 CsRedisHelper,以更好地反映其作为框架组件的性质。同时更新了相关引用和文件名。

- 修改了 RedisHelper.java 文件名和类名为 CsRedisHelper
- 更新了 PipelineInstanceDAO、SystemAuthController、SystemUserInfoDAO 等多个类中的 RedisHelper 引用
-调整了 ExecutionJobBean 中 RedisHelper 的使用
This commit is contained in:
2025-07-31 20:14:44 +08:00
parent 3fd9da3e1f
commit b8a5fe4157
17 changed files with 36 additions and 23 deletions
@@ -19,7 +19,11 @@
:key="index" :key="index"
:label="column.label" :label="column.label"
:prop="column.prop" :prop="column.prop"
:fixed="column.fixed ? column.fixed:false"
:formatter="column.formatter ? column.formatter : null" :formatter="column.formatter ? column.formatter : null"
:width="column.width ? column.width:null"
:min-width="column.width ? column.width:null"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
v-if="crud.operateColumn" v-if="crud.operateColumn"
@@ -58,7 +62,7 @@ export default {
default: null default: null
}, },
operateColumn: { operateColumn: {
type: Object, type: [Object, Boolean],
required: true, required: true,
default: null default: null
}, },
@@ -5,6 +5,7 @@
:width="width" :width="width"
:fullscreen="fullscreen" :fullscreen="fullscreen"
:before-close="beforeClose" :before-close="beforeClose"
:modal="false"
> >
<div class="container-form"> <div class="container-form">
<el-form ref="form" :model="form.model" :rules="form.rules"> <el-form ref="form" :model="form.model" :rules="form.rules">
@@ -8,6 +8,7 @@
:close-on-press-escape="false" :close-on-press-escape="false"
:destroy-on-close="true" :destroy-on-close="true"
:show-close="false" :show-close="false"
:modal="false"
> >
<div class="container-form"> <div class="container-form">
<el-form ref="form" :model="form.model" :rules="form.rules"> <el-form ref="form" :model="form.model" :rules="form.rules">
@@ -8,6 +8,7 @@
:close-on-press-escape="false" :close-on-press-escape="false"
:destroy-on-close="true" :destroy-on-close="true"
:show-close="false" :show-close="false"
:modal="false"
> >
<!-- 这里是插槽,用于渲染传入的组件 --> <!-- 这里是插槽,用于渲染传入的组件 -->
<slot /> <slot />
@@ -19,7 +19,11 @@
:key="index" :key="index"
:label="column.label" :label="column.label"
:prop="column.prop" :prop="column.prop"
:fixed="column.fixed ? column.fixed:false"
:formatter="column.formatter ? column.formatter : null" :formatter="column.formatter ? column.formatter : null"
:width="column.width ? column.width:null"
:min-width="column.width ? column.width:null"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
v-if="crud.operateColumn" v-if="crud.operateColumn"
@@ -57,7 +61,7 @@ export default {
default: null default: null
}, },
operateColumn: { operateColumn: {
type: Object, type: [Object, Boolean],
required: true, required: true,
default: null default: null
}, },
@@ -33,12 +33,12 @@ import java.util.stream.Collectors;
@Component @Component
@SuppressWarnings({"unchecked", "all"}) @SuppressWarnings({"unchecked", "all"})
public class RedisHelper { public class CsRedisHelper {
private static final Logger log = LoggerFactory.getLogger(RedisHelper.class); private static final Logger log = LoggerFactory.getLogger(CsRedisHelper.class);
private RedisTemplate<Object, Object> redisTemplate; private RedisTemplate<Object, Object> redisTemplate;
public RedisHelper(RedisTemplate<Object, Object> redisTemplate) { public CsRedisHelper(RedisTemplate<Object, Object> redisTemplate) {
this.redisTemplate = redisTemplate; this.redisTemplate = redisTemplate;
this.redisTemplate.setKeySerializer(new StringRedisSerializer()); this.redisTemplate.setKeySerializer(new StringRedisSerializer());
this.redisTemplate.setHashKeySerializer(new StringRedisSerializer()); this.redisTemplate.setHashKeySerializer(new StringRedisSerializer());
@@ -17,14 +17,14 @@ package cn.odboy.devops.dal.redis;
import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.framework.pipeline.constant.PipelineConst;
import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class PipelineInstanceDAO { public class PipelineInstanceDAO {
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
/** /**
* 全局锁,对应上下文,只能有一次 * 全局锁,对应上下文,只能有一次
@@ -74,6 +74,7 @@ public class PipelineInstanceNodeServiceImpl extends ServiceImpl<PipelineInstanc
updateById(pipelineInstanceNode); updateById(pipelineInstanceNode);
} }
@Override
public PipelineInstanceNodeTb getPipelineInstanceNodeByArgs(Long instanceId, String code) { public PipelineInstanceNodeTb getPipelineInstanceNodeByArgs(Long instanceId, String code) {
return one(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class).eq(PipelineInstanceNodeTb::getInstanceId, instanceId) return one(new LambdaQueryChainWrapper<>(getBaseMapper(), PipelineInstanceNodeTb.class).eq(PipelineInstanceNodeTb::getInstanceId, instanceId)
.eq(PipelineInstanceNodeTb::getCode, code)); .eq(PipelineInstanceNodeTb::getCode, code));
@@ -7,7 +7,7 @@ import cn.odboy.constant.CaptchaCodeEnum;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.dal.model.SystemUserInfoVo; import cn.odboy.system.dal.model.SystemUserInfoVo;
import cn.odboy.system.dal.model.SystemUserJwtVo; import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.system.dal.model.SystemUserLoginArgs; import cn.odboy.system.dal.model.SystemUserLoginArgs;
@@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit;
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "系统:系统授权接口") @Api(tags = "系统:系统授权接口")
public class SystemAuthController { public class SystemAuthController {
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
private final SystemUserOnlineInfoDAO onlineUserService; private final SystemUserOnlineInfoDAO onlineUserService;
private final TokenProvider tokenProvider; private final TokenProvider tokenProvider;
private final AppProperties properties; private final AppProperties properties;
@@ -1,7 +1,7 @@
package cn.odboy.system.dal.redis; package cn.odboy.system.dal.redis;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.dal.model.SystemUserJwtVo; import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.util.CsStringUtil; import cn.odboy.util.CsStringUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class SystemUserInfoDAO { public class SystemUserInfoDAO {
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
/** /**
* 添加缓存到Redis * 添加缓存到Redis
@@ -2,7 +2,7 @@ package cn.odboy.system.dal.redis;
import cn.odboy.base.CsPageResultVo; import cn.odboy.base.CsPageResultVo;
import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.dal.model.SystemUserJwtVo; import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.system.dal.model.SystemUserOnlineVo; import cn.odboy.system.dal.model.SystemUserOnlineVo;
import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.system.framework.permission.core.handler.TokenProvider;
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
public class SystemUserOnlineInfoDAO { public class SystemUserOnlineInfoDAO {
private final AppProperties properties; private final AppProperties properties;
private final TokenProvider tokenProvider; private final TokenProvider tokenProvider;
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
/** /**
* 保存在线用户信息 * 保存在线用户信息
@@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.dal.model.SystemUserJwtVo; import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.system.dal.redis.SystemRedisKey; import cn.odboy.system.dal.redis.SystemRedisKey;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
@@ -37,7 +37,7 @@ public class TokenProvider implements InitializingBean {
private Key signingKey; private Key signingKey;
private JwtParser jwtParser; private JwtParser jwtParser;
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
private final AppProperties properties; private final AppProperties properties;
public static final String AUTHORITIES_UUID_KEY = "uid"; public static final String AUTHORITIES_UUID_KEY = "uid";
public static final String AUTHORITIES_UID_KEY = "userId"; public static final String AUTHORITIES_UID_KEY = "userId";
@@ -7,7 +7,7 @@ import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateUtil; import cn.hutool.extra.template.TemplateUtil;
import cn.odboy.framework.context.CsSpringBeanHolder; import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.framework.quartz.core.QuartzRunnable; import cn.odboy.framework.quartz.core.QuartzRunnable;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.system.dal.model.SystemSendEmailArgs; import cn.odboy.system.dal.model.SystemSendEmailArgs;
@@ -40,7 +40,7 @@ public class ExecutionJobBean extends QuartzJobBean {
// 获取spring bean // 获取spring bean
SystemQuartzLogMapper quartzLogMapper = CsSpringBeanHolder.getBean(SystemQuartzLogMapper.class); SystemQuartzLogMapper quartzLogMapper = CsSpringBeanHolder.getBean(SystemQuartzLogMapper.class);
SystemQuartzJobService systemQuartzJobService = CsSpringBeanHolder.getBean(SystemQuartzJobService.class); SystemQuartzJobService systemQuartzJobService = CsSpringBeanHolder.getBean(SystemQuartzJobService.class);
RedisHelper redisHelper = CsSpringBeanHolder.getBean(RedisHelper.class); CsRedisHelper redisHelper = CsSpringBeanHolder.getBean(CsRedisHelper.class);
String uuid = quartzJob.getUuid(); String uuid = quartzJob.getUuid();
@@ -363,8 +363,8 @@ public class SystemDeptService {
SystemProductLineVo dto = new SystemProductLineVo(); SystemProductLineVo dto = new SystemProductLineVo();
dto.setValue(dept.getId()); dto.setValue(dept.getId());
dto.setIdPath(pathIds.stream().map(String::valueOf).collect(Collectors.joining("-"))); dto.setIdPath(pathIds.stream().map(String::valueOf).collect(Collectors.joining("-")));
dto.setLabel(buildNamePath(dept, deptMap)); // 保留名称路径用于显示 // 保留名称路径用于显示
dto.setLabel(buildNamePath(dept, deptMap));
options.add(dto); options.add(dto);
} }
@@ -6,7 +6,7 @@ import cn.hutool.extra.mail.Mail;
import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailAccount;
import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.constant.SystemCaptchaBizEnum; import cn.odboy.system.constant.SystemCaptchaBizEnum;
import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
import cn.odboy.system.dal.model.SystemSendEmailArgs; import cn.odboy.system.dal.model.SystemSendEmailArgs;
@@ -26,7 +26,7 @@ import java.util.Collections;
@RequiredArgsConstructor @RequiredArgsConstructor
public class SystemEmailService { public class SystemEmailService {
private final SystemEmailConfigMapper systemEmailConfigMapper; private final SystemEmailConfigMapper systemEmailConfigMapper;
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
private final AppProperties properties; private final AppProperties properties;
@Value("${spring.application.title}") @Value("${spring.application.title}")
private String applicationTitle; private String applicationTitle;
@@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResultVo; import cn.odboy.base.CsPageResultVo;
import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.redis.RedisHelper; import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs;
@@ -32,7 +32,7 @@ public class SystemQuartzJobService {
private final SystemQuartzJobMapper systemQuartzJobMapper; private final SystemQuartzJobMapper systemQuartzJobMapper;
private final SystemQuartzLogMapper systemQuartzLogMapper; private final SystemQuartzLogMapper systemQuartzLogMapper;
private final QuartzManage quartzManage; private final QuartzManage quartzManage;
private final RedisHelper redisHelper; private final CsRedisHelper redisHelper;
/** /**
* 创建 * 创建
@@ -122,6 +122,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
* *
* @param ids / * @param ids /
*/ */
@Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void removeFileByIds(Long[] ids) { public void removeFileByIds(Long[] ids) {
for (Long id : ids) { for (Long id : ids) {