diff --git a/cutejava-front/src/views/components/dev/CuteDragTable.vue b/cutejava-front/src/views/components/dev/CuteDragTable.vue index 1e7e9c6f..67862693 100644 --- a/cutejava-front/src/views/components/dev/CuteDragTable.vue +++ b/cutejava-front/src/views/components/dev/CuteDragTable.vue @@ -19,7 +19,11 @@ :key="index" :label="column.label" :prop="column.prop" + :fixed="column.fixed ? column.fixed:false" :formatter="column.formatter ? column.formatter : null" + :width="column.width ? column.width:null" + :min-width="column.width ? column.width:null" + :show-overflow-tooltip="true" />
diff --git a/cutejava-front/src/views/components/dev/CuteFormDrawer.vue b/cutejava-front/src/views/components/dev/CuteFormDrawer.vue index 6ae67078..794799df 100644 --- a/cutejava-front/src/views/components/dev/CuteFormDrawer.vue +++ b/cutejava-front/src/views/components/dev/CuteFormDrawer.vue @@ -8,6 +8,7 @@ :close-on-press-escape="false" :destroy-on-close="true" :show-close="false" + :modal="false" >
diff --git a/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue b/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue index 82c3b16f..bcc7faf1 100644 --- a/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue +++ b/cutejava-front/src/views/components/dev/CutePreviewDrawer.vue @@ -8,6 +8,7 @@ :close-on-press-escape="false" :destroy-on-close="true" :show-close="false" + :modal="false" > diff --git a/cutejava-front/src/views/components/dev/CuteSimpleTable.vue b/cutejava-front/src/views/components/dev/CuteSimpleTable.vue index 8ed92038..25181341 100644 --- a/cutejava-front/src/views/components/dev/CuteSimpleTable.vue +++ b/cutejava-front/src/views/components/dev/CuteSimpleTable.vue @@ -19,7 +19,11 @@ :key="index" :label="column.label" :prop="column.prop" + :fixed="column.fixed ? column.fixed:false" :formatter="column.formatter ? column.formatter : null" + :width="column.width ? column.width:null" + :min-width="column.width ? column.width:null" + :show-overflow-tooltip="true" /> redisTemplate; - public RedisHelper(RedisTemplate redisTemplate) { + public CsRedisHelper(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; this.redisTemplate.setKeySerializer(new StringRedisSerializer()); this.redisTemplate.setHashKeySerializer(new StringRedisSerializer()); diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java index e7e1c258..a18acc95 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/dal/redis/PipelineInstanceDAO.java @@ -17,14 +17,14 @@ package cn.odboy.devops.dal.redis; import cn.odboy.devops.framework.pipeline.constant.PipelineConst; import cn.odboy.devops.dal.dataobject.PipelineInstanceTb; -import cn.odboy.framework.redis.RedisHelper; +import cn.odboy.framework.redis.CsRedisHelper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class PipelineInstanceDAO { - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; /** * 全局锁,对应上下文,只能有一次 diff --git a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java index 341a8462..979bd844 100644 --- a/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java +++ b/cutejava/cutejava-module-pipeline/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java @@ -74,6 +74,7 @@ public class PipelineInstanceNodeServiceImpl extends ServiceImpl(getBaseMapper(), PipelineInstanceNodeTb.class).eq(PipelineInstanceNodeTb::getInstanceId, instanceId) .eq(PipelineInstanceNodeTb::getCode, code)); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 32c25edf..41adc73d 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -7,7 +7,7 @@ import cn.odboy.constant.CaptchaCodeEnum; import cn.odboy.constant.SystemConst; import cn.odboy.framework.exception.BadRequestException; 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.SystemUserJwtVo; import cn.odboy.system.dal.model.SystemUserLoginArgs; @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; @RequiredArgsConstructor @Api(tags = "系统:系统授权接口") public class SystemAuthController { - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; private final SystemUserOnlineInfoDAO onlineUserService; private final TokenProvider tokenProvider; private final AppProperties properties; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java index 21a404c7..fa31c360 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java @@ -1,7 +1,7 @@ package cn.odboy.system.dal.redis; 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.util.CsStringUtil; import lombok.RequiredArgsConstructor; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class SystemUserInfoDAO { - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; /** * 添加缓存到Redis diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 91229b3f..646a66c4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -2,7 +2,7 @@ package cn.odboy.system.dal.redis; import cn.odboy.base.CsPageResultVo; 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.SystemUserOnlineVo; import cn.odboy.system.framework.permission.core.handler.TokenProvider; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; public class SystemUserOnlineInfoDAO { private final AppProperties properties; private final TokenProvider tokenProvider; - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; /** * 保存在线用户信息 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java index 53d9c568..a674a2b4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java @@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.constant.SystemConst; 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.redis.SystemRedisKey; import io.jsonwebtoken.Claims; @@ -37,7 +37,7 @@ public class TokenProvider implements InitializingBean { private Key signingKey; private JwtParser jwtParser; - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; private final AppProperties properties; public static final String AUTHORITIES_UUID_KEY = "uid"; public static final String AUTHORITIES_UID_KEY = "userId"; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java index 656be2f5..b5d4e3c4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java @@ -7,7 +7,7 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import cn.odboy.framework.context.CsSpringBeanHolder; 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.SystemQuartzLogTb; import cn.odboy.system.dal.model.SystemSendEmailArgs; @@ -40,7 +40,7 @@ public class ExecutionJobBean extends QuartzJobBean { // 获取spring bean SystemQuartzLogMapper quartzLogMapper = CsSpringBeanHolder.getBean(SystemQuartzLogMapper.class); SystemQuartzJobService systemQuartzJobService = CsSpringBeanHolder.getBean(SystemQuartzJobService.class); - RedisHelper redisHelper = CsSpringBeanHolder.getBean(RedisHelper.class); + CsRedisHelper redisHelper = CsSpringBeanHolder.getBean(CsRedisHelper.class); String uuid = quartzJob.getUuid(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index da559aae..05324008 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -363,8 +363,8 @@ public class SystemDeptService { SystemProductLineVo dto = new SystemProductLineVo(); dto.setValue(dept.getId()); dto.setIdPath(pathIds.stream().map(String::valueOf).collect(Collectors.joining("-"))); - dto.setLabel(buildNamePath(dept, deptMap)); // 保留名称路径用于显示 - + // 保留名称路径用于显示 + dto.setLabel(buildNamePath(dept, deptMap)); options.add(dto); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index 5372e77e..fe347351 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -6,7 +6,7 @@ import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; import cn.odboy.framework.exception.BadRequestException; 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.dal.dataobject.SystemEmailConfigTb; import cn.odboy.system.dal.model.SystemSendEmailArgs; @@ -26,7 +26,7 @@ import java.util.Collections; @RequiredArgsConstructor public class SystemEmailService { private final SystemEmailConfigMapper systemEmailConfigMapper; - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; private final AppProperties properties; @Value("${spring.application.title}") private String applicationTitle; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index f11d8bb0..9a118210 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsPageResultVo; 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.SystemQuartzLogTb; import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; @@ -32,7 +32,7 @@ public class SystemQuartzJobService { private final SystemQuartzJobMapper systemQuartzJobMapper; private final SystemQuartzLogMapper systemQuartzLogMapper; private final QuartzManage quartzManage; - private final RedisHelper redisHelper; + private final CsRedisHelper redisHelper; /** * 创建 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java index d6a9ebcc..34327908 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java @@ -122,6 +122,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl