From 9d26091e55e8efa8c9d5796e35e3035c422e212e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 3 Jan 2025 21:47:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?id=20=E8=87=AA=E5=A2=9E=20=E5=8F=96?= =?UTF-8?q?=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/announcement/entity/Announcement.java | 2 +- src/main/java/com/sqx/modules/app/entity/InviteAchievement.java | 2 +- src/main/java/com/sqx/modules/app/entity/UserInfo.java | 2 +- src/main/java/com/sqx/modules/app/entity/UserMoney.java | 2 +- src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java | 2 +- src/main/java/com/sqx/modules/app/entity/VipDetails.java | 2 +- .../com/sqx/modules/callback/entity/UniAdCallbackRecord.java | 2 +- src/main/java/com/sqx/modules/coupon/entity/Coupon.java | 2 +- src/main/java/com/sqx/modules/coupon/entity/CouponUser.java | 2 +- src/main/java/com/sqx/modules/course/entity/CommentGood.java | 2 +- src/main/java/com/sqx/modules/course/entity/Course.java | 2 +- .../com/sqx/modules/course/entity/CourseClassification.java | 2 +- src/main/java/com/sqx/modules/course/entity/CourseCollect.java | 2 +- src/main/java/com/sqx/modules/course/entity/CourseComment.java | 2 +- src/main/java/com/sqx/modules/course/entity/CourseDetails.java | 2 +- src/main/java/com/sqx/modules/course/entity/CourseUser.java | 2 +- .../java/com/sqx/modules/helpCenter/entity/HelpClassify.java | 2 +- src/main/java/com/sqx/modules/helpCenter/entity/HelpWord.java | 2 +- src/main/java/com/sqx/modules/invite/entity/InviteAward.java | 2 +- src/main/java/com/sqx/modules/orders/entity/Orders.java | 2 +- src/main/java/com/sqx/modules/pay/entity/PayClassify.java | 2 +- src/main/java/com/sqx/modules/search/entity/Search.java | 2 +- src/main/java/com/sqx/modules/urlAddress/entity/UrlAddress.java | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/sqx/modules/announcement/entity/Announcement.java b/src/main/java/com/sqx/modules/announcement/entity/Announcement.java index 26088e16..30002c7d 100644 --- a/src/main/java/com/sqx/modules/announcement/entity/Announcement.java +++ b/src/main/java/com/sqx/modules/announcement/entity/Announcement.java @@ -18,7 +18,7 @@ public class Announcement implements Serializable { /** * */ - @TableId(type = IdType.AUTO) +// @TableId private Integer id; /** diff --git a/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java b/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java index f034862b..711cbf4d 100644 --- a/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java +++ b/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java @@ -23,7 +23,7 @@ public class InviteAchievement implements Serializable { /** * */ - @TableId(type = IdType.AUTO) + @TableId private Integer id; /** diff --git a/src/main/java/com/sqx/modules/app/entity/UserInfo.java b/src/main/java/com/sqx/modules/app/entity/UserInfo.java index ff57fedf..65f26d8a 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserInfo.java +++ b/src/main/java/com/sqx/modules/app/entity/UserInfo.java @@ -16,7 +16,7 @@ public class UserInfo implements Serializable { /** * */ - @TableId(type = IdType.AUTO) + @TableId private Long id; /** diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoney.java b/src/main/java/com/sqx/modules/app/entity/UserMoney.java index 0505cf28..7d42b004 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoney.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoney.java @@ -25,7 +25,7 @@ public class UserMoney implements Serializable { * 主键id */ @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long id; diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java index 6d37e5de..cd65b47e 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -26,7 +26,7 @@ public class UserMoneyDetails implements Serializable { * 钱包详情id */ @ApiModelProperty("钱包详情id") - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/src/main/java/com/sqx/modules/app/entity/VipDetails.java b/src/main/java/com/sqx/modules/app/entity/VipDetails.java index 29ea5abf..4abf3671 100644 --- a/src/main/java/com/sqx/modules/app/entity/VipDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/VipDetails.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; @ApiModel("会员详情") public class VipDetails implements Serializable { - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long id; diff --git a/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java b/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java index d86fa1f6..0a3f2e94 100644 --- a/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java +++ b/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java @@ -21,7 +21,7 @@ public class UniAdCallbackRecord implements Serializable { /** * */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long id; diff --git a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java index e3ae6c5f..0b22518e 100644 --- a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java +++ b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java @@ -17,7 +17,7 @@ public class Coupon implements Serializable { /** * 优惠券d */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long couponId; /** diff --git a/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java b/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java index eba6df2e..d57d817a 100644 --- a/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java +++ b/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java @@ -17,7 +17,7 @@ public class CouponUser implements Serializable { /** * 用户优惠券id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long couponUserId; /** diff --git a/src/main/java/com/sqx/modules/course/entity/CommentGood.java b/src/main/java/com/sqx/modules/course/entity/CommentGood.java index af2060b2..3f57f10b 100644 --- a/src/main/java/com/sqx/modules/course/entity/CommentGood.java +++ b/src/main/java/com/sqx/modules/course/entity/CommentGood.java @@ -22,7 +22,7 @@ public class CommentGood implements Serializable { /** * 评论点赞id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long commentGoodId; diff --git a/src/main/java/com/sqx/modules/course/entity/Course.java b/src/main/java/com/sqx/modules/course/entity/Course.java index 19555127..b62bd296 100644 --- a/src/main/java/com/sqx/modules/course/entity/Course.java +++ b/src/main/java/com/sqx/modules/course/entity/Course.java @@ -27,7 +27,7 @@ public class Course implements Serializable { /** * 短剧id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long courseId; diff --git a/src/main/java/com/sqx/modules/course/entity/CourseClassification.java b/src/main/java/com/sqx/modules/course/entity/CourseClassification.java index 24116875..0e98c206 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseClassification.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseClassification.java @@ -21,7 +21,7 @@ public class CourseClassification implements Serializable { /** * 分类id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long classificationId; /** diff --git a/src/main/java/com/sqx/modules/course/entity/CourseCollect.java b/src/main/java/com/sqx/modules/course/entity/CourseCollect.java index 05080a1b..9c9935a7 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseCollect.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseCollect.java @@ -26,7 +26,7 @@ public class CourseCollect implements Serializable { /** * 收藏id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long courseCollectId; diff --git a/src/main/java/com/sqx/modules/course/entity/CourseComment.java b/src/main/java/com/sqx/modules/course/entity/CourseComment.java index 6e54c77e..4d9b19bd 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseComment.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseComment.java @@ -26,7 +26,7 @@ public class CourseComment implements Serializable { /** * 短剧评论id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long courseCommentId; diff --git a/src/main/java/com/sqx/modules/course/entity/CourseDetails.java b/src/main/java/com/sqx/modules/course/entity/CourseDetails.java index 860532e2..661e09a9 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseDetails.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseDetails.java @@ -23,7 +23,7 @@ public class CourseDetails implements Serializable { /** * 短剧目录id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long courseDetailsId; diff --git a/src/main/java/com/sqx/modules/course/entity/CourseUser.java b/src/main/java/com/sqx/modules/course/entity/CourseUser.java index cf579b8c..240f934f 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseUser.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseUser.java @@ -22,7 +22,7 @@ public class CourseUser implements Serializable { /** * 我的短剧id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long courseUserId; diff --git a/src/main/java/com/sqx/modules/helpCenter/entity/HelpClassify.java b/src/main/java/com/sqx/modules/helpCenter/entity/HelpClassify.java index ad1e52fa..06dc76c3 100644 --- a/src/main/java/com/sqx/modules/helpCenter/entity/HelpClassify.java +++ b/src/main/java/com/sqx/modules/helpCenter/entity/HelpClassify.java @@ -22,7 +22,7 @@ public class HelpClassify implements Serializable { /** * 帮助中心分类 */ - @TableId(type = IdType.AUTO) + @TableId private Long helpClassifyId; /** diff --git a/src/main/java/com/sqx/modules/helpCenter/entity/HelpWord.java b/src/main/java/com/sqx/modules/helpCenter/entity/HelpWord.java index 2c27591c..d916e674 100644 --- a/src/main/java/com/sqx/modules/helpCenter/entity/HelpWord.java +++ b/src/main/java/com/sqx/modules/helpCenter/entity/HelpWord.java @@ -16,7 +16,7 @@ public class HelpWord implements Serializable { private static final long serialVersionUID = 1L; - @TableId(type = IdType.AUTO) + @TableId /** * 帮助文档id */ diff --git a/src/main/java/com/sqx/modules/invite/entity/InviteAward.java b/src/main/java/com/sqx/modules/invite/entity/InviteAward.java index e849db60..54e16f06 100644 --- a/src/main/java/com/sqx/modules/invite/entity/InviteAward.java +++ b/src/main/java/com/sqx/modules/invite/entity/InviteAward.java @@ -17,7 +17,7 @@ public class InviteAward implements Serializable { private static final long serialVersionUID = 1L; - @TableId(type = IdType.AUTO) + @TableId /** * 邀请奖励id */ diff --git a/src/main/java/com/sqx/modules/orders/entity/Orders.java b/src/main/java/com/sqx/modules/orders/entity/Orders.java index 3d00e0dc..f3d8bcaa 100644 --- a/src/main/java/com/sqx/modules/orders/entity/Orders.java +++ b/src/main/java/com/sqx/modules/orders/entity/Orders.java @@ -23,7 +23,7 @@ public class Orders implements Serializable { /** * 订单id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long ordersId; diff --git a/src/main/java/com/sqx/modules/pay/entity/PayClassify.java b/src/main/java/com/sqx/modules/pay/entity/PayClassify.java index 4f30c917..6eb3975d 100644 --- a/src/main/java/com/sqx/modules/pay/entity/PayClassify.java +++ b/src/main/java/com/sqx/modules/pay/entity/PayClassify.java @@ -19,7 +19,7 @@ public class PayClassify implements Serializable { private static final long serialVersionUID = 1L; - @TableId(type = IdType.AUTO) + @TableId /** * 充值分类id */ diff --git a/src/main/java/com/sqx/modules/search/entity/Search.java b/src/main/java/com/sqx/modules/search/entity/Search.java index 6df5d8f9..7875ead0 100644 --- a/src/main/java/com/sqx/modules/search/entity/Search.java +++ b/src/main/java/com/sqx/modules/search/entity/Search.java @@ -16,7 +16,7 @@ public class Search implements Serializable { /** * 搜索id */ - @TableId(type = IdType.AUTO) + @TableId @JsonSerialize(using = ToStringSerializer.class) private Long searchId; /** diff --git a/src/main/java/com/sqx/modules/urlAddress/entity/UrlAddress.java b/src/main/java/com/sqx/modules/urlAddress/entity/UrlAddress.java index cecc57ae..95eb66e2 100644 --- a/src/main/java/com/sqx/modules/urlAddress/entity/UrlAddress.java +++ b/src/main/java/com/sqx/modules/urlAddress/entity/UrlAddress.java @@ -16,7 +16,7 @@ public class UrlAddress implements Serializable { private static final long serialVersionUID = 1L; - @TableId(type = IdType.AUTO) + @TableId /** * 域名池id */ From 6ed279aa3469f64dae1c7d2c48cdc783a88491de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Fri, 3 Jan 2025 21:51:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=8D=A2=E6=88=90=E9=9B=AA=E8=8A=B1id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/utils/AliPayOrderUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/utils/AliPayOrderUtil.java b/src/main/java/com/sqx/modules/utils/AliPayOrderUtil.java index b9126954..f23c95e0 100644 --- a/src/main/java/com/sqx/modules/utils/AliPayOrderUtil.java +++ b/src/main/java/com/sqx/modules/utils/AliPayOrderUtil.java @@ -1,5 +1,7 @@ package com.sqx.modules.utils; +import cn.hutool.core.util.IdUtil; + import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.*; @@ -58,7 +60,7 @@ public class AliPayOrderUtil { * @return */ public static String createOrderId() { - int machineId = 1;//最大支持1-9个集群机器部署 + /*int machineId = 1;//最大支持1-9个集群机器部署 int hashCodeV = UUID.randomUUID().toString().hashCode(); if(hashCodeV < 0) {//有可能是负数 hashCodeV = - hashCodeV; @@ -66,7 +68,8 @@ public class AliPayOrderUtil { // 0 代表前面补充0 // 4 代表长度为4 // d 代表参数为正数型 - return machineId+String.format("%015d", hashCodeV); + return machineId+String.format("%015d", hashCodeV);*/ + return IdUtil.getSnowflake(1, 1).nextIdStr(); }