diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/MessageStatus.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/MessageStatus.java new file mode 100644 index 000000000..3f02f3900 --- /dev/null +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/MessageStatus.java @@ -0,0 +1,18 @@ +package com.njcn.mq.constant; + +/** + * @author hongawen + * @version 1.0.0 + * @date 2023年08月18日 11:31 + */ +public interface MessageStatus { + + /*** + * 状态为 成功、处理中时,打回不处理 + * 状态为 失败,可以继续处理 + */ + String SUCCESS = "success"; + String BEING_PROCESSED = "being processed"; + String FAIL = "fail"; + +} diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java index b85111355..026a28c56 100644 --- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java +++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java @@ -13,25 +13,28 @@ public enum RedisKeyEnum { /** * 角色与资源的对应关系缓存,每次启动用户服务、角色与资源的关系发生变动时,进行清理并重新缓存 */ - ROLE_FUNCTION_KEY("ROLES_FUNCTIONS",-1L), - PUBLIC_FUNCTIONS_KEY("PUBLIC_FUNCTIONS",-1L), + ROLE_FUNCTION_KEY("ROLES_FUNCTIONS", -1L), + PUBLIC_FUNCTIONS_KEY("PUBLIC_FUNCTIONS", -1L), /*** * app短信验证码,保存10分钟缓存 */ - SMS_LOGIN_KEY("SMS_LOGIN",10L), + SMS_LOGIN_KEY("SMS_LOGIN", 300L), /** * 终端信息查询缓存的公共key前缀 */ - DEVICE_INFO_KEY("DEVICE_INFO_PUBLIC:",-1L), + DEVICE_INFO_KEY("DEVICE_INFO_PUBLIC:", -1L), /** * APP角色推荐码 */ - ROLE_REFERRAL_CODE_KEY("ROLE_REFERRAL_CODE",2L), - ; + ROLE_REFERRAL_CODE_KEY("ROLE_REFERRAL_CODE", 120L), + /*** + * MQ消息key缓存时间,默认72小时 * 60 * 60 + */ + ROCKET_MQ_KEY("ROCKET_MQ", 259200L); private final String key; @@ -41,9 +44,9 @@ public enum RedisKeyEnum { */ private final Long time; - RedisKeyEnum(String key, Long time){ - this.key=key; - this.time=time; + RedisKeyEnum(String key, Long time) { + this.key = key; + this.time = time; } } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/RocketmqMsgErrorLog.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/RocketmqMsgErrorLog.java index b801b9a4d..e6bea0b8a 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/RocketmqMsgErrorLog.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/RocketmqMsgErrorLog.java @@ -2,12 +2,11 @@ package com.njcn.system.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; + import java.io.Serializable; import java.time.LocalDateTime; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; +import lombok.*; /** *
@@ -18,8 +17,10 @@ import lombok.Setter; * @since 2023-08-17 */ @Data +@NoArgsConstructor +@AllArgsConstructor @TableName("rocketmq_msg_error_log") -public class RocketmqMsgErrorLog{ +public class RocketmqMsgErrorLog { private static final long serialVersionUID = 1L; @@ -31,7 +32,7 @@ public class RocketmqMsgErrorLog{ /** * key */ - private String key; + private String msgKey; /** * 来源 @@ -46,7 +47,7 @@ public class RocketmqMsgErrorLog{ /** * 更新时间 */ - private LocalDateTime updateTime; + private LocalDateTime updateTime = LocalDateTime.now(); }