Merge branch 'dev' into test

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