remove mq

cif-service/pom.xml

@@ -160,12 +160,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <version>2.2.2</version>
-        </dependency>
-
         <!-- xxl-job-core -->
         <dependency>
             <groupId>com.xuxueli</groupId>
@@ -231,11 +225,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>

cif-service/src/main/java/com/txz/cif/mq/AsyncSendThread.java

@@ -1,27 +0,0 @@
-//package com.medipath.cif.web.thread;
-//
-//import cn.hutool.core.util.StrUtil;
-//import com.medipath.cif.mq.rocket.producer.Producers;
-//import lombok.*;
-//
-///**
-// * 异步发送消息
-// * @author linxk
-// * @date 20200508
-// */
-//@AllArgsConstructor
-//@NoArgsConstructor
-//@Builder
-//@Getter
-//@Setter
-//public class AsyncSendThread extends Thread {
-//    private Producers producers;
-//    private String    topicType;
-//    private Object payLoad;
-//    @Override
-//    public void run() {
-//        if (producers != null && StrUtil.isNotBlank(topicType) && payLoad != null ){
-//            producers.asyncSend(topicType,payLoad);
-//        }
-//    }
-//}

cif-service/src/main/java/com/txz/cif/mq/RabbitConfig.java

@@ -1,22 +0,0 @@
-// package com.yiweikeji.cif.mq;
-//
-// import org.springframework.amqp.core.Queue;
-// import org.springframework.context.annotation.Bean;
-// import org.springframework.context.annotation.Configuration;
-//
-// /**
-//  *  MQ配置类
-//  *
-//  * @author limincheng
-//  * @version $Id: RabbitConfig.java, v 0.1 2019年1月8日 上午11:45:06 limincheng Exp $
-//  */
-// @Configuration
-// public class RabbitConfig {
-//
-//     @Bean
-//     public Queue fooQueue() {
-//         return new Queue("cif");
-//     }
-//
-//
-// }

cif-service/src/main/java/com/txz/cif/mq/Receiver.java

@@ -1,35 +0,0 @@
-// package com.yiweikeji.cif.mq;
-// import javax.annotation.Resource;
-//
-// import com.yiweikeji.cif.service.UserFriendService;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
-// import org.springframework.amqp.rabbit.annotation.RabbitListener;
-// import org.springframework.messaging.handler.annotation.Payload;
-// import org.springframework.stereotype.Component;
-//
-//
-// @Component
-// public class Receiver {
-//
-//     private static final Logger LOGGER = LoggerFactory.getLogger(Receiver.class);
-//
-//     @Resource
-//     UserFriendService userFriendService;
-//
-//     @RabbitListener(queues = "cif")
-//     public void process(@Payload MqMessage mqMessage) {
-//         try {
-//             LOGGER.info("【MQ触发】接受cif消息"+mqMessage);
-//             if(BizCodeEnum.INTERACTIVE == mqMessage.getBizCode()){
-//                 //好友互动：
-//                 UserFri11endInteractive bean = (UserFriendI11nteractive)mqMessage.getData();
-//                 userFriendService.interactive(bean);
-//             }
-//             LOGGER.info("【MQ触发】接受cif消息完成:"+mqMessage);
-//         } catch (Exception e) {
-//             LOGGER.error("【MQ触发】接受cif消息异常", e);
-//         }
-//     }
-//
-// }

cif-service/src/main/java/com/txz/cif/mq/Sender.java

@@ -1,32 +0,0 @@
-// package com.yiweikeji.cif.mq;
-//
-// import javax.annotation.Resource;
-//
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
-// import org.springframework.amqp.rabbit.core.RabbitTemplate;
-// import org.springframework.stereotype.Component;
-//
-//
-// @Component
-// public class Sender {
-//
-//     private static final Logger LOGGER = LoggerFactory.getLogger(Receiver.class);
-//
-//     @Resource
-//     private RabbitTemplate rabbitTemplate;
-//
-//     public void sendToCif(String msg) {
-//         LOGGER.info("send msg to cif:"+msg);
-//         UserFriend11Interactive a = new UserFrien11dInteractive();
-//         a.setFriendUserId("2");
-//         a.setUserId("1");
-//         MqMessage<UserFriendIntera11ctive11> message = new MqMessage<>();
-//         message.setBizCode(BizCodeEnum.INTERACTIVE);
-//         message.setData(a);
-//         this.rabbitTemplate.convertAndSend("cif", message);
-//         LOGGER.info("sended msg to cif:"+msg);
-//     }
-//
-//
-// }

cif-service/src/main/java/com/txz/cif/mq/been/DeviceRequest.java

@@ -1,45 +0,0 @@
-package com.txz.cif.mq.been;
-
-import cn.hutool.json.JSONUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-
-@Builder
-@Data
-@ApiModel("一体机请求")
-public class DeviceRequest<T> {
-
-    /**
-     * 服务类型
-     */
-    @ApiModelProperty("服务类型")
-    private String service;
-
-    /**
-     * 时间
-     */
-    @ApiModelProperty("时间")
-    private Long timestamp;
-
-    /**
-     * 返回数据
-     */
-    @ApiModelProperty("返回数据")
-    private T data;
-
-    public DeviceRequest(String service, Long timestamp, T data) {
-        this.service = service;
-        this.timestamp = timestamp;
-        this.data = data;
-    }
-
-    public DeviceRequest() {
-    }
-
-    @Override
-    public String toString() {
-        return JSONUtil.toJsonStr(this);
-    }
-}

cif-service/src/main/java/com/txz/cif/mq/been/OrderRequest.java

@@ -1,31 +0,0 @@
-package com.txz.cif.mq.been;
-
-import cn.hutool.json.JSONUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-
-@Builder
-@Data
-@ApiModel("图片请求")
-public class OrderRequest {
-
-    /**
-     * 提示语
-     */
-    @ApiModelProperty("平台订单号")
-    private String flowNo;
-
-    /**
-     * 提示语
-     */
-    @ApiModelProperty("机器端业务编号")
-    private String bizNo;
-
-
-    @Override
-    public String toString() {
-        return JSONUtil.toJsonStr(this);
-    }
-}

cif-service/src/main/java/com/txz/cif/mq/rocket/consumers/Consumers.java

@@ -1,81 +0,0 @@
-//package com.medipath.cif.mq.rocket.consumers;
-//
-//import com.medipath.cif.service.UserService;
-//import com.medipath.cif.configurer.IpConfiguration;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.annotation.Resource;
-//
-///**
-// * 异步消费采集器上报预警消息
-// *
-// * @author Administrator
-// * @version $Id: Consumers.java, v 0.1 2019年5月30日 下午3:11:28 Administrator Exp $
-// */
-//@Configuration
-//public class Consumers {
-//
-//    private final Logger logger = LoggerFactory.getLogger(getClass());
-//
-//    @Resource
-//    private UserService userService;
-//
-//    @Resource
-//    private IpConfiguration ipConfiguration;
-//
-////    @Service
-////    @RocketMQMessageListener(topic = "${cif.user.info.topic}", consumerGroup = "${spring.application.name}", consumeMode = ConsumeMode.ORDERLY)
-////    public class MyConsumer2 implements RocketMQListener<UserInfo>, RocketMQPushConsumerLifecycleListener {
-////        @Override
-////        public void onMessage(UserInfo mqMessage) {
-////            logger.info("cif： "+ ipConfiguration.getPort() +"received message: {}", mqMessage);
-////            try {
-////                //更新用户单元信息：
-////                if(mqMessage.getUnitId() != null && StrUtil.isNotBlank(mqMessage.getUserId())){
-////                     userService.updateByUserId(User.builder().userId(mqMessage.getUserId()).teachingStage(mqMessage.getUnitName()).teachingStageId(mqMessage.getUnitId()).questionFallibilityProgress(0).questionCalculationProgress(0).build());
-////                }
-////                logger.info("TODO : {}", mqMessage);
-////            } catch (Exception e) {
-////                logger.error("RocketMq解析数据出错", e);
-////                return;
-////            }
-////        }
-////
-////        @Override
-////        public void prepareStart(DefaultMQPushConsumer consumer) {
-////            consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
-////        }
-////
-////    }
-//
-//   // @Service
-//   // @RocketMQMessageListener(topic = "${cif.user.interactive.topic}", consumerGroup = "${spring.application.name}", consumeMode = ConsumeMode.ORDERLY)
-//   // public class MyConsumer3 implements RocketMQListener<UserFriendInteractiveMsg>, RocketMQPushConsumerLifecycleListener {
-//   //     @Override
-//   //     public void onMessage(UserFriendInteractiveMsg mqMessage) {
-//   //         logger.info("cif： "+ ipConfiguration.getPort() +"received message: {}", mqMessage);
-//   //         try {
-//   //             //更新用户单元信息：
-//   //             if(mqMessage.getFriendUserId() != null && StrUtil.isNotBlank(mqMessage.getUserId())){
-//   //                 userFriendService.interactive(mqMessage);
-//   //             }
-//   //             logger.info("TODO : {}", mqMessage);
-//   //         } catch (Exception e) {
-//   //             logger.error("RocketMq解析数据出错", e);
-//   //             return;
-//   //         }
-//   //     }
-//
-//   //     @Override
-//   //     public void prepareStart(DefaultMQPushConsumer consumer) {
-//   //         consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
-//   //     }
-//   //
-//   // }
-//
-//
-//
-//
-//}

cif-service/src/main/java/com/txz/cif/mq/rocket/producer/Producers.java

@@ -1,49 +0,0 @@
-//package com.medipath.cif.mq.rocket.producer;
-//
-//import cn.hutool.log.Log;
-//import cn.hutool.log.LogFactory;
-//import org.apache.rocketmq.client.producer.SendCallback;
-//import org.apache.rocketmq.client.producer.SendResult;
-//import org.apache.rocketmq.spring.core.RocketMQTemplate;
-//import org.springframework.stereotype.Component;
-//
-//
-///**
-// * 传递用户信息消息
-// *
-// * @author lxk
-// */
-//@Component
-//public class Producers {
-//    private final Log log = LogFactory.get();
-//
-//    private final RocketMQTemplate rocketMQTemplate;
-//
-//    public Producers(RocketMQTemplate rocketMQTemplate) {
-//        this.rocketMQTemplate = rocketMQTemplate;
-//    }
-//
-//    public void asyncSend(String topicType, Object payLoad) {
-//        log.info("准备发送消息");
-//        rocketMQTemplate.asyncSend(topicType, payLoad, new SendCallback() {
-//            @Override
-//            public void onSuccess(SendResult sendResult) {
-//                log.info("mq消息发送成功, topic {}, 消息内容 {}", topicType, payLoad);
-//            }
-//
-//            @Override
-//            public void onException(Throwable e) {
-//                rocketMQTemplate.asyncSend(topicType, payLoad, new SendCallback() {
-//                    @Override
-//                    public void onSuccess(SendResult sendResult) {
-////                        log.info("mq消息发送成功, topic {}, 消息内容 {}", topicType, payLoad);
-//                    }
-//                    @Override
-//                    public void onException(Throwable e) {
-////                        log.error("mq消息发送失败, topic {}, 消息内容  {} , 错误详情 {}", topicType, payLoad, e);
-//                    }
-//                });
-//            }
-//        });
-//    }
-//}

cif-service/src/main/resources/bootstrap.properties

@@ -34,9 +34,9 @@ springfox.documentation.enabled=false
 #spring.cloud.nacos.config.ext-config[2].refresh=true
 #spring.cloud.nacos.config.ext-config[3].data-user_id=alipay-${spring.profiles.active}.properties
 #spring.cloud.nacos.config.ext-config[3].refresh=true
-spring.cloud.nacos.config.extension-configs[0]=mq-${spring.profiles.active}.properties
-spring.cloud.nacos.config.extension-configs[1]=redis-${spring.profiles.active}.properties
-spring.cloud.nacos.config.extension-configs[2]=${spring.application.name}-${spring.profiles.active}.properties
+#spring.cloud.nacos.config.extension-configs[0]=mq-${spring.profiles.active}.properties
+spring.cloud.nacos.config.extension-configs[0]=redis-${spring.profiles.active}.properties
+spring.cloud.nacos.config.extension-configs[1]=${spring.application.name}-${spring.profiles.active}.properties
 
 #spring.cloud.nacos.config.ext-config[5].data-user_id=rconsult-${spring.profiles.active}.properties
 #spring.cloud.nacos.config.ext-config[5].refresh=true