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

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java

@@ -2,13 +2,13 @@ package com.liquidnet.commons.lang.util;
 
 import java.net.NetworkInterface;
 import java.net.SocketException;
-import java.util.Arrays;
 import java.util.Enumeration;
 
 public class IDGenerator {
-    private static final long twepoch = 1605456000000L;
-    private static final long workerIdBits = 5L;
-    private static final long dataCenterIdBits = 5L;
+    private static final long twepoch = 1624118400000L;
+//    private static final long twepoch = 961421243000L;
+    private static final long workerIdBits = 2L;
+    private static final long dataCenterIdBits = 1L;
     //// 最大支持机器节点数0~31，一共32个
     // 最大支持数据中心节点数0~31，一共32个
     @SuppressWarnings({"PointlessBitwiseExpression", "FieldCanBeLocal"})
@@ -40,7 +40,7 @@ public class IDGenerator {
 
     /* ---------------------------------------------------------------------------------------- */
 
-    public static synchronized Long nextSnowId() {
+    public static synchronized String nextSnowId() {
         long timestamp = genTime();
         if (timestamp < lastTimestamp) {
             if (lastTimestamp - timestamp < 2000) {
@@ -63,7 +63,10 @@ public class IDGenerator {
 
         lastTimestamp = timestamp;
 
-        return ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence;
+        long l = ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence;
+
+//        return l;
+        return l + ("" + System.nanoTime()).substring(9);
     }
 
     /**

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -143,6 +143,7 @@ global-auth:
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/login/*
+    - ${liquidnet.info.context}/gen
     - ${liquidnet.info.context}/send
     - ${liquidnet.info.context}/member/info
     - ${liquidnet.info.context}/member/order/callback

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -8,10 +8,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.core.JwtValidator;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.SensitizeUtil;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
@@ -80,6 +77,20 @@ public class AdamLoginController {
         return ResponseDto.success(AdamLoginInfoVo.getNew());
     }*/
 
+    @GetMapping(value = {"gen"})
+    public void genID() {
+        log.debug("0gen id:{}", IDGenerator.nextSnowId());
+        log.debug("1gen id:{}", IDGenerator.nextSnowId());
+        log.debug("2gen id:{}", IDGenerator.nextSnowId());
+        log.debug("3gen id:{}", IDGenerator.nextSnowId());
+        log.debug("4gen id:{}", IDGenerator.nextSnowId());
+        log.debug("5gen id:{}", IDGenerator.nextSnowId());
+        log.debug("6gen id:{}", IDGenerator.nextSnowId());
+        log.debug("7gen id:{}", IDGenerator.nextSnowId());
+        log.debug("8gen id:{}", IDGenerator.nextSnowId());
+        log.debug("9gen id:{}\n", IDGenerator.nextSnowId());
+    }
+
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "发送验证码")
     @ApiImplicitParams({

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -346,6 +346,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         //生成订单 order_ticket
         KylinOrderTickets orderTickets = new KylinOrderTickets();
         String orderTicketId = IDGenerator.nextSnowId().toString();
+        log.debug("\n OTDER_TICKET_ID = "+ orderTicketId +" \n TIME = "+System.currentTimeMillis());
         orderTickets.setOrderTicketsId(orderTicketId);
         orderTickets.setUserId(uid);
         Map token = CurrentUtil.getTokenClaims();