修改文件存储路径

device-manager-ui/admin/vue.config.js

@@ -17,11 +17,7 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/m': {
-<<<<<<< HEAD
 				target: 'http://192.168.0.98:11078',
-=======
-				target: 'http://localhost:18222',
->>>>>>> ad2b523910bb4a6a40f0558c71647fb6ec299e09
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'plm.testnew.com',			

device-manager/src/main/java/com/mortals/xhx/base/framework/config/RabbitConfig.java

@@ -18,34 +18,34 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class RabbitConfig {
-//    @Autowired
-//    private SimpleDynamicListener simpleDynamicListener;
-//
-//    //@Bean("simpleMessageListenerContainer")
-//    public SimpleMessageListenerContainer simpleMessageListenerContainer(CachingConnectionFactory cachingConnectionFactory) {
-//        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(cachingConnectionFactory);
-//        container.setAcknowledgeMode(AcknowledgeMode.MANUAL);
-//        container.setConcurrentConsumers(10);
-//        container.setMaxConcurrentConsumers(100);
-//        container.setMessageListener(simpleDynamicListener);//配置队列监听器
-//        container.start();
-//        return container;
-//    }
+    @Autowired
+    private SimpleDynamicListener simpleDynamicListener;
+
+    //@Bean("simpleMessageListenerContainer")
+    public SimpleMessageListenerContainer simpleMessageListenerContainer(CachingConnectionFactory cachingConnectionFactory) {
+        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(cachingConnectionFactory);
+        container.setAcknowledgeMode(AcknowledgeMode.MANUAL);
+        container.setConcurrentConsumers(10);
+        container.setMaxConcurrentConsumers(100);
+        container.setMessageListener(simpleDynamicListener);//配置队列监听器
+        container.start();
+        return container;
+    }
 
 
-//    @Bean(name = "consumerBatchContainerFactory")
-//    public SimpleRabbitListenerContainerFactory consumerBatchContainerFactory(
-//            SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
-//        // 创建 SimpleRabbitListenerContainerFactory 对象
-//        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
-//        configurer.configure(factory, connectionFactory);
-//        // 额外添加批量消费的属性
-//        factory.setBatchListener(true);
-//        factory.setBatchSize(20);
-//        factory.setReceiveTimeout(5 * 1000L);
-//        factory.setConsumerBatchEnabled(true);
-//        return factory;
-//    }
+    @Bean(name = "consumerBatchContainerFactory")
+    public SimpleRabbitListenerContainerFactory consumerBatchContainerFactory(
+            SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
+        // 创建 SimpleRabbitListenerContainerFactory 对象
+        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+        configurer.configure(factory, connectionFactory);
+        // 额外添加批量消费的属性
+        factory.setBatchListener(true);
+        factory.setBatchSize(20);
+        factory.setReceiveTimeout(5 * 1000L);
+        factory.setConsumerBatchEnabled(true);
+        return factory;
+    }
 
     //修改系列和与反序列化转换器
     @Bean
@@ -54,12 +54,12 @@ public class RabbitConfig {
     }
 
 
-//    @Bean
-//    public AsyncRabbitTemplate asyncRabbitTemplate(RabbitTemplate rabbitTemplate) {
-//        AsyncRabbitTemplate asyncRabbitTemplate = new AsyncRabbitTemplate(rabbitTemplate);
-//        asyncRabbitTemplate.setReceiveTimeout(10000);
-//        return asyncRabbitTemplate;
-//    }
+    @Bean
+    public AsyncRabbitTemplate asyncRabbitTemplate(RabbitTemplate rabbitTemplate) {
+        AsyncRabbitTemplate asyncRabbitTemplate = new AsyncRabbitTemplate(rabbitTemplate);
+        asyncRabbitTemplate.setReceiveTimeout(10000);
+        return asyncRabbitTemplate;
+    }
 
 
 }

device-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java

@@ -12,7 +12,7 @@ import com.mortals.framework.exception.AppException;
 /**
  * 统一异常处理
  */
-//@ControllerAdvice
+@ControllerAdvice
 public class ExceptionHandle {
 
 	private final static Logger log = LoggerFactory.getLogger(ExceptionHandle.class);

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * @description:
  **/
 @Slf4j
-//@Service
+@Service
 public class SimpleDynamicListener implements ChannelAwareMessageListener {
 
     @Override