diff --git a/device-manager-ui/admin/yarn.lock b/device-manager-ui/admin/yarn.lock index 36b841e0128760a955bb495e238039fa7f90e294..fce2f106f02d6e42e2b4241d54ab4ab38f827665 100644 --- a/device-manager-ui/admin/yarn.lock +++ b/device-manager-ui/admin/yarn.lock @@ -2377,9 +2377,9 @@ "lodash.uniq" "^4.5.0" "caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001219": - "integrity" "sha1-JqtF40DxVepdopINrbdqUzy4684=" - "resolved" "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001248.tgz" - "version" "1.0.30001248" + "integrity" "sha512-OnyeJ9ascFA9roEj72ok2Ikp7PHJTKubtEJIQ/VK3fdsS50q4KWy+Z5X0A1/GswEItKX0ctAp8n4SYDE7wTu6A==" + "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001420.tgz" + "version" "1.0.30001420" "case-sensitive-paths-webpack-plugin@^2.3.0": "integrity" "sha1-22QGbGQi7tLgjMFLmGykN5bbxtQ=" diff --git a/device-manager/pom.xml b/device-manager/pom.xml index aa870e69874e18d06a77e32255e6134e80c8c767..20350017fe46618c8dc0f5f0393a1342fadb01ad 100644 --- a/device-manager/pom.xml +++ b/device-manager/pom.xml @@ -36,7 +36,7 @@ <profiles.redis.database>7</profiles.redis.database> <profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers> <profiles.queue.type>rabbitmq</profiles.queue.type> - <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host> + <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username> <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password> @@ -280,7 +280,6 @@ </executions> </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> @@ -288,7 +287,6 @@ <configuration> <skip>${skipDeploy}</skip> </configuration> - <executions> <execution> <id>exec-npm-install</id> diff --git a/device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java b/device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java index ea8cf7f26e5bc43e64ec26f24eb14281bd8dac94..0467faeba87ed5da830011516b9569c66ce54695 100644 --- a/device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java +++ b/device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java @@ -33,7 +33,7 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer private RabbitAdmin rabbitAdmin; public void syncAccessSend(AccessLogPdu accessLogPdu) { - //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu)); + rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu)); } @Override diff --git a/device-manager/src/test/java/com/mortals/httpclient/http-client.env.json b/device-manager/src/test/java/com/mortals/httpclient/http-client.env.json index 6db1d45448eb3ade648dc81b65c03e363eb22785..1cd7653685baa1dd76a5269257cef465cd537078 100644 --- a/device-manager/src/test/java/com/mortals/httpclient/http-client.env.json +++ b/device-manager/src/test/java/com/mortals/httpclient/http-client.env.json @@ -1,7 +1,7 @@ { "local": { - "baseUrl": "http://127.0.0.1:18228/m", - "baseLogin": "http://127.0.0.1:18228/m" + "baseUrl": "http://127.0.0.1:18222/m", + "baseLogin": "http://127.0.0.1:18222/m" }, "dev": { "baseUrl": "http://192.168.0.217:18222/m",