Merge remote-tracking branch 'origin/test' into test

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 

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;
     /**

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;
 

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;
 

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;
     /**

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;
     /**

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;
 

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;
 

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;
     /**

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;
 

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;
 

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;
 

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;
 

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;
 
     /**

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
      */

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
      */

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;
 

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
      */

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;
     /**

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
      */

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();
     }