diff --git a/Backend/pom.xml b/Backend/pom.xml index 81acfe6..7511c06 100644 --- a/Backend/pom.xml +++ b/Backend/pom.xml @@ -9,25 +9,22 @@ 3.2.2 + com.wonder bi-backend 0.0.1-SNAPSHOT bi-backend + 21 + org.springframework.boot spring-boot-starter-amqp - - - com.rabbitmq - amqp-client - 5.17.0 - org.redisson diff --git a/Backend/sql/create_table.sql b/Backend/sql/create_table.sql index 1bf7fca..2d0b39e 100644 --- a/Backend/sql/create_table.sql +++ b/Backend/sql/create_table.sql @@ -1,12 +1,10 @@ # 建表脚本 -# @author 程序员鱼皮 -# @from 编程导航知识星球 -- 创建库 -create database if not exists yubi; +create database if not exists bi; -- 切换库 -use yubi; +use bi; -- 用户表 create table if not exists user diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/BiInitMain.java b/Backend/src/main/java/com/wonder/bi/bizmq/BiInitMain.java index 9a4a185..52fad03 100644 --- a/Backend/src/main/java/com/wonder/bi/bizmq/BiInitMain.java +++ b/Backend/src/main/java/com/wonder/bi/bizmq/BiInitMain.java @@ -3,10 +3,12 @@ package com.wonder.bi.bizmq; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; +import lombok.extern.slf4j.Slf4j; /** * 用于创建测试程序用到的交换机和队列（只用在程序启动前执行一次） */ +@Slf4j public class BiInitMain { public static void main(String[] args) { @@ -15,18 +17,22 @@ public class BiInitMain { factory.setHost("localhost"); factory.setVirtualHost("/bi"); factory.setUsername("wonder"); - factory.setPassword("Dn293830"); + factory.setPassword("dn293830"); Connection connection = factory.newConnection(); Channel channel = connection.createChannel(); String EXCHANGE_NAME = BiMqConstant.BI_EXCHANGE_NAME; channel.exchangeDeclare(EXCHANGE_NAME, "direct"); + log.info("交换机创建成功"); // 创建队列，随机分配一个队列名称 String queueName = BiMqConstant.BI_QUEUE_NAME; channel.queueDeclare(queueName, true, false, false, null); + log.info("队列创建成功"); channel.queueBind(queueName, EXCHANGE_NAME, BiMqConstant.BI_ROUTING_KEY); + log.info("队列绑定成功"); + connection.close(); } catch (Exception e) { - + e.printStackTrace(); } } diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/MqInitMain.java b/Backend/src/main/java/com/wonder/bi/bizmq/MqInitMain.java deleted file mode 100644 index 6dcb712..0000000 --- a/Backend/src/main/java/com/wonder/bi/bizmq/MqInitMain.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.wonder.bi.bizmq; - -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Connection; -import com.rabbitmq.client.ConnectionFactory; -import com.wonder.bi.config.RabbitMqConfig; - -/** - * 用于创建测试程序用到的交换机和队列（只用在程序启动前执行一次） - */ -public class MqInitMain { - - public static void main(String[] args) { - try { - ConnectionFactory factory = RabbitMqConfig.newConnectionFactory(); - Connection connection = factory.newConnection(); - Channel channel = connection.createChannel(); - String EXCHANGE_NAME = "code_exchange"; - channel.exchangeDeclare(EXCHANGE_NAME, "direct"); - - // 创建队列，随机分配一个队列名称 - String queueName = "code_queue"; - channel.queueDeclare(queueName, true, false, false, null); - channel.queueBind(queueName, EXCHANGE_NAME, "my_routingKey"); - } catch (Exception e) { - - } - - } -} diff --git a/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java b/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java deleted file mode 100644 index d77563c..0000000 --- a/Backend/src/main/java/com/wonder/bi/bizmq/MyMessageConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.wonder.bi.bizmq; - -import com.rabbitmq.client.Channel; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.messaging.handler.annotation.Header; -import org.springframework.stereotype.Component; - - - -@Component -@Slf4j -public class MyMessageConsumer { - - // 指定程序监听的消息队列和确认机制 - @SneakyThrows - @RabbitListener(queues = {"code_queue"}, ackMode = "MANUAL") - public void receiveMessage(String message, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { - log.info("receiveMessage message = {}", message); - channel.basicAck(deliveryTag, false); - } - -} diff --git a/Backend/src/main/java/com/wonder/bi/config/RedissonConfig.java b/Backend/src/main/java/com/wonder/bi/config/RedissonConfig.java index 6348227..315fcb3 100644 --- a/Backend/src/main/java/com/wonder/bi/config/RedissonConfig.java +++ b/Backend/src/main/java/com/wonder/bi/config/RedissonConfig.java @@ -27,7 +27,8 @@ public class RedissonConfig { config.useSingleServer() .setDatabase(database) .setAddress("redis://" + host + ":" + port) - .setPassword(password); + .setPassword(password) + .setConnectTimeout(10000); RedissonClient redisson = Redisson.create(config); return redisson; } diff --git a/Backend/src/main/resources/application.yml b/Backend/src/main/resources/application.yml index 511accb..ecaaad5 100644 --- a/Backend/src/main/resources/application.yml +++ b/Backend/src/main/resources/application.yml @@ -14,8 +14,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://47.121.181.112:3306/bi - username: wonder - password: Dn293830 + username: root + password: dn293830 type: com.alibaba.druid.pool.DruidDataSource druid: initial-size: 5 @@ -40,8 +40,8 @@ spring: database: 1 host: 47.121.181.112 port: 6379 - timeout: 5000 - password: Dn293830@redis + password: dn293830 + # 文件上传 servlet: @@ -51,7 +51,7 @@ spring: rabbitmq: host: localhost port: 5672 - password: Dn293830 + password: dn293830 username: wonder virtual-host: /bi server: diff --git a/Backend/src/test/java/com/wonder/bi/bizmq/MyMessageProducerTest.java b/Backend/src/test/java/com/wonder/bi/bizmq/MyMessageProducerTest.java index ca02bee..f5c72f6 100644 --- a/Backend/src/test/java/com/wonder/bi/bizmq/MyMessageProducerTest.java +++ b/Backend/src/test/java/com/wonder/bi/bizmq/MyMessageProducerTest.java @@ -13,6 +13,6 @@ class MyMessageProducerTest { @Test void sendMessage() { - myMessageProducer.sendMessage("code_exchange", "my_routingKey", "你好呀"); + myMessageProducer.sendMessage("amq.direct", "email.#", "hello@example.com"); } } \ No newline at end of file diff --git a/Backend/src/test/java/com/wonder/bi/manager/OosManagerTest.java b/Backend/src/test/java/com/wonder/bi/manager/OosManagerTest.java index 0f235f1..7d54dd3 100644 --- a/Backend/src/test/java/com/wonder/bi/manager/OosManagerTest.java +++ b/Backend/src/test/java/com/wonder/bi/manager/OosManagerTest.java @@ -19,6 +19,6 @@ class OosManagerTest { @Test void putObject() { -// oosManager.putObject("test", "E:\\Doc\\7B\\yubi-backend-5f672bb635e37361d5a1ae0e5403e96f36317fd0\\src\\main\\resources\\banner.txt"); + oosManager.putObject("test", "D:\\Desktop\\1.csv"); } } \ No newline at end of file