合并

sp-service/payment-server/src/main/java/com/pj/listenone/BaseInfoListenOne.java

@@ -1,57 +0,0 @@
-package com.pj.listenone;
-
-import cn.hutool.core.util.RandomUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.pj.bank_byte.BankByte;
-import com.pj.bank_byte.BankByteMapper;
-import com.pj.dto.DataDto;
-import com.pj.enummj.FinishStatus;
-import com.pj.rabbitmqone.RabbitMQOne;
-import com.pj.utils.ht.AESUtil;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-@Component
-public class BaseInfoListenOne {
-
-
-    @Autowired
-    private BankByteMapper bankByteMapper;
-
-    /**
-     * 监听: 接收并保存银行回执信息
-     * @param json
-     */
-    @RabbitListener(queuesToDeclare = @Queue(RabbitMQOne.TEST_ACCEPT_QUEUE))
-    public void accept(Message json){
-        System.out.println("-----------------开始接收:银行回执信息------------------------");
-        byte[] content = json.getBody();
-        //保存到数据库
-        String jsonString = new String(content);
-        bankByteMapper.insert(new BankByte(RandomUtil.randomString(64),jsonString, RabbitMQOne.TEST_ACCEPT_QUEUE, FinishStatus.FINISH_STATUS_ZERO.getCode(),new Date()));
-        System.out.println("-----------------完成接收:银行回执信息------------------------");
-
-    }
-
-
-    /**
-     * 测试接收
-     * 测试已通过
-     */
-    @RabbitListener(queuesToDeclare = @Queue(RabbitMQOne.TEST_SEND_QUEUE))
-    public void sendMessage(Message dataDto1){
-        System.out.println("---------开始发送:银行接口报文-----------------");
-        byte[] body = dataDto1.getBody();
-        String s = new String(body);
-        DataDto dataDto = JSONObject.parseObject(s, DataDto.class);
-        //String cbc = AESUtil.decryptCBC(dataDto.getData(), RabbitMQOne.ACC_KEY);
-        //OrderDto orderDto = JSONObject.parseObject(cbc, OrderDto.class);
-        System.out.println(dataDto.getData() + "\n---------结束发送:银行接口报文-----------------");
-    }
-
-}

sp-service/payment-server/src/main/java/com/pj/listentwo/BaseInfoListenTwo.java

@@ -1,57 +0,0 @@
-package com.pj.listentwo;
-
-import cn.hutool.core.util.RandomUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.pj.bank_byte.BankByte;
-import com.pj.bank_byte.BankByteMapper;
-import com.pj.dto.DataDto;
-import com.pj.enummj.FinishStatus;
-import com.pj.rabbitmqtwo.RabbitMQTwo;
-import com.pj.utils.ht.AESUtil;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-@Component
-public class BaseInfoListenTwo {
-
-
-    @Autowired
-    private BankByteMapper bankByteMapper;
-
-    /**
-     * 监听: 接收并保存银行回执信息
-     * @param json
-     */
-    @RabbitListener(queuesToDeclare = @Queue(RabbitMQTwo.TEST_ACCEPT_QUEUE))
-    public void accept(Message json){
-        System.out.println("-----------------开始接收:银行回执信息------------------------");
-        byte[] content = json.getBody();
-        //保存到数据库
-        String jsonString = new String(content);
-        bankByteMapper.insert(new BankByte(RandomUtil.randomString(64),jsonString, RabbitMQTwo.TEST_ACCEPT_QUEUE, FinishStatus.FINISH_STATUS_ZERO.getCode(),new Date()));
-        System.out.println("-----------------完成接收:银行回执信息------------------------");
-
-    }
-
-
-    /**
-     * 测试接收
-     * 测试已通过
-     */
-    @RabbitListener(queuesToDeclare = @Queue(RabbitMQTwo.TEST_SEND_QUEUE))
-    public void sendMessage(Message dataDto1){
-        System.out.println("---------开始发送:银行接口报文-----------------");
-        byte[] body = dataDto1.getBody();
-        String s = new String(body);
-        DataDto dataDto = JSONObject.parseObject(s, DataDto.class);
-        //String cbc = AESUtil.decryptCBC(dataDto.getData(), RabbitMQOne.ACC_KEY);
-        //OrderDto orderDto = JSONObject.parseObject(cbc, OrderDto.class);
-        System.out.println(dataDto.getData() + "\n---------结束发送:银行接口报文-----------------");
-    }
-
-}

sp-service/payment-server/src/main/java/com/pj/rabbitmqtwo/MessageSender.java → sp-service/payment-server/src/main/java/com/pj/rabbitmq/MessageSender.java

@@ -25,11 +25,6 @@ import java.util.Date;
 @Component
 public class MessageSender {
 
-
-
-
-
-
     private final RabbitTemplate levelOneConnectionFactory;
     private final RabbitTemplate levelTwoConnectionFactory;
     private final RabbitMQProperties rabbitMQProperties;

sp-service/payment-server/src/main/java/com/pj/rabbitmqtwo/RabbitmqConfigTwo.java → sp-service/payment-server/src/main/java/com/pj/rabbitmq/RabbitmqConfig.java

@@ -1,18 +1,11 @@
 package com.pj.rabbitmq;
 
 import lombok.Data;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -28,8 +21,8 @@ import javax.annotation.Resource;
 @Data
 public class RabbitmqConfig {
 
- @Resource
- private RabbitMQProperties rabbitMQProperties;
+    @Resource
+    private RabbitMQProperties rabbitMQProperties;
 
     @Bean(name = "levelOneConnectionFactory")
     @Primary
@@ -42,9 +35,10 @@ public class RabbitmqConfig {
         factory.setVirtualHost(rabbitMQProperties.getLevelOneVirtualHost());
         return factory;
     }
+
     @Bean(name = "levelOneRabbitListenerContainer")
     public SimpleRabbitListenerContainerFactory levelOneRabbitListenerContainer(SimpleRabbitListenerContainerFactoryConfigurer configurer,
-                                                                               @Qualifier("levelOneConnectionFactory") ConnectionFactory connectionFactory) {
+                                                                                @Qualifier("levelOneConnectionFactory") ConnectionFactory connectionFactory) {
         SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
         configurer.configure(factory, connectionFactory);
         return factory;
@@ -60,9 +54,10 @@ public class RabbitmqConfig {
         factory.setVirtualHost(rabbitMQProperties.getLevelTwoVirtualHost());
         return factory;
     }
+
     @Bean(name = "levelTwoRabbitListenerContainer")
     public SimpleRabbitListenerContainerFactory levelTwoRabbitListenerContainer(SimpleRabbitListenerContainerFactoryConfigurer configurer,
-                                                                               @Qualifier("levelTwoConnectionFactory") ConnectionFactory connectionFactory) {
+                                                                                @Qualifier("levelTwoConnectionFactory") ConnectionFactory connectionFactory) {
         SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
         configurer.configure(factory, connectionFactory);
         return factory;

sp-service/payment-server/src/main/java/com/pj/rabbitmqone/RabbitMQOne.java

@@ -1,36 +0,0 @@
-package com.pj.rabbitmqone;
-
-
-public class RabbitMQOne {
-
-
-    //public static final String ACC_KEY = "klfksd78974s1d4f";
-
-
-    /**
-     *  发送方队列
-     */
-    public static final String TEST_SEND_QUEUE = "BT_MARKET_INBOUND";
-
-    /**
-     *  发送方路由键
-     */
-    //public static final String TEST_SEND_ROUTING_KEY = "testAcceptKey";
-
-    /**
-     *  接收方队列
-     */
-    public static final String TEST_ACCEPT_QUEUE = "BT_MARKET_OUTBOUND";
-
-    /**
-     *  接收方路由键
-     */
-    //public static final String TEST_ACCEPT_ROUTING_KEY = "testSendKey";
-
-
-    /**
-     *  交换机
-     */
-    public static final String MQ_DIRECT_EXCHANGE = "bt_acquiring_bank_test_mrcc";
-
-}

sp-service/payment-server/src/main/java/com/pj/rabbitmqone/RabbitmqConfigOne.java

@@ -1,76 +0,0 @@
-package com.pj.rabbitmqone;
-
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Queue;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RabbitmqConfigOne {
-//
-//
-//    @Value("${spring.rabbitmq.host}")
-//    private String host;
-//
-//    @Value("${spring.rabbitmq.port}")
-//    private int port;
-//
-//    @Value("${spring.rabbitmq.username}")
-//    private String username;
-//
-//    @Value("${spring.rabbitmq.password}")
-//    private String password;
-//
-//    @Value("${spring.rabbitmq.virtual-host}")
-//    private String virtualHost;
-
-
-
-    /**
-     * 发送时的mq队列
-     * @return
-     */
-    @Bean
-    public Queue testSend(){
-        return new Queue(RabbitMQOne.TEST_SEND_QUEUE,true);
-    }
-
-    /**
-     * 接收时的mq队列
-     * @return
-     */
-    @Bean
-    public Queue testAccept(){
-        return new Queue(RabbitMQOne.TEST_ACCEPT_QUEUE,true);
-    }
-
-    /**
-     * 交换机
-     * @return
-     */
-    @Bean
-    public DirectExchange directExchange(){
-        return new DirectExchange(RabbitMQOne.MQ_DIRECT_EXCHANGE,true,false);
-    }
-
-    /**
-     * 绑定
-     * 发送
-     */
-    /*@Bean
-    public Binding bindingSend(){
-        return BindingBuilder.bind(testSend()).to(directExchange()).with(RabbitMQOne.TEST_SEND_ROUTING_KEY);
-    }*/
-
-    /**
-     * 绑定
-     * 接收
-     */
-    /*@Bean
-    public Binding bindingAccept(){
-        return BindingBuilder.bind(testAccept()).to(directExchange()).with(RabbitMQOne.TEST_ACCEPT_ROUTING_KEY);
-    }*/
-
-}

sp-service/payment-server/src/main/java/com/pj/rabbitmqtwo/RabbitMQTwo.java

@@ -1,36 +0,0 @@
-package com.pj.rabbitmqtwo;
-
-
-public class RabbitMQTwo {
-
-
-    //public static final String ACC_KEY = "klfksd78974s1d4f";
-
-
-    /**
-     *  发送方队列
-     */
-    public static final String TEST_SEND_QUEUE = "BT_ACQUIRING_INBOUND";
-
-    /**
-     *  发送方路由键
-     */
-    //public static final String TEST_SEND_ROUTING_KEY = "testAcceptKey";
-
-    /**
-     *  接收方队列
-     */
-    public static final String TEST_ACCEPT_QUEUE = "BT_ACQUIRING_OUTBOUND";
-
-    /**
-     *  接收方路由键
-     */
-    //public static final String TEST_ACCEPT_ROUTING_KEY = "testSendKey";
-
-
-    /**
-     *  交换机
-     */
-    public static final String MQ_DIRECT_EXCHANGE = "bt_market_bank_test_mrcc";
-
-}

sp-service/payment-server/src/main/java/com/pj/task/BankByteTask.java

@@ -11,7 +11,6 @@ import com.pj.bank_info_charges.BankInfoCharges;
 import com.pj.bank_info_charges.BankInfoChargesService;
 import com.pj.common.core.utils.StringUtils;
 import com.pj.enummj.FinishStatus;
-import com.pj.rabbitmqone.RabbitMQOne;
 import com.pj.utils.ht.AESUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

sp-service/payment-server/src/main/java/com/pj/task/PaymentService.java

@@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSON;
 import com.pj.api.dto.PaymentDto;
 import com.pj.api.dto.PaymentTwoDto;
 import com.pj.dto.DataDto;
-import com.pj.rabbitmqone.RabbitMQOne;
-import com.pj.rabbitmqtwo.RabbitMQTwo;
-import com.pj.utils.ht.AESUtil;
+import com.pj.rabbitmq.MessageSender;
+
 import com.pj.xml.MessageXML;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,12 +15,12 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class PaymentService {
 
-//    @Autowired
-//    private AmqpTemplate amqpTemplate;
+    @Autowired
+    private MessageSender messageSender;
 
     public void testSend(DataDto dataDto) {
         System.out.println("开始发送----------\n"+dataDto.toString());
-        amqpTemplate.convertAndSend(RabbitMQOne.TEST_SEND_QUEUE, dataDto);
+        messageSender.sendToLevelOneMQ(JSON.toJSONString(dataDto));
         System.out.println("结束发送----------");
     }
 
@@ -34,15 +32,8 @@ public class PaymentService {
     public void sendSXB010(PaymentDto paymentDto) {
         log.info("send data to ht:{}", JSON.toJSONString(paymentDto));
         String xml = MessageXML.SXB010(paymentDto);
-        //todo: 数据暂时定死
-        DataDto dataDto = new DataDto();
-        //报文加密
-        String jsonString = JSON.toJSONString(xml);
-        //String encryptCBC = AESUtil.encryptCBC(jsonString, RabbitMQOne.ACC_KEY);
-        dataDto.setData(jsonString);
-
+        messageSender.sendToLevelOneMQ(xml);
         //mq发送信息
-        amqpTemplate.convertAndSend(RabbitMQOne.TEST_SEND_QUEUE, dataDto);
         log.info("send mq msg finish:{}", JSON.toJSONString(xml));
     }
 
@@ -54,15 +45,7 @@ public class PaymentService {
     public void sendSXB013(PaymentDto paymentDto) {
         log.info("send data to ht:{}", JSON.toJSONString(paymentDto));
         String xml = MessageXML.SXB013(paymentDto);
-        //todo: 数据暂时定死
-        DataDto dataDto = new DataDto();
-        //报文加密
-        String jsonString = JSON.toJSONString(xml);
-        //String encryptCBC = AESUtil.encryptCBC(jsonString, RabbitMQOne.ACC_KEY);
-        dataDto.setData(jsonString);
-
-        //mq发送信息
-        amqpTemplate.convertAndSend(RabbitMQOne.TEST_SEND_QUEUE, dataDto);
+        messageSender.sendToLevelOneMQ(xml);
         log.info("send mq msg finish:{}", JSON.toJSONString(xml));
     }
 
@@ -74,15 +57,7 @@ public class PaymentService {
     public void sendSXB023(PaymentDto paymentDto) {
         log.info("send data to ht:{}", JSON.toJSONString(paymentDto));
         String xml = MessageXML.SXB023(paymentDto);
-        //todo: 数据暂时定死
-        DataDto dataDto = new DataDto();
-        //报文加密
-        String jsonString = JSON.toJSONString(xml);
-        //String encryptCBC = AESUtil.encryptCBC(jsonString, RabbitMQOne.ACC_KEY);
-        dataDto.setData(jsonString);
-
-        //mq发送信息
-        amqpTemplate.convertAndSend(RabbitMQOne.TEST_SEND_QUEUE, dataDto);
+        messageSender.sendToLevelOneMQ(xml);
         log.info("send mq msg finish:{}", JSON.toJSONString(xml));
     }
 
@@ -94,15 +69,7 @@ public class PaymentService {
     public void sendMKT006_NoCommission(PaymentTwoDto paymentTwoDto) {
         log.info("send data to ht:{}", JSON.toJSONString(paymentTwoDto));
         String xml = MessageXML.MKT006_NoCommission(paymentTwoDto);
-        //todo: 数据暂时定死
-        DataDto dataDto = new DataDto();
-        //报文加密
-        String jsonString = JSON.toJSONString(xml);
-        //String encryptCBC = AESUtil.encryptCBC(jsonString, RabbitMQTwo.ACC_KEY);
-        dataDto.setData(jsonString);
-
-        //mq发送信息
-        amqpTemplate.convertAndSend(RabbitMQTwo.TEST_SEND_QUEUE, dataDto);
+        messageSender.sendToLevelTwoMQ(xml);
         log.info("send mq msg finish:{}", JSON.toJSONString(xml));
     }
 
@@ -114,15 +81,7 @@ public class PaymentService {
     public void sendMKT006(PaymentTwoDto paymentTwoDto) {
         log.info("send data to ht:{}", JSON.toJSONString(paymentTwoDto));
         String xml = MessageXML.MKT006(paymentTwoDto);
-        //todo: 数据暂时定死
-        DataDto dataDto = new DataDto();
-        //报文加密
-        String jsonString = JSON.toJSONString(xml);
-        //String encryptCBC = AESUtil.encryptCBC(jsonString, RabbitMQTwo.ACC_KEY);
-        dataDto.setData(jsonString);
-
-        //mq发送信息
-        amqpTemplate.convertAndSend(RabbitMQTwo.TEST_SEND_QUEUE, dataDto);
+        messageSender.sendToLevelTwoMQ(xml);
         log.info("send mq msg finish:{}", JSON.toJSONString(xml));
     }