From a00d810984fe187d24e442d5f557bcc271cfa3ce Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 28 Jan 2021 11:25:49 +0800 Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new --- src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java | 98 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 88 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java index 7be7a45..0aadb71 100644 --- a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java +++ b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java @@ -21,36 +21,44 @@ @Configuration public class RabbitMqConfig { - public static final String EXCHANGE_ONE = "excoin-exchange-one"; + public static final String EXCHANGE_ONE = "biue-exchange-one"; public static final String QUEUE_TEST = "test-queue"; public static final String ROUTING_KEY_TEST = "test-routingKey"; - public static final String EXCHANGE_A = "biyi-exchange-A"; + public static final String EXCHANGE_A = "biue-exchange-A"; // 开多止盈队列 - public static final String QUEUE_MOREPRO = "QUEUE_MOREPRO"; + public static final String QUEUE_MOREPRO = "QUEUE_MOREPRO_NEW"; // 开空止盈队列 - public static final String QUEUE_LESSPRO = "QUEUE_LESSPRO"; + public static final String QUEUE_LESSPRO = "QUEUE_LESSPRO_NEW"; // 开多止损队列 - public static final String QUEUE_MORELOSS = "QUEUE_MORELOSS"; + public static final String QUEUE_MORELOSS = "QUEUE_MORELOSS_NEW"; // 开空止损队列 - public static final String QUEUE_LESSLOSS = "QUEUE_LESSLOSS"; + public static final String QUEUE_LESSLOSS = "QUEUE_LESSLOSS_NEW"; // 限价委托 public static final String QUEUE_LIMIT = "QUEUE_LIMIT_NEW"; + // 委托平仓 + public static final String QUEUE_LIMIT_CLOSE = "QUEUE_LIMIT_CLOSE_NEW"; + // 爆仓队列 - public static final String QUEUE_COINOUT = "QUEUE_COINOUT"; + public static final String QUEUE_COINOUT = "QUEUE_COINOUT_NEW"; //价格操作 - public static final String QUEUE_PRICEOPERATE = "QUEUE_PRICEOPERATE"; + public static final String QUEUE_PRICEOPERATE = "QUEUE_PRICEOPERATE_NEW"; // 平仓队列 - public static final String QUEUE_CLOSETRADE = "QUEUE_CLOSETRADE"; + public static final String QUEUE_CLOSETRADE = "QUEUE_CLOSETRADE_NEW"; + // 全仓爆仓 + public static final String QUEUE_WHOLE_BOMB = "QUEUE_WHOLE_BOMB_NEW"; + + // 全仓价格操作 + public static final String QUEUE_WHOLE_PRICE = "QUEUE_WHOLE_PRCE"; // 开多止盈路由键 @@ -72,6 +80,15 @@ public static final String ROUTINGKEY_PRICEOPERATE = "ROUTINGKEY_PRICEOPERATE"; // 平仓路由 public static final String ROUTINGKEY_CLOSETRADE = "ROUTINGKEY_CLOSETRADE"; + + // 委托平仓 + public static final String ROUTINGKEY_LIMIT_CLOSE = "ROUTINGKEY_LIMIT_CLOSE"; + + // 全仓爆仓 + public static final String ROUTINGKEY_WHOLE_BOMB = "ROUTINGKEY_WHOLE_BOMB"; + + // 全仓价格操作 + public static final String ROUTINGKEY_WHOLE_PRICE = "ROUTINGKEY_WHOLE_PRICE"; @Resource private ConnectionFactory connectionFactory; @@ -118,9 +135,9 @@ } - /** * 开多止盈队列 + * * @return */ @Bean @@ -131,6 +148,7 @@ /** * 开空止盈队列 + * * @return */ @Bean @@ -141,6 +159,7 @@ /** * 开多止损 + * * @return */ @Bean @@ -151,6 +170,7 @@ /** * 开空止损 + * * @return */ @Bean @@ -161,6 +181,7 @@ /** * 限价委托 + * * @return */ @Bean @@ -168,9 +189,20 @@ return new Queue(QUEUE_LIMIT, true); } + /** + * 委托平仓 + * + * @return + */ + @Bean + public Queue queueLimitClose() { + return new Queue(QUEUE_LIMIT_CLOSE, true); + } + /** * 爆仓 + * * @return */ @Bean @@ -180,6 +212,7 @@ /** * 价格操作 + * * @return */ @Bean @@ -189,6 +222,7 @@ /** * 价格操作 + * * @return */ @Bean @@ -196,10 +230,28 @@ return new Queue(QUEUE_CLOSETRADE, true); } + @Bean + public Queue queueWholePrice() { + return new Queue(QUEUE_WHOLE_PRICE, true); + } + /** + * 全仓爆仓 + * @return + */ + @Bean + public Queue queueWholeBomb() { + return new Queue(QUEUE_WHOLE_BOMB, true); + } + + @Bean + public Binding bindingWholePrice() { + return BindingBuilder.bind(queueWholePrice()).to(orderExchange()).with(RabbitMqConfig.ROUTINGKEY_WHOLE_PRICE); + } /** * 开多止盈 + * * @return */ @Bean @@ -209,6 +261,7 @@ /** * 开空止盈 + * * @return */ @Bean @@ -218,6 +271,7 @@ /** * 开多止损 + * * @return */ @Bean @@ -227,6 +281,7 @@ /** * 开空止损 + * * @return */ @Bean @@ -237,6 +292,7 @@ /** * 委托 + * * @return */ @Bean @@ -244,9 +300,19 @@ return BindingBuilder.bind(queueLimit()).to(orderExchange()).with(RabbitMqConfig.ROUTINGKEY_LIMIT); } + /** + * 委托平仓 + * + * @return + */ + @Bean + public Binding bindingLimitClose() { + return BindingBuilder.bind(queueLimitClose()).to(orderExchange()).with(RabbitMqConfig.ROUTINGKEY_LIMIT_CLOSE); + } /** * 爆仓 + * * @return */ @Bean @@ -257,6 +323,7 @@ /** * 价格操作 + * * @return */ @Bean @@ -266,6 +333,7 @@ /** * 平仓绑定 + * * @return */ @Bean @@ -273,4 +341,14 @@ return BindingBuilder.bind(queueCloseTrade()).to(orderExchange()).with(RabbitMqConfig.ROUTINGKEY_CLOSETRADE); } + /** + * 全仓爆仓绑定 + * + * @return + */ + @Bean + public Binding bindingWholeBomb() { + return BindingBuilder.bind(queueWholeBomb()).to(orderExchange()).with(RabbitMqConfig.ROUTINGKEY_WHOLE_BOMB); + } + } -- Gitblit v1.9.1