Merge branch 'test'

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -20,6 +20,12 @@ liquidnet:
     username: admin
     password: admin
     virtual-host: liquidnet
+    adam:
+      host: rabbitmq.zhengzai.tv
+      port: 5672
+      username: admin
+      password: admin
+      virtual-host: liquidnet
   knife4j:
     disable: false
   redis:

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -20,6 +20,12 @@ liquidnet:
     username: admin
     password: admin
     virtual-host: liquidnet
+    adam:
+      host: rabbitmq.zhengzai.tv
+      port: 5672
+      username: admin
+      password: admin
+      virtual-host: liquidnet
   knife4j:
     disable: false
   redis:

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

@@ -13,6 +13,7 @@ liquidnet:
     file-max-size: 200MB
     level: info
   rabbitmq:
+    adam:
       connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene

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

@@ -13,7 +13,8 @@ liquidnet:
     file-max-size: 200MB
     level: debug
   rabbitmq:
-    connection-timeout: 3000
+    adam:
+      connection-timeout: 5000
   mysql:
     database-name: test_ln_scene
   mongodb:

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

@@ -71,12 +71,12 @@ spring:
   autoconfigure:
     exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-    virtual-host: ${liquidnet.rabbitmq.virtual-host}
-    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
+    addresses: ${liquidnet.rabbitmq.adam.host}
+    port: ${liquidnet.rabbitmq.adam.port}
+    username: ${liquidnet.rabbitmq.adam.username}
+    password: ${liquidnet.rabbitmq.adam.password}
+    virtual-host: ${liquidnet.rabbitmq.adam.virtual-host}
+    connection-timeout: ${liquidnet.rabbitmq.adam.connection-timeout}
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9005
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-adam
+  logfile:
+    path: /data/logs
+    name: service-consumer-adam
+    config: classpath:logback-spring.xml
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level-root: debug
+  rabbitmq:
+    adam:
+      connection-timeout: 5000
+  mysql:
+    database-name: dev_ln_scene
+
+#以下为spring各环境个性配置
\ No newline at end of file

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

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9005
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-adam
+  logfile:
+    path: /data/logs
+    name: service-consumer-adam
+    config: classpath:logback-spring.xml
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level-root: debug
+  rabbitmq:
+    adam:
+      connection-timeout: 5000
+  mysql:
+    database-name: test_ln_scene
+
+#以下为spring各环境个性配置

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

+server:
+  port: ${liquidnet.info.port}
+  tomcat:
+    uri-encoding: UTF-8
+  servlet:
+    context-path: ${liquidnet.info.context}
+# -----------------------------------------------------------
+knife4j:
+  production: ${liquidnet.knife4j.disable}
+  basic:
+    enable: true
+    username: ${liquidnet.security.username}
+    password: ${liquidnet.security.password}
+# -----------------------------------------------------------
+logging:
+#  config: ${liquidnet.logfile.config}
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: info
+    #以下是为指定包设置日志级别
+    com:
+      liquidnet: ${liquidnet.logfile.level-root}
+# -----------------------------------------------------------
+eureka:
+#  client:
+#    register-with-eureka: true
+#    fetch-registry: true
+#    serviceUrl:
+#      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+  instance:
+    hostname: ${spring.cloud.client.ip-address}
+    lease-expiration-duration-in-seconds: 15 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除
+    lease-renewal-interval-in-seconds: 5 #服务刷新时间配置，每隔这个时间会主动心跳一次
+    prefer-ip-address: true
+    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}}
+# -----------------------------------------------------------
+#actuator/info
+info:
+  app:
+    name: ${liquidnet.info.name}
+  company:
+    name: lightnet.io
+  build:
+    groupId: '@project.groupId@'
+    artifactId: '@project.artifactId@'
+    version: '@project.version@'
+# -----------------------------------------------------------
+spring:
+  application:
+    name: ${liquidnet.info.name}
+  profiles:
+    include: common-service #这里加载management相关公共配置
+  rabbitmq:
+    addresses: ${liquidnet.rabbitmq.adam.host}
+    port: ${liquidnet.rabbitmq.adam.port}
+    username: ${liquidnet.rabbitmq.adam.username}
+    password: ${liquidnet.rabbitmq.adam.password}
+    virtual-host: ${liquidnet.rabbitmq.adam.virtual-host}
+    connection-timeout: ${liquidnet.rabbitmq.adam.connection-timeout}
+    publisher-confirms: true
+    publisher-returns: true
+    listener:
+      simple:
+        acknowledge-mode: manual
+  redis:
+    database: 15
+    port: ${liquidnet.redis.port}
+    host: ${liquidnet.redis.host}
+    password: ${liquidnet.redis.password}
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+    redisson:
+      singleServerConfig:
+        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
+        password: ${liquidnet.redis.password}
+        clientName: null
+        database: 7 #选择使用哪个数据库0~15
+        idleConnectionTimeout: 10000
+        connectTimeout: 10000
+        timeout: 3000
+        retryAttempts: 3
+        retryInterval: 1500
+        subscriptionsPerConnection: 5
+        subscriptionConnectionMinimumIdleSize: 1
+        subscriptionConnectionPoolSize: 50
+        connectionMinimumIdleSize: 32
+        connectionPoolSize: 64
+        dnsMonitoringInterval: 5000
+      threads: 16
+      nettyThreads: 32
+      codec:
+        class: "org.redisson.codec.JsonJacksonCodec"
+      transportMode: "NIO"
+  datasource:
+    name: ${liquidnet.mysql.database-name}
+    url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false
+    username: ${liquidnet.mysql.username}
+    password: ${liquidnet.mysql.password}
+    #    type: org.apache.tomcat.jdbc.pool.DataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+# -----------------------------------------------------------
+
+# -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-consumer-adam/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-bus-service</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-service-consumer-adam</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-mq</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-cache-redisson</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-cache-redis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-kylin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/ServiceConsumerApplication.java

+package com.liquidnet.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.cloud.bus.BusAutoConfiguration;
+import org.springframework.core.env.Environment;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+
+@Slf4j
+@EnableAutoConfiguration(
+        exclude = {BusAutoConfiguration.class, MongoAutoConfiguration.class}
+)
+@SpringBootApplication(scanBasePackages = {"com.liquidnet"})
+public class ServiceConsumerApplication implements CommandLineRunner {
+    @Autowired
+    private Environment environment;
+
+    public static void main(String[] args) {
+        SpringApplication.run(ServiceConsumerApplication.class, args);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        try {
+            log.info("\n----------------------------------------------------------\n\t" +
+                            "Application '{}' is running! Access URLs:\n\t" +
+                            "Local: \t\thttp://127.0.0.1:{}\n\t" +
+                            "External: \thttp://{}:{}{}/doc.html\n\t" +
+                            "Profile(s): \t{}\n----------------------------------------------------------",
+                    environment.getProperty("spring.application.name"),
+                    environment.getProperty("server.port"),
+                    InetAddress.getLocalHost().getHostAddress(),
+                    environment.getProperty("server.port"),
+                    environment.getProperty("server.servlet.context-path"),
+                    Arrays.toString(environment.getActiveProfiles()));
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/service/IBaseDao.java

+package com.liquidnet.service.consumer.service;
+
+import java.util.LinkedList;
+
+public interface IBaseDao {
+    /**
+     * 批量执行sql
+     *
+     * @param sql
+     * @param values
+     * @return
+     */
+    Boolean batchSql(String sql, LinkedList<Object[]> values);
+
+    /**
+     * 批量执行不定量sql
+     *
+     * @param sql
+     * @param values
+     * @return
+     */
+    Boolean batchSqls(LinkedList<String> sql, LinkedList<Object[]>... values);
+
+    /**
+     * 执行sql语句 无 参数
+     *
+     * @param sql
+     * @return
+     */
+    Boolean batchSqlNoArgs(LinkedList<String> sql);
+
+    /**
+     * xs 新增一条记录且返回主键Id
+     *
+     * @param sql   新增待执行sql
+     * @param param 参数
+     * @return 主键ID
+     */
+    int insertSqlAndReturnKeyId(final String sql, final Object[] param);
+}

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/service/Utils/KylinUtils.java

+package com.liquidnet.service.consumer.service.Utils;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@Component
+public class KylinUtils {
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * @param userId  用户id
+     * @param type    1新增 2修改
+     * @param orderId 订单id [需要新增或者修改的订单id]
+     */
+    public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
+        List<KylinOrderListVo> vo = new ArrayList<>();
+        List<KylinOrderListVo> redisVo = new ArrayList();
+        KylinOrderListVo voItem = new KylinOrderListVo();
+        KylinOrderTicketVo data;
+        if (dataSingle == null) {
+            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
+        } else {
+            data = dataSingle;
+        }
+        BeanUtils.copyProperties(data, voItem);
+        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        if (type == 1) {
+            redisVo.add(voItem);
+            if (redisData.size() > 0) {
+                if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
+                    redisData.remove(0);
+                }
+            }
+        }
+
+        redisVo.addAll(redisData);
+
+        switch (type) {
+            case 1:
+                for (int i = 0; i < redisVo.size(); i++) {
+                    if (i == 40) {
+                        break;
+                    }
+                    if (i == 0) {
+                        vo.add(voItem);
+                    } else {
+                        vo.add(redisVo.get(i));
+                    }
+                }
+                if (redisVo.size() == 0) {
+                    vo.add(voItem);
+                }
+                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+                return true;
+            case 2:
+                for (int i = 0; i < redisVo.size(); i++) {
+                    if (i == 40) {
+                        break;
+                    }
+                    if (redisVo.get(i).getOrderTicketsId().equals(orderId)) {
+                        vo.add(voItem);
+                    } else {
+                        vo.add(redisVo.get(i));
+                    }
+                }
+                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public void changeBuyInfo(String userId, String idCard, String performanceId, String ticketId, int buyCount) {
+        String redisKey;
+        KylinPerformanceVo vo = (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
+        int isTrueName = vo.getIsTrueName();
+        String useTime = "";
+        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
+        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
+            ArrayList<String> ticketList = new ArrayList<>();
+            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+                if (ticketItem.getType() == 1) {
+                    ticketList.add(ticketItem.getTicketsId());
+                }
+                if (ticketItem.getTicketsId().equals(ticketId)) {
+                    useTime = ticketItem.getUseStart();
+                }
+            }
+            allTicketId.put(timeItem.getUseStart(), ticketList);
+        }
+
+        if (0 == isTrueName) {
+            redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
+        } else {
+            redisKey = KylinRedisConst.IDCARD_BUY_INFO + idCard;
+        }
+
+        String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
+        String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
+        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
+        redisUtil.set(ticketUseTimeKey, useTime);
+
+        if (buyCount > 0) {
+            redisUtil.incr(ticketIdKey, buyCount);
+            redisUtil.incr(performanceIdKey, buyCount);
+        } else {
+            redisUtil.decr(ticketIdKey, Math.abs(buyCount));
+            redisUtil.decr(performanceIdKey, Math.abs(buyCount));
+        }
+
+//        if (buyCount > 0) {
+//            redisUtil.incr(ticketIdKey, buyCount);
+//            if (1 == ticketType) {
+//                int count = 0;
+//                for (int i = 0; i < allTicketId.get(useTime).size(); i++) {
+//                    String item = allTicketId.get(useTime).get(i);
+//                    if (allTicketId.get(useTime).size() == 1) {
+//                        redisUtil.incr(performanceIdKey, buyCount);
+//                        break;
+//                    }
+//                    if (null == redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
+//                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item, 0);
+//                    }
+//                    if (i == 0) {
+//                        count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
+//                    } else {
+//                        if (count != (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
+//                            redisUtil.incr(performanceIdKey, buyCount);
+//                            break;
+//                        }
+//                    }
+//                }
+//            } else {
+//                redisUtil.incr(performanceIdKey, buyCount);
+//            }
+//        } else {
+//            redisUtil.decr(ticketIdKey, Math.abs(buyCount));
+//            if (1 == ticketType) {
+//                int count = 0;
+//                for (int i = 0; i < allTicketId.get(useTime).size(); i++) {
+//                    String item = allTicketId.get(useTime).get(i);
+//                    if (allTicketId.get(useTime).size() == 1) {
+//                        redisUtil.decr(performanceIdKey, Math.abs(buyCount));
+//                        break;
+//                    }
+//                    if (null == redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
+//                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item, 0);
+//                    }
+//                    if (i == 0) {
+//                        count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
+//                    } else {
+//                        if (count != (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
+//                            redisUtil.decr(performanceIdKey, Math.abs(buyCount));
+//                            break;
+//                        }
+//                    }
+//                }
+//            } else {
+//                redisUtil.decr(performanceIdKey, Math.abs(buyCount));
+//            }
+//        }
+    }
+}

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

+package com.liquidnet.service.consumer.service.impl;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.consumer.service.IBaseDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.annotation.Resource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.LinkedList;
+
+@Service
+public class BaseDao implements IBaseDao {
+    private static final Logger log = LoggerFactory.getLogger(BaseDao.class);
+    @Resource
+    public JdbcTemplate jdbcTemplate;
+    @Resource(name = "transactionManager")
+    public DataSourceTransactionManager transactionManager;
+
+    @Override
+    public Boolean batchSql(final String sql, final LinkedList<Object[]> values) {
+        TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+            @Override
+            public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                if (values.size() > 0) {
+                    int[] ints = jdbcTemplate.batchUpdate(sql, values);
+                }
+                return true;
+            }
+        };
+        try {
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
+            return false;
+        }
+    }
+
+    @Override
+    public Boolean batchSqls(final LinkedList<String> sql,
+                             final LinkedList<Object[]>... values) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    int i = 0;
+                    for (LinkedList<Object[]> o : values) {
+                        if (sql.size() < i + 1) {
+                            break;
+                        }
+                        if (!o.isEmpty()) {
+                            jdbcTemplate.batchUpdate(sql.get(i), o);
+                        }
+                        i++;
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+//            if (ex instanceof LiquidnetServiceException) {
+//                log.error("###Error.Code:{} - {}", ((LiquidnetServiceException) ex).getCode(), ex.getMessage());
+//            } else {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex.getMessage());
+//            }
+            return false;
+        }
+    }
+
+    @Override
+    public Boolean batchSqlNoArgs(final LinkedList<String> sql) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    for (String o : sql) {
+                        jdbcTemplate.execute(o);
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", sql);
+            return false;
+        }
+    }
+
+    /**
+     * xs 新增一条记录且返回主键Id
+     *
+     * @param sql   新增待执行sql
+     * @param param 参数
+     * @return 主键ID
+     */
+    public int insertSqlAndReturnKeyId(final String sql, final Object[] param) {
+        final String innersql = sql;
+        final Object[] innerO = param;
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        try {
+            jdbcTemplate.update(new PreparedStatementCreator() {
+                @Override
+                public PreparedStatement createPreparedStatement(final Connection con)
+                        throws SQLException {
+                    PreparedStatement ps = con.prepareStatement(innersql,
+                            Statement.RETURN_GENERATED_KEYS);
+                    for (int i = 0; i < innerO.length; i++) {
+                        ps.setObject(i + 1, innerO[i]);
+                    }
+
+                    return ps;
+                }
+            }, keyHolder);
+        } catch (Exception e) {
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
+        }
+        return keyHolder.getKey().intValue();
+
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/resources/bootstrap-dev.yml

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: dev
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 127.0.0.1:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-adam

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/resources/bootstrap-prod.yml

+# begin-prod-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: prod
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.189:7001
+# end-prod-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-adam
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/resources/bootstrap-service-consumer-adam.yml

+#eurekaServer配置
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+#configServer配置
+spring:
+  cloud:
+    config:
+#      uri: http://39.106.122.201:7002/support-config
+      profile: ${liquidnet.cloudConfig.profile}
+      name: ${spring.application.name} #默认为spring.application.name
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/resources/bootstrap-test.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.177:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-adam
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: liquidnet-service-consumer-adam
+  profiles:
+    active: dev
\ No newline at end of file

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

@@ -5,14 +5,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
 import java.util.Arrays;
 
 @Slf4j
-@EnableFeignClients
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceKylinApplication implements CommandLineRunner {
     @Autowired

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

@@ -126,20 +126,6 @@ public class KylinOrderTicketsController {
     }
 
 
-    @GetMapping("checkPayment")
-    @ApiOperation("订单状态")
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
-        Integer status = orderTicketsService.checkOrderResult(orderId).getData();
-        if (null == status) {
-            return ResponseDto.failure(ErrorMapping.get("20003"));
-        } else {
-            HashMap<String, Integer> map = new HashMap<>();
-            map.put("status", status);
-            return ResponseDto.success(map);
-        }
-    }
-
     @GetMapping("orderUnPayCount")
     @ApiOperation("待支付演出订单数量")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -700,6 +700,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
     @Override
     public String syncOrder(SyncOrderParam syncOrderParam) {
+        try {
             //支付时间
             LocalDateTime now = LocalDateTime.now();
             String lock = "order_lock:" + syncOrderParam.getOrder_code();
@@ -847,6 +848,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             redisLockUtil.unlock(lock);
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";
+        } catch (Exception e) {
+            log.error("SYNCE ORDER E = "+e.getMessage());
+            e.printStackTrace();
+            return "fail";
+        }
     }
 
     @Override
@@ -907,11 +913,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
     @Override
     public OrderDetailsVo orderDetails(String orderId) {
+        Long currentTime = System.currentTimeMillis();
         OrderDetailsVo vo = new OrderDetailsVo();
         try {
             String uid = CurrentUtil.getCurrentUid();
 //            checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+            currentTime = System.currentTimeMillis() - currentTime;
+            log.debug("获取订单详情 -> time:" + (currentTime) + "毫秒");
             if (!orderTicketVo.getUserId().equals(uid)) {
                 return null;
             }
@@ -919,6 +928,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 //TODO 顺丰快递
                 Object expresses = null;
                 KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("获取演出详情 -> time:" + (currentTime) + "毫秒");
                 List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
                 KylinTicketVo ticketVo = null;
 
@@ -933,6 +944,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         }
                     }
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("巡演票数据 -> time:" + (currentTime) + "毫秒");
 
                 orderTicketVo.setIsTrueName(ticketVo.getIsTrueName());
                 orderTicketVo.setNoticeImage(performanceVo.getNoticeImage());
@@ -949,6 +962,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     orderTicketVo.setQrCode("");
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("获取二维码 -> time:" + (currentTime) + "毫秒");
 
                 // 数据脱敏
                 for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
@@ -959,6 +974,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         item.setEnterMobile(item.getEnterMobile().substring(0, 3) + "****" + item.getEnterMobile().substring(7));
                     }
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("入场人加密 -> time:" + (currentTime) + "毫秒");
                 //计算 倒计时
                 Date nowDate = DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss");
                 if (orderTicketVo.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
@@ -972,6 +989,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     vo.setRestTime(0L);
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("获取倒计时 -> time:" + (currentTime) + "毫秒");
                 //快递
                 if (null != expresses) {
                     vo.setExpress_number("");//expresses.getNumber()
@@ -994,9 +1013,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     vo.setIsCanRefund(0);
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("是否支持退款 -> time:" + (currentTime) + "毫秒");
 
                 List<KylinOrderRefundsOrderCodeVo> orderRefundsVoBaseList = new ArrayList<>();
                 List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
                 for (KylinOrderRefundsVo item : orderRefundsVoList) {
                     KylinOrderRefundsOrderCodeVo data = new KylinOrderRefundsOrderCodeVo();
                     data.setOrderRefundsId(item.getOrderRefundsId());
@@ -1012,6 +1035,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     data.setStatus(item.getStatus());
                     orderRefundListVos.add(data);
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("循环退款详情 -> time:" + (currentTime) + "毫秒");
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
                 vo.setOrderRefundsVoList(orderRefundsVoBaseList);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java

@@ -63,4 +63,18 @@ public class KylinOrderTicketsController {
     public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
         return orderTicketsService.syncOrder(syncOrderParam);
     }
+
+    @GetMapping("checkPayment")
+    @ApiOperation("订单状态")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
+        Integer status = orderTicketsService.checkOrderResult(orderId).getData();
+        if (null == status) {
+            return ResponseDto.failure(ErrorMapping.get("20003"));
+        } else {
+            HashMap<String, Integer> map = new HashMap<>();
+            map.put("status", status);
+            return ResponseDto.success(map);
+        }
+    }
 }

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

@@ -708,6 +708,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
     @Override
     public String syncOrder(SyncOrderParam syncOrderParam) {
+        try {
             //支付时间
             LocalDateTime now = LocalDateTime.now();
             String lock = "order_lock:" + syncOrderParam.getOrder_code();
@@ -754,7 +755,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             if (orderTicketData.getStatus() == 2) {
                 mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
                 log.error("订单号位 {} 的订单超时支付", syncOrderParam.getOrder_code());
-//            orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
+                orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
             } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
                 log.error("订单号位 {} 的订单正在退款 或者已退款", syncOrderParam.getOrder_code());
             } else {
@@ -855,6 +856,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             redisLockUtil.unlock(lock);
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";
+        } catch (Exception e) {
+            log.error("SYNCE ORDER E = "+e.getMessage());
+            e.printStackTrace();
+            return "fail";
+        }
     }
 
     @Override

liquidnet-bus-service/pom.xml

@@ -35,6 +35,7 @@
         <module>liquidnet-service-platform</module>
         <module>liquidnet-service-consumer</module>
         <module>liquidnet-service-executor-all</module>
+        <module>liquidnet-service-consumer-adam</module>
 <!--        <module>liquidnet-service-example</module>-->
 <!--        <module>liquidnet-service-sequence</module>-->
 <!--        <module>liquidnet-service-account</module>-->