diff --git a/muyu-common/muyu-common-core/pom.xml b/muyu-common/muyu-common-core/pom.xml index edf927c..a21cc99 100644 --- a/muyu-common/muyu-common-core/pom.xml +++ b/muyu-common/muyu-common-core/pom.xml @@ -138,6 +138,9 @@ + + + diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index 5b58e93..3689cd6 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -27,4 +27,6 @@ muyu-common通用模块 + + diff --git a/muyu-modules/muyu-product/muyu-product-commo/pom.xml b/muyu-modules/muyu-product/muyu-product-commo/pom.xml index 3945f90..a8553ad 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/pom.xml +++ b/muyu-modules/muyu-product/muyu-product-commo/pom.xml @@ -25,4 +25,5 @@ + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml index bea1ffc..4529ab1 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-product + name: muyu-product-wxy profiles: # 环境配置 active: dev @@ -14,8 +14,9 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 111.231.174.71:8848 - namespace: addbe994-b6ee-4b87-bde0-76f34d2681bd + server-addr: 43.142.117.78:8848 + namespace: 9facbf7b-873b-4e11-b54f-00627208906d + ip: 111.231.174.71 config: # 配置中心地址 server-addr: 111.231.174.71:8848 diff --git a/muyu-modules/muyu-product/pom.xml b/muyu-modules/muyu-product/pom.xml index e5c22a3..c85d5ed 100644 --- a/muyu-modules/muyu-product/pom.xml +++ b/muyu-modules/muyu-product/pom.xml @@ -16,7 +16,6 @@ muyu-product-commo muyu-product-remote muyu-product-server - muyu-product-server diff --git a/muyu-modules/muyu-rabbit/pom.xml b/muyu-modules/muyu-rabbit/pom.xml deleted file mode 100644 index 1b6ba2e..0000000 --- a/muyu-modules/muyu-rabbit/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu - 3.6.3 - ../../pom.xml - - - - - muyu-rabbit - - - - 17 - 17 - UTF-8 - - - - - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - - org.springframework.boot - spring-boot-starter-amqp - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - org.projectlombok - lombok - provided - - - org.junit.jupiter - junit-jupiter-api - 5.8.2 - - - org.springframework.boot - spring-boot-test - 2.7.5 - - - org.springframework - spring-test - 5.3.23 - - - com.alibaba.nacos - nacos-client - - - - - - diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/Consumer/MessageReceiver.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/Consumer/MessageReceiver.java deleted file mode 100644 index 7b92f01..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/Consumer/MessageReceiver.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.rabbit.Consumer; - -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/8 21:02 - */ -@Component -public class MessageReceiver { - - - @RabbitListener(queues = "DxQueue") - public void receiveMessage(@Payload String message) { - try { - // 手动添加异常代码，模拟消费时的异常情况 - if (message.contains("error")) { - throw new RuntimeException("Simulated error"); - } - System.out.println("Received message: " + message); - // 模拟消费成功，打印ack成功日志 - System.out.println("ACK: Message processed successfully"); - } catch (Exception e) { - // 消费异常，打印失败日志 - System.err.println("Failed to process message: " + e.getMessage()); - // 可以选择进行消息的重试或者将消息进行持久化等操作 - } - } -} diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/Consumer/MessageSender.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/Consumer/MessageSender.java deleted file mode 100644 index d11bae6..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/Consumer/MessageSender.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.rabbit.Consumer; - -import org.springframework.amqp.core.AmqpTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/8 21:02 - */ -@Component -public class MessageSender { - - @Autowired - private AmqpTemplate amqpTemplate; - - public void sendMessage(String message){ - amqpTemplate.convertAndSend("exchange", "routingKey", message); - } -} diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/RabbitApplication.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/RabbitApplication.java deleted file mode 100644 index ce1fd32..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/RabbitApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.rabbit; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/8 15:06 - */ -@SpringBootApplication -public class RabbitApplication { - public static void main(String[] args) { - SpringApplication.run(RabbitApplication.class); - } -} diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/RabbitAdminConfig.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/RabbitAdminConfig.java deleted file mode 100644 index 2cdd8ab..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/RabbitAdminConfig.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.muyu.rabbit.util; - -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitAdmin; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * RabbitAdmin是RabbitMQ的一个Java客户端库，它提供了管理RabbitMQ资源的功能。它是通过与RabbitMQ服务器进行交互来执行管理操作的。 - */ -@Configuration -public class RabbitAdminConfig { - - @Value("${spring.rabbitmq.host}") - private String host; - @Value("${spring.rabbitmq.username}") - private String username; - @Value("${spring.rabbitmq.password}") - private String password; - @Value("${spring.rabbitmq.virtualhost}") - private String virtualhost; - - /** - * 构建 RabbitMQ的连接工厂 - * @return - */ - @Bean - public ConnectionFactory connectionFactory() { - CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); - connectionFactory.setAddresses(host); - connectionFactory.setUsername(username); - connectionFactory.setPassword(password); - connectionFactory.setVirtualHost(virtualhost); - // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效 - connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED); - connectionFactory.setPublisherReturns(true); - return connectionFactory; - } - - /** - * 自己初始化 RabbitAdmin - * @param connectionFactory - * @return - */ - @Bean - public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { - RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); - rabbitAdmin.setAutoStartup(true); - return rabbitAdmin; - } -} diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/MqConfig.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/MqConfig.java deleted file mode 100644 index 234d6dd..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/MqConfig.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.muyu.rabbit.util.config; - -import lombok.extern.log4j.Log4j2; -import org.springframework.amqp.core.*; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.connection.CorrelationData; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; -import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -/** - * @CLassName MqConfig - * @Description 描述 - * @Author Meng.Wang - * @Date 2023/11/24 21:15 - */ -@Configuration -@Log4j2 -public class MqConfig implements RabbitTemplate.ReturnsCallback,RabbitTemplate.ConfirmCallback{ - public static final String DXQUEUE = "DxQueue"; - public static final String DXEXCHANGE = "DxExchange"; - public static final String ROUTINGKEY = "RoutingKey"; - - private RabbitTemplate rabbitTemplate; - - //创建消息转换器 - @Bean - public MessageConverter messageConverter(){ - return new Jackson2JsonMessageConverter(); - } - - //创建队列 - @Bean - public Queue queue(){ - return new Queue(DXQUEUE,true); - } - //创建交换机 - @Primary - @Bean - public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory){ - RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory); - this.rabbitTemplate = rabbitTemplate; - rabbitTemplate.setMessageConverter(messageConverter()); - rabbitTemplate(); - return rabbitTemplate; - } - - @Bean("DxExchange") - public DirectExchange directExchange(){ - return new DirectExchange(DXEXCHANGE); - } - - public void rabbitTemplate(){ - rabbitTemplate.setConfirmCallback(this); - rabbitTemplate.setReturnsCallback(this); - } - - @Bean - public Binding binding(){ - return BindingBuilder.bind(queue()).to(directExchange()).with(ROUTINGKEY); - } - - @Override - public void confirm(CorrelationData correlationData, boolean b, String s) { - if(b){ - log.info("{}消息到达交换机",correlationData.getId()); - }else { - log.error("{}消息丢失",correlationData.getId()); - } - } - - @Override - public void returnedMessage(ReturnedMessage returnedMessage) { - log.error("{}消息未到达队列",returnedMessage.getMessage().getMessageProperties().getMessageId()); - } -} diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/RabbitConfig.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/RabbitConfig.java deleted file mode 100644 index c9d1013..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/RabbitConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.rabbit.util.config; - - - - - - -import org.springframework.amqp.core.AmqpTemplate; -import org.springframework.amqp.rabbit.annotation.EnableRabbit; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.sql.Connection; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/8 20:23 - */ -@Configuration -@EnableRabbit -public class RabbitConfig { - - - @Bean - public AmqpTemplate rabbitTemplate(ConnectionFactory connectionFactory) { - return new RabbitTemplate(connectionFactory); - } - - -} diff --git a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/RabbitMQConfig.java b/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/RabbitMQConfig.java deleted file mode 100644 index 10c237a..0000000 --- a/muyu-modules/muyu-rabbit/src/main/java/com/muyu/rabbit/util/config/RabbitMQConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.rabbit.util.config; - -import org.springframework.amqp.core.Queue; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @Author: wangxinyuan - * @Date: 2024/4/8 21:00 - */ -@Configuration -public class RabbitMQConfig { - - @Bean - public Queue queue() { - return new Queue("queue"); - } -} diff --git a/muyu-modules/muyu-rabbit/src/main/resources/bootstrap.yml b/muyu-modules/muyu-rabbit/src/main/resources/bootstrap.yml deleted file mode 100644 index cd7362c..0000000 --- a/muyu-modules/muyu-rabbit/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,65 +0,0 @@ -server: - port: 9197 -spring: - datasource: - druid: - stat-view-servlet: - enabled: true - loginUsername: admin - loginPassword: 123456 - dynamic: - druid: - initial-size: 5 - min-idle: 5 - maxActive: 20 - maxWait: 60000 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - filters: stat,slf4j - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 - datasource: - # 主库数据源 - master: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.231.174.71:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: wxy@123 - # 从库数据源 - # slave: - # username: - # password: - # url: - # driver-class-name: - main: - allow-bean-definition-overriding: true - application: - name: muyu-rabbit - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - serverAddr: 111.231.174.71:8848 - config: - serverAddr: 111.231.174.71:8848 - fileExtension: yml - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - rabbitmq: - username: guest - password: guest - virtualHost: / - port: 5672 - host: 111.231.174.71 - listener: - simple: - prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 - publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) - publisher-returns: true #确认消息已发送到队列(Queue) diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 846198c..74c0af2 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -13,8 +13,10 @@ muyu-gen muyu-job muyu-file + muyu-product + muyu-modules pom @@ -22,4 +24,6 @@ muyu-modules业务模块 + + diff --git a/pom.xml b/pom.xml index 088dd75..2d1f756 100644 --- a/pom.xml +++ b/pom.xml @@ -215,8 +215,6 @@ muyu-visual muyu-modules muyu-common - muyu-modules/muyu-product - muyu-modules/muyu-rabbit pom @@ -255,22 +253,7 @@ - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - true - - - - compile - - jar - - - - + @@ -308,4 +291,6 @@ + +