删除rabbitmq日志发送

agent-manager/src/main/java/com/mortals/xhx/base/framework/listener/RabbitLoggingErrorHandler.java

-package com.mortals.xhx.base.framework.listener;
-
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ErrorHandler;
-
-//@Component
-@Slf4j
-public class RabbitLoggingErrorHandler implements ErrorHandler {
-
-    public RabbitLoggingErrorHandler(SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory) {
-        rabbitListenerContainerFactory.setErrorHandler(this);
-    }
-
-    @Override
-    public void handleError(Throwable t) {
-
-        log.error("[handleError][发生异常]]", t);
-    }
-
-}
+//package com.mortals.xhx.base.framework.listener;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.util.ErrorHandler;
+//
+////@Component
+//@Slf4j
+//public class RabbitLoggingErrorHandler implements ErrorHandler {
+//
+//    public RabbitLoggingErrorHandler(SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory) {
+//        rabbitListenerContainerFactory.setErrorHandler(this);
+//    }
+//
+//    @Override
+//    public void handleError(Throwable t) {
+//
+//        log.error("[handleError][发生异常]]", t);
+//    }
+//
+//}

agent-manager/src/main/java/com/mortals/xhx/base/framework/listener/SimpleDynamicListener.java

-package com.mortals.xhx.base.framework.listener;
-
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
-import org.springframework.stereotype.Service;
-
-/**
- * @author: zxfei
- * @date: 2022/8/23 0:32
- * @description:
- **/
-@Slf4j
-//@Service
-public class SimpleDynamicListener implements ChannelAwareMessageListener {
-
-    @Override
-    public void onMessage(Message message, Channel channel)  {
-        try {
-            if (message.equals("exception")) {
-                log.info("rabbitmq ecception!");
-            }
-            String queue = message.getMessageProperties().getConsumerQueue();
-            byte[] body = message.getBody();
-            log.info("接收到：" + queue + "，消息内容为：" + new String(body));
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            log.info(queue + "队列消息消费成功");
-        } catch (Exception e) {
-            log.error("接收消息异常");
-        }
-    }
-}
+//package com.mortals.xhx.base.framework.listener;
+//
+//import com.rabbitmq.client.Channel;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.amqp.core.Message;
+//import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * @author: zxfei
+// * @date: 2022/8/23 0:32
+// * @description:
+// **/
+//@Slf4j
+////@Service
+//public class SimpleDynamicListener implements ChannelAwareMessageListener {
+//
+//    @Override
+//    public void onMessage(Message message, Channel channel)  {
+//        try {
+//            if (message.equals("exception")) {
+//                log.info("rabbitmq ecception!");
+//            }
+//            String queue = message.getMessageProperties().getConsumerQueue();
+//            byte[] body = message.getBody();
+//            log.info("接收到：" + queue + "，消息内容为：" + new String(body));
+//            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+//            log.info(queue + "队列消息消费成功");
+//        } catch (Exception e) {
+//            log.error("接收消息异常");
+//        }
+//    }
+//}

agent-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -31,7 +31,9 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
 
     @Override
     public CompanyEntity getCompanyByH5(H5Req req) {
-        if(req.getParkId()!=null && StringUtils.isNotEmpty(req.getApplyName()) && StringUtils.isNotEmpty(req.getPhone())) {
+        if(req.getParkId()!=null
+                && StringUtils.isNotEmpty(req.getApplyName())
+                && StringUtils.isNotEmpty(req.getPhone())) {
             CompanyEntity companyEntity = this.selectOne(new CompanyQuery().parkId(req.getParkId()).applyName(req.getApplyName()).phone(req.getPhone()));
             if (ObjectUtils.isEmpty(companyEntity)) {
                 companyEntity = new CompanyEntity();

agent-manager/src/test/java/com/mortals/httpclient/declare/DeclareController.http

@@ -18,8 +18,9 @@ POST {{baseUrl}}/declare/interlist
 Content-Type: application/json
 
 {
-    "page":1,
-    "size":10
+  "page": 1,
+  "size": 10,
+  "declareStatus": 1
 }
 
 

agent-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -9,7 +9,11 @@
   },
   "product": {
     "baseUrl": "http://192.168.0.252:11089/agent"
+  },
+  "youxian": {
+    "baseUrl": "http://221.182.0.219:11089/agent"
   }
 
 
+
 }

agent-manager/src/test/java/com/mortals/httpclient/park/ParkController.http

@@ -19,7 +19,7 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":10
+    "size":-1
 }
 
 

base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java

@@ -4,7 +4,6 @@ import com.mortals.framework.model.OperateLogPdu;
 import com.mortals.framework.service.ILogService;
 import com.mortals.framework.service.impl.FileLogServiceImpl;
 import com.mortals.xhx.base.system.oper.service.OperLogService;
-import com.mortals.xhx.system.MessageProducer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,8 +20,8 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
 
     @Autowired
     private OperLogService operLogService;
-    @Autowired
-    private MessageProducer messageProducer;
+//    @Autowired
+//    private MessageProducer messageProducer;
 
     @Override
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
@@ -42,7 +41,7 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
         operateLogPdu.setLogDate(logDate);
         operateLogPdu.setContent(content);
         operateLogPdu.setOperType(1);
-        messageProducer.syncOperSend(operateLogPdu);
+      //  messageProducer.syncOperSend(operateLogPdu);
 
     }
 

common-lib/pom.xml

@@ -25,10 +25,10 @@
         </dependency>
 
         <!-- 实现对 RabbitMQ 的自动化配置 -->
-        <dependency>
+  <!--      <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
+        </dependency>-->
 
   <!--      <dependency>
             <groupId>io.sentry</groupId>
@@ -58,18 +58,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>2.6.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.rabbitmq</groupId>
-            <artifactId>amqp-client</artifactId>
-            <version>4.8.0</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>

common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java

@@ -8,8 +8,6 @@ import com.mortals.framework.model.OperateLogPdu;
 import com.mortals.framework.service.IMessageProduceService;
 import com.mortals.xhx.common.keys.QueueKey;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
@@ -21,30 +19,30 @@ import java.nio.charset.StandardCharsets;
 @Slf4j
 public class MessageProducer implements IMessageProduceService {
 
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
 
     public void syncAccessSend(AccessLogPdu accessLogPdu) {
         //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
         //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
 
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
+        //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
         //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
     }
 
     @Override
     public void syncBizSend(BizLogPdu bizLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
+        //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
     }
 
     @Override
     public void syncErrorSend(ErrorLogPdu errorLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
+       //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
     }
 
     @Override
     public void syncOperSend(OperateLogPdu operLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
+       // rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
     }
 
 }

common-lib/src/main/java/com/mortals/xhx/system/RabbitConfig.java

-package com.mortals.xhx.system;
-
-import org.springframework.amqp.rabbit.AsyncRabbitTemplate;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.amqp.support.converter.MessageConverter;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-//@Configuration
-public class RabbitConfig {
-
-    //@Bean(name = "consumerBatchContainerFactory")
-    public SimpleRabbitListenerContainerFactory consumerBatchContainerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
-        // 创建 SimpleRabbitListenerContainerFactory 对象
-        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
-        configurer.configure(factory, connectionFactory);
-        // 额外添加批量消费的属性
-        factory.setBatchListener(true);
-        factory.setBatchSize(10);
-        factory.setReceiveTimeout(30 * 1000L);
-        factory.setConsumerBatchEnabled(true);
-        return factory;
-    }
-
-    //修改系列和与反序列化转换器
-//    @Bean
-//    public MessageConverter messageConverter() {
-//        return new Jackson2JsonMessageConverter();
+//package com.mortals.xhx.system;
+//
+//import org.springframework.amqp.rabbit.AsyncRabbitTemplate;
+//import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+//import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+//import org.springframework.amqp.support.converter.MessageConverter;
+//import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+////@Configuration
+//public class RabbitConfig {
+//
+//    //@Bean(name = "consumerBatchContainerFactory")
+//    public SimpleRabbitListenerContainerFactory consumerBatchContainerFactory(
+//            SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
+//        // 创建 SimpleRabbitListenerContainerFactory 对象
+//        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+//        configurer.configure(factory, connectionFactory);
+//        // 额外添加批量消费的属性
+//        factory.setBatchListener(true);
+//        factory.setBatchSize(10);
+//        factory.setReceiveTimeout(30 * 1000L);
+//        factory.setConsumerBatchEnabled(true);
+//        return factory;
 //    }
-
-
-    //@Bean
-    public AsyncRabbitTemplate asyncRabbitTemplate(RabbitTemplate rabbitTemplate) {
-        AsyncRabbitTemplate asyncRabbitTemplate = new AsyncRabbitTemplate(rabbitTemplate);
-        asyncRabbitTemplate.setReceiveTimeout(10000);
-        return asyncRabbitTemplate;
-    }
-
-}
+//
+//    //修改系列和与反序列化转换器
+////    @Bean
+////    public MessageConverter messageConverter() {
+////        return new Jackson2JsonMessageConverter();
+////    }
+//
+//
+//    //@Bean
+//    public AsyncRabbitTemplate asyncRabbitTemplate(RabbitTemplate rabbitTemplate) {
+//        AsyncRabbitTemplate asyncRabbitTemplate = new AsyncRabbitTemplate(rabbitTemplate);
+//        asyncRabbitTemplate.setReceiveTimeout(10000);
+//        return asyncRabbitTemplate;
+//    }
+//
+//}

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java

@@ -6,7 +6,6 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.AccessLogPdu;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.common.utils.IpUtils;
-import com.mortals.xhx.system.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +51,6 @@ import java.util.Map;
 public class AccessLogFilter implements GlobalFilter, Ordered {
     @Value("${spring.application.name:gateway}")
     private String appName;
-    @Autowired
-    private MessageProducer messageProducer;
 
     private static final String TRACE_ID = "traceId";
     private static final String SPAN_ID = "spanId";

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GatewayResponseFilter.java

 package com.mortals.xhx.base.framework.filter;
 
 import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.system.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
 import org.reactivestreams.Publisher;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GlobalLogFilter.java

@@ -2,7 +2,6 @@ package com.mortals.xhx.base.framework.filter;
 
 import cn.hutool.core.util.IdUtil;
 import com.mortals.xhx.base.framework.config.CustomGatewayProperties;
-import com.mortals.xhx.system.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;