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

# Conflicts:
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

liquidnet-bus-client/liquidnet-client-job/docu/db_liquidnet_clijob_data.sql

+use test_ln_clijob;
+INSERT INTO dev_ln_clijob.xxl_job_group (app_name, title, address_type, address_list, update_time) VALUES ('liquidnet-service-executor', '主要执行器', 0, null, '2021-06-07 02:38:25');
+
+INSERT INTO dev_ln_clijob.xxl_job_info (job_group, job_desc, add_time, update_time, author, alarm_email, schedule_type, schedule_conf, misfire_strategy, executor_route_strategy, executor_handler, executor_param, executor_block_strategy, executor_timeout, executor_fail_retry_count, glue_type, glue_source, glue_remark, glue_updatetime, child_jobid, trigger_status, trigger_last_time, trigger_next_time) VALUES (2, 'demoJobHandler', '2021-05-30 07:33:16', '2021-05-30 07:33:16', 'anjiabin', '', 'CRON', '1/15 * * * * ?', 'DO_NOTHING', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2021-05-30 07:33:16', '', 0, 0, 0);
+INSERT INTO dev_ln_clijob.xxl_job_info (job_group, job_desc, add_time, update_time, author, alarm_email, schedule_type, schedule_conf, misfire_strategy, executor_route_strategy, executor_handler, executor_param, executor_block_strategy, executor_timeout, executor_fail_retry_count, glue_type, glue_source, glue_remark, glue_updatetime, child_jobid, trigger_status, trigger_last_time, trigger_next_time) VALUES (2, '订单过期脚本', '2021-06-03 09:24:16', '2021-06-03 09:24:16', '胡佳晨', '', 'CRON', '59 0/1 * * * ? ', 'DO_NOTHING', 'FIRST', 'sev-kylin:checkOrderTimeHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2021-06-03 09:24:16', '', 0, 0, 0);
+INSERT INTO dev_ln_clijob.xxl_job_info (job_group, job_desc, add_time, update_time, author, alarm_email, schedule_type, schedule_conf, misfire_strategy, executor_route_strategy, executor_handler, executor_param, executor_block_strategy, executor_timeout, executor_fail_retry_count, glue_type, glue_source, glue_remark, glue_updatetime, child_jobid, trigger_status, trigger_last_time, trigger_next_time) VALUES (2, '演出状态脚本', '2021-06-03 09:25:08', '2021-06-03 09:25:08', '胡佳晨', '', 'CRON', '0 0/30 * * * ? ', 'DO_NOTHING', 'FIRST', 'sev-kylin:checkPerformanceTimeHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2021-06-03 09:25:08', '', 0, 0, 0);
\ No newline at end of file

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

@@ -37,6 +37,7 @@ public abstract class DateUtil {
         yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"),
         yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
         yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"),
+        yyyyMMddHHmmssS("yyyy-MM-dd HH:mm:ss.S"),
         ddHHmmssTrim("ddHHmmss"),
         yyyy_MM_dd_zh("yyyy年MM月dd日"),
         MM_dd_zh("MM月dd日"),

liquidnet-bus-common/liquidnet-common-mq/src/main/java/com/liquidnet/common/mq/constant/MQConst.java

 package com.liquidnet.common.mq.constant;
 
 public class MQConst {
-    public static final String EXCHANGES_LIQUIDNET_SQL = "liquidnet.sql";
+//    public static final String EXCHANGES_LIQUIDNET_SQL = "liquidnet.sql";
+//    public static final String ROUTING_KEY_SQL = "sql";
+//    public static final String QUEUES_SQL_MAIN = "queue.sql.main";
 
-    public static final String ROUTING_KEY_SQL = "sql";
-    public static final String QUEUES_SQL_MAIN = "queue.sql.main";
+    /* -------------------------------------------------------- */
 
-    public static final String ROUTING_KEY_SQL_KYLIN_STATION = "sql.kylin.station";
-    public static final String QUEUES_SQL_KYLIN_STATION = "queue.sql.kylin.station";
+    // 用户中心
+    public static final String EX_LNS_SQL_UCENTER = "lns.sql.ucenter";
+
+    public static final String RK_SQL_UCENTER = "sql.ucenter";
+    public static final String QUEUES_SQL_UCENTER = "queue.sql.ucenter";
+    // 用户注册
+    public static final String RK_SQL_UREGISTER = "sql.uregister";
+    public static final String QUEUES_SQL_UREGISTER = "queue.sql.uregister";
+    // 会员购买
+    public static final String RK_SQL_UMEMBER = "sql.umember";
+    public static final String QUEUES_SQL_UMEMBER = "queue.sql.umember";
+
+    /* -------------------------------------------------------- */
 
     //缺票登记
     public static final String EXCHANGES_LIQUIDNET_SQL_PERFORMANCE_LACK = "liquidnet.sql.performance.lack";
@@ -33,4 +45,13 @@ public class MQConst {
     public static final String EXCHANGES_LIQUIDNET_SQL_ORDER_PAY = "liquidnet.sql.order.pay";
     public static final String ROUTING_KEY_SQL_ORDER_PAY = "order.pay";
     public static final String QUEUES_SQL_ORDER_PAY = "queue.sql.order.pay";
+
+    /* -------------------------------------------------------- */
+
+    // 验票更新
+    public static final String EX_LNS_SQL_STATION = "lns.sql.station";
+    public static final String RK_SQL_STATION = "sql.station";
+    public static final String QUEUES_SQL_STATION = "queue.sql.station";
+
+    /* -------------------------------------------------------- */
 }

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

@@ -4,7 +4,7 @@ liquidnet:
       switch: false
   info:
     port: 9001
-    context:
+    context: /adam
     name: liquidnet-service-adam
   logfile:
     path: ./logs

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

@@ -137,17 +137,17 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern:
-    - /doc.html
-    - /webjars/**
-    - /swagger-resources/**
-    - /v2/api-docs*
-    - /login/*
-    - /send
-    - /member/info
-    - /member/order/callback
-    - /enters/query/depth
-    - /addr/query/depth
-    - /member/check/depth
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/login/*
+    - ${liquidnet.info.context}/send
+    - ${liquidnet.info.context}/member/info
+    - ${liquidnet.info.context}/member/order/callback
+    - ${liquidnet.info.context}/enters/query/depth
+    - ${liquidnet.info.context}/addr/query/depth
+    - ${liquidnet.info.context}/member/check/depth
 
 # -----------------------------------------------------------
 

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -4,7 +4,7 @@ liquidnet:
       switch: false
   info:
     port: 9002
-    context:
+    context: /kylin
     name: liquidnet-service-kylin
   logfile:
     path: ./logs

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

@@ -103,33 +103,32 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern:
-    - /doc.html
-    - /webjars/**
-    - /swagger-resources/**
-    - /v2/api-docs*
-    - /station/login
-    - /station/login/sms
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/station/login
+    - ${liquidnet.info.context}/station/login/sms
 #    -
-    - /partner/buyNotice/**
-    - /partner/checkUser/**
-    - /partner/checkUser/performance/**
-    - /partner/ticket/**
-    - /partner/times/**
-    - /partner/performance/**
-    - /banners/**
-    - /order/checkOrderTime
-    - /order/syncOrder
-    - /refund/callback
-    - /performance/localList
-    - /performance/noticeList
-    - /performance/recommendList
-    - /performance/exclusiveList
-    - /performance/search
-    - /performance/partner/**
-    - /performance/list
-    - /performance/calendar
-    - /performance/calendarPerformances
-    - /performance/*
+    - ${liquidnet.info.context}/partner/buyNotice/**
+    - ${liquidnet.info.context}/partner/checkUser/**
+    - ${liquidnet.info.context}/partner/checkUser/performance/**
+    - ${liquidnet.info.context}/partner/ticket/**
+    - ${liquidnet.info.context}/partner/times/**
+    - ${liquidnet.info.context}/partner/performance/**
+    - ${liquidnet.info.context}/banners/**
+    - ${liquidnet.info.context}/order/checkOrderTime
+    - ${liquidnet.info.context}/order/syncOrder
+    - ${liquidnet.info.context}/refund/callback
+    - ${liquidnet.info.context}/performance/localList
+    - ${liquidnet.info.context}/performance/noticeList
+    - ${liquidnet.info.context}/performance/recommendList
+    - ${liquidnet.info.context}/performance/exclusiveList
+    - ${liquidnet.info.context}/performance/search
+    - ${liquidnet.info.context}/performance/list
+    - ${liquidnet.info.context}/performance/calendar
+    - ${liquidnet.info.context}/performance/calendarPerformances
+    - ${liquidnet.info.context}/performance/*
 
 # -----------------------------------------------------------
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -214,7 +214,7 @@ public class KylinOrderTickets implements Serializable {
      */
     public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                orderType, updatedAt, orderCode, orderTicketsId,updateTime,createTime
+                 updatedAt, orderCode, orderTicketsId,updateTime,createTime
         };
     }
 

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,7 +54,13 @@ public class AdamAddressesController {
     @ApiOperation(value = "收货地址列表")
     @GetMapping("list")
     public ResponseDto<List<AdamAddressesVo>> list() {
-        return ResponseDto.success(adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid()));
+        List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid());
+        if (!CollectionUtils.isEmpty(vos)) {
+            for (AdamAddressesVo vo : vos) {
+                vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
+            }
+        }
+        return ResponseDto.success(vos);
     }
 
     @ApiOperationSupport(order = 3)
@@ -104,14 +112,23 @@ public class AdamAddressesController {
     @PostMapping("query/{id}")
     public ResponseDto<AdamAddressesVo> query(@NotBlank @PathVariable(name = "id") String addrId) {
         AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(CurrentUtil.getCurrentUid(), addrId);
-        return null == vo ? ResponseDto.failure(ErrorMapping.get("10106")) : ResponseDto.success(vo);
+        if (null != vo) {
+            vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
+
+            return ResponseDto.success(vo);
+        }
+        return ResponseDto.failure(ErrorMapping.get("10106"));
     }
 
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "获取默认收货地址")
     @PostMapping("query/def")
     public ResponseDto<AdamAddressesVo> queryDef() {
-        return ResponseDto.success(adamAddressesService.queryDefault(CurrentUtil.getCurrentUid()));
+        AdamAddressesVo vo = adamAddressesService.queryDefault(CurrentUtil.getCurrentUid());
+        if (null != vo) {
+            vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
+        }
+        return ResponseDto.success(vo);
     }
 
     @GetMapping("query/depth")

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.service.IAdamEntersService;
@@ -53,7 +54,15 @@ public class AdamEntersController {
     @ApiOperation(value = "入场人列表")
     @GetMapping("list")
     public ResponseDto<List<AdamEntersVo>> list() {
-        return ResponseDto.success(adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid()));
+        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid());
+        if (!CollectionUtils.isEmpty(vos)) {
+            for (AdamEntersVo vo : vos) {
+                vo.setName(SensitizeUtil.chineseName(vo.getName()));
+                vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
+                vo.setMobile(SensitizeUtil.custom(vo.getMobile(), 3, 4));
+            }
+        }
+        return ResponseDto.success(vos);
     }
 
     @ApiOperationSupport(order = 3)
@@ -106,6 +115,13 @@ public class AdamEntersController {
     @PostMapping("query")
     public ResponseDto<List<AdamEntersVo>> query(@NotBlank @RequestParam String entersIds) {
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUidEntersIds(CurrentUtil.getCurrentUid(), entersIds.split(","));
+        if (!CollectionUtils.isEmpty(vos)) {
+            for (AdamEntersVo vo : vos) {
+                vo.setName(SensitizeUtil.chineseName(vo.getName()));
+                vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
+                vo.setMobile(SensitizeUtil.custom(vo.getMobile(), 3, 4));
+            }
+        }
         return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
     }
 
@@ -113,7 +129,13 @@ public class AdamEntersController {
     @ApiOperation(value = "获取默认入场人")
     @PostMapping("query/def")
     public ResponseDto<AdamEntersVo> queryDef() {
-        return ResponseDto.success(adamEntersService.queryDefault(CurrentUtil.getCurrentUid()));
+        AdamEntersVo vo = adamEntersService.queryDefault(CurrentUtil.getCurrentUid());
+        if (null != vo) {
+            vo.setName(SensitizeUtil.chineseName(vo.getName()));
+            vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
+            vo.setMobile(SensitizeUtil.custom(vo.getMobile(), 3, 4));
+        }
+        return ResponseDto.success(vo);
     }
 
     @GetMapping("query/depth")

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

@@ -3,10 +3,7 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.constant.LnsRegex;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -211,6 +208,9 @@ public class AdamUserController {
 
         AdamRealInfoVo infoVo = adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
 
+        infoVo.setName(SensitizeUtil.chineseName(infoVo.getName()));
+        infoVo.setIdCard(SensitizeUtil.custom(infoVo.getIdCard(), 3, 2));
+
         return ResponseDto.success(infoVo);
     }
 

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

@@ -68,7 +68,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 
         adamRdmService.delAddressesVoByUid(currentUid);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_addresses.add",
                         vo.getAddressesId(), vo.getUid(), vo.getName(), vo.getPhone(), vo.getProvince(), vo.getCity(), vo.getCounty(), vo.getAddress(), vo.getIsDefault(), vo.getState(), now
                 )
@@ -118,7 +118,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         }
         if (!CollectionUtils.isEmpty(toMqObjs)) {
             adamRdmService.setAddressesVoByUid(uid, vos);
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_addresses.update.is_default", toMqObjs));
         }
     }
@@ -142,7 +142,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
             List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
             adamRdmService.setAddressesVoByUid(updateVo.getUid(), this.collectionProcess(vos, parameter.getAddressesId(), updateVo));
 
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_addresses.edit",
                             updateVo.getName(), updateVo.getPhone(), updateVo.getProvince(), updateVo.getCity(), updateVo.getCounty(), updateVo.getAddress(), now, updateVo.getAddressesId()
                     )
@@ -171,7 +171,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
             vos.removeIf(r -> r.getAddressesId().equals(addressesId));
             adamRdmService.setAddressesVoByUid(uid, vos);
 
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_addresses.remove", now, now, addressesId)
             );
         }

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

@@ -60,7 +60,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
 
         mongoTemplate.insert(vo, AdamCollectBaseVo.class.getSimpleName());
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_collection.add",
                         vo.getUid(), vo.getContentId(), vo.getType(), vo.getState(), now
                 )
@@ -91,7 +91,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
             }
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_collection.del", toMqObjs));
         }
     }

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

@@ -63,7 +63,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
 
         mongoTemplate.insert(vo, AdamDisposedBaseVo.class.getSimpleName());
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_disposed.add",
                         vo.getUid(), vo.getContentId(), vo.getType(), vo.getState(), now
                 )
@@ -95,7 +95,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
             }
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_disposed.del", toMqObjs));
         }
     }

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

@@ -12,10 +12,12 @@ import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -24,10 +26,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.LinkedMultiValueMap;
 
 import java.time.LocalDateTime;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.IntStream;
 
 /**
@@ -42,7 +46,7 @@ import java.util.stream.IntStream;
 @Service
 public class AdamEntersServiceImpl implements IAdamEntersService {
     @Autowired
-    MongoConverter mongoConverter;
+    Environment env;
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
@@ -50,12 +54,38 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     @Autowired
     IAdamRdmService adamRdmService;
 
+
+    private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification";
+
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public String add(AdamEntersParam parameter) {
         String currentUid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
-        String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
+
+
+        if (1 == parameter.getType()) {
+            LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+            paramsMap.add("realName", parameter.getName());
+            paramsMap.add("cardNo", parameter.getIdCard());
+
+            String respStr = null;
+            try {
+                respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
+                log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
+                Map respMap = JsonUtils.fromJson(respStr, Map.class);
+                if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
+                    log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr);
+                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+                }
+            } catch (Exception e) {
+                log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr, e);
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            }
+        }
+
 
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
 
@@ -71,7 +101,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
         adamRdmService.delEntersVoByUid(currentUid);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_enters.add",
                         vo.getEntersId(), vo.getUid(), vo.getType(), vo.getName(), vo.getMobile(), vo.getIdCard(), vo.getIsDefault(), vo.getState(), now
                 )
@@ -83,7 +113,6 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void def(String uid, String entersId) {
         LocalDateTime now = LocalDateTime.now();
-        String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
 
         LinkedList<Object[]> toMqObjs = new LinkedList<>();
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
@@ -123,7 +152,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         }
         if (!CollectionUtils.isEmpty(toMqObjs)) {
             adamRdmService.setEntersVoByUid(uid, vos);
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_enters.update.is_default", toMqObjs));
         }
     }
@@ -147,7 +176,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
             List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
             adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo));
 
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_enters.edit",
                             updateVo.getType(), updateVo.getName(), updateVo.getMobile(), updateVo.getIdCard(), updateVo.getIsDefault(), updateVo.getState(), now, updateVo.getEntersId()
                     )
@@ -176,7 +205,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
             vos.removeIf(r -> r.getEntersId().equals(entersId));
             adamRdmService.setEntersVoByUid(uid, vos);
 
-            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                     SqlMapping.get("adam_enters.remove", now, now, entersId)
             );
         }

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

@@ -284,7 +284,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
         adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getUid(), handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UMEMBER,
                 SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
         return ResponseDto.success();
     }
@@ -386,7 +386,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), initUserMemberVo);
         adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UMEMBER,
                 SqlMapping.gets(toMqSqls, updateMemberCodeObjs, initMemberOrderObjs, initUserMemberObjs));
 
         AdamMemberOrderResult result = AdamMemberOrderResult.getNew();

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Field;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -82,14 +81,17 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     @Override
     public AdamUserInfoVo getUserInfoVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_USER.concat(uid);
-        AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisUtil.get(rk);
-        if (null == userInfoVo) {
-            userInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
+        AdamUserInfoVo vo = (AdamUserInfoVo) redisUtil.get(rk);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
                     AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
 
-            if (null != userInfoVo) redisUtil.set(rk, userInfoVo);
+            if (null != vo) redisUtil.set(rk, vo);
+        }
+        if (null != vo) {
+            vo.setMobile(SensitizeUtil.custom(vo.getMobile(), 3, 4));
         }
-        return userInfoVo;
+        return vo;
     }
 
     @Override
@@ -105,14 +107,18 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     @Override
     public AdamRealInfoVo getRealInfoVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_REAL_NAME.concat(uid);
-        AdamRealInfoVo realInfoVo = (AdamRealInfoVo) redisUtil.get(rk);
-        if (null == realInfoVo) {
-            realInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
+        AdamRealInfoVo vo = (AdamRealInfoVo) redisUtil.get(rk);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
                     AdamRealInfoVo.class, AdamRealInfoVo.class.getSimpleName());
 
-            if (null != realInfoVo) redisUtil.set(rk, realInfoVo);
+            if (null != vo) redisUtil.set(rk, vo);
         }
-        return realInfoVo;
+        if (null != vo) {
+            vo.setName(SensitizeUtil.chineseName(vo.getName()));
+            vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
+        }
+        return vo;
     }
 
     @Override
@@ -160,16 +166,16 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     @Override
     public List<AdamEntersVo> getEntersVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
-        List<AdamEntersVo> entersList = (List<AdamEntersVo>) redisUtil.get(rk);
-        if (CollectionUtils.isEmpty(entersList)) {
-            entersList = mongoTemplate.find(
+        List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
+        if (CollectionUtils.isEmpty(vos)) {
+            vos = mongoTemplate.find(
                     Query.query(Criteria.where("uid").is(uid).and("state").is(1)).with(Sort.by(Sort.Direction.DESC, "createdAt")),
                     AdamEntersVo.class, AdamEntersVo.class.getSimpleName()
             );
 
-            if (!CollectionUtils.isEmpty(entersList)) redisUtil.set(rk, entersList);
+            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
         }
-        return entersList;
+        return vos;
     }
 
     @Override
@@ -196,17 +202,16 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     @Override
     public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
-        List<AdamAddressesVo> list = (List<AdamAddressesVo>) redisUtil.get(rk);
-        if (CollectionUtils.isEmpty(list)) {
-            list = mongoTemplate.find(
+        List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
+        if (CollectionUtils.isEmpty(vos)) {
+            vos = mongoTemplate.find(
                     Query.query(Criteria.where("uid").is(uid).and("state").is(1)).with(Sort.by(Sort.Direction.DESC, "createdAt")),
                     AdamAddressesVo.class, AdamAddressesVo.class.getSimpleName()
             );
 
-            if (!CollectionUtils.isEmpty(list)) redisUtil.set(rk, list);
+            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
         }
-
-        return list;
+        return vos;
     }
 
     @Override

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

@@ -49,7 +49,7 @@ public class AdamRealNameServiceImpl extends ServiceImpl<AdamRealNameMapper, Ada
                 realName.getState(),
                 realName.getCreatedAt()
         );
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_real_name.add", paramList.toArray()));
     }
 }

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

@@ -67,7 +67,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 userInfoVo.getTagMe(),
                 userInfoVo.getUid()
         );
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get(userInfoVo.getIsComplete() == 0 ? "adam_user_info.add" : "adam_user_info.edit", paramList.toArray()));
 
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
@@ -86,7 +86,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
         );
         AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_user.edit.mobile", mobile, now, uid));
 
         adamRdmService.delUidByMobile(beforeUserInfoVo.getMobile());

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

@@ -2,10 +2,7 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.entity.AdamEnters;
@@ -81,12 +78,14 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UREGISTER,
                 SqlMapping.get("adam_user.add", userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now)
         );
 
         adamRdmService.setUidByMobile(mobile, userInfoVo.getUid());
 
+        userInfoVo.setMobile(SensitizeUtil.custom(mobile, 3, 4));
+
         return userInfoVo;
     }
 
@@ -111,6 +110,8 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
             mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
 
+            userInfoVo.setMobile(SensitizeUtil.custom(param.getMobile(), 3, 4));
+
             toMqSqls.add(SqlMapping.get("adam_user.add"));
             initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now});
         } else {
@@ -130,7 +131,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UREGISTER,
                 SqlMapping.gets(toMqSqls, initUserObjs, initThirdPartObjs)
         );
         return userInfoVo;
@@ -153,7 +154,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         adamRdmService.delThirdPartVoListByUid(uid);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get(
                         "adam_third_party.add",
                         thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
@@ -181,7 +182,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         adamRdmService.delThirdPartVoListByUid(bindUid);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get(
                         "adam_third_party.add",
                         thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
@@ -214,7 +215,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         }
         adamRdmService.delThirdPartVoListByUid(uid);
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_third_party.unbind", now, uid, platform));
     }
 
@@ -280,7 +281,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
             objsAddresses.add(new Object[]{now, now, uid});
         }
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.gets(toMqSqls, objsUser));
     }
 

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -28,13 +28,120 @@ public class ConsumerProcessor {
     @Resource
     IBaseDao baseDao;
 
+//    @RabbitListener(bindings = @QueueBinding(
+//            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL), key = MQConst.ROUTING_KEY_SQL,
+//            value = @Queue(MQConst.QUEUES_SQL_MAIN)
+//    ))
+////    @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
+//    public void consumerSql(Message msg, Channel channel) {
+//        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
+//        log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+//        log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+//
+//        try {
+//            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+//            log.debug("consumer sql result of execution:{}", rstBatchSqls);
+//            if (rstBatchSqls) {
+//                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+//            } else {
+//                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+//            }
+//        } catch (Exception e) {
+//            log.error("error:consumer sql:{}", JsonUtils.toJson(sqlMessage), e);
+//            try {
+//                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+//            } catch (IOException ioException) {
+//                log.error("error:consumer sql:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+//            }
+//        }
+//    }
+
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UCENTER,
+            value = @Queue(MQConst.QUEUES_SQL_UCENTER)
+    ))
+    public void consumerSqlForURegister(Message msg, Channel channel) {
+        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
+        log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+        log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+
+        try {
+            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            log.debug("consumer sql result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } else {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            }
+        } catch (Exception e) {
+            log.error("error:consumer sql:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
+        }
+    }
+
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UREGISTER,
+            value = @Queue(MQConst.QUEUES_SQL_UREGISTER)
+    ))
+    public void consumerSqlForUCenter(Message msg, Channel channel) {
+        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
+        log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+        log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+
+        try {
+            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            log.debug("consumer sql result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } else {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            }
+        } catch (Exception e) {
+            log.error("error:consumer sql:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
+        }
+    }
+
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UMEMBER,
+            value = @Queue(MQConst.QUEUES_SQL_UMEMBER)
+    ))
+    public void consumerSqlForUMember(Message msg, Channel channel) {
+        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
+        log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+        log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+
+        try {
+            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            log.debug("consumer sql result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } else {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            }
+        } catch (Exception e) {
+            log.error("error:consumer sql:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
+        }
+    }
+
     @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL),
-            key = MQConst.ROUTING_KEY_SQL,
-            value = @Queue(MQConst.QUEUES_SQL_MAIN)
+            exchange = @Exchange(MQConst.EX_LNS_SQL_STATION), key = MQConst.RK_SQL_STATION,
+            value = @Queue(MQConst.QUEUES_SQL_STATION)
     ))
-//    @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
-    public void consumerSql(Message msg, Channel channel) {
+    public void consumerSqlForStation(Message msg, Channel channel) {
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
         log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
         log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));

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

@@ -85,7 +85,7 @@ public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderT
         BulkWriteResult bulkWriteResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).bulkWrite(list);
         log.info("bulkWriteResult:{}", JsonUtils.toJson(bulkWriteResult));
 
-        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL_KYLIN_STATION,
+        rabbitTemplate.convertSendAndReceive(MQConst.EX_LNS_SQL_STATION, MQConst.RK_SQL_STATION,
                 SqlMapping.get("kylin_order_ticket_entities.updateStatusByStation", paramsList));
     }
 }

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

@@ -386,6 +386,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         String orderTicketEntitiesId = IDGenerator.nextSnowId().toString();
         LinkedList<Object[]> sqlsDataD = null;
         sqlsDataD = new LinkedList<Object[]>();
+        sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
         if (isTrueName == 1) {
             for (AdamEntersVo enters : entersVoList) {
                 orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
@@ -405,7 +406,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntities.setComment("");
                 orderTicketEntities.setCreatedAt(now);
                 orderTicketEntities.setUpdatedAt(null);
-                sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
                 sqlsDataD.add(orderTicketEntities.getAddObject());
                 // 生成vo
                 KylinOrderTicketEntitiesVo orderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
@@ -441,7 +441,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntities.setComment("");
                 orderTicketEntities.setCreatedAt(now);
                 orderTicketEntities.setUpdatedAt(null);
-                sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
                 sqlsDataD.add(orderTicketEntities.getAddObject());
                 // 生成vo
                 KylinOrderTicketEntitiesVo orderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();

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

@@ -164,7 +164,13 @@ public class MongoVoUtils {
         KylinOrderTicketVo data = dataUtils.getOrderTicketVo(orderId);
         BeanUtils.copyProperties(data, voItem);
         redisVo.add(voItem);
-        redisVo.addAll(dataUtils.getOrderList(userId));
+        List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
+        if(redisData.size()>0){
+            if(redisData.get(0).getOrderTicketsId().equals(orderId)){
+                redisData.remove(0);
+            }
+        }
+        redisVo.addAll(redisData);
 
         switch (type) {
             case 1:

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -10,7 +10,7 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_type = ? ,order_code = ? , updated_at = ?  WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_code = ? , updated_at = ?  WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
 kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at = ? or created_at = ?)
 kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at = ? or created_at = ?)