diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml
index 427f682..68c3c25 100644
--- a/couplet-auth/src/main/resources/bootstrap.yml
+++ b/couplet-auth/src/main/resources/bootstrap.yml
@@ -17,9 +17,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml
index 091e68a..6dc39fe 100644
--- a/couplet-gateway/src/main/resources/bootstrap.yml
+++ b/couplet-gateway/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
index 9b0c2eb..2143241 100644
--- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
@@ -15,14 +15,17 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
main:
allow-bean-definition-overriding: true
rabbitmq:
@@ -48,3 +51,4 @@ logging:
mybatis-plus:
configuration:
map-underscore-to-camel-case: true
+
diff --git a/couplet-modules/couplet-business/pom.xml b/couplet-modules/couplet-business/pom.xml
index da1fe95..cc83ffe 100644
--- a/couplet-modules/couplet-business/pom.xml
+++ b/couplet-modules/couplet-business/pom.xml
@@ -114,7 +114,6 @@
com.couplet
couplet-analyze-msg
-
diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java
index 2ef9e84..4333fca 100644
--- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java
+++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
@EnableCustomConfig
@EnableCustomSwagger2
@EnableMyFeignClients(basePackages = ("com.couplet"))
-@SpringBootApplication(scanBasePackages = {"com.couplet", "com.couplet.mq.remote"})
+@SpringBootApplication(scanBasePackages = {"com.couplet"})
@EnableScheduling
public class CoupletBusinessApplication {
public static void main(String[] args) {
diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java
index e0bfe47..952b9d1 100644
--- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java
+++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java
@@ -423,11 +423,12 @@ public class VehicleServiceImpl extends ServiceImpl impl
bindLogoById.forEach(logoId -> {
//存标识id 的set
- HashSet logos = new HashSet<>();
- logos.add(logoId);
- //存入redis
- redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), logos);
- redis.expire("车辆vin和标识:" + vehicle.getVin(), 2, TimeUnit.MINUTES);
+// HashSet logos = new HashSet<>();
+// logos.add(logoId);
+// //存入redis
+// redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), logos);
+
+// redis.expire("车辆vin和标识:" + vehicle.getVin(), 5, TimeUnit.MINUTES);
//通过标识id获取标识绑定的电子围栏集合
@@ -438,7 +439,7 @@ public class VehicleServiceImpl extends ServiceImpl impl
fanceSet.add(fence);
//存入redis
redis.setCacheSet("车辆vin和电子围栏:" + vehicle.getVin(), fanceSet);
- redis.expire("车辆vin和电子围栏:" + vehicle.getVin(), 2, TimeUnit.MINUTES);
+// redis.expire("车辆vin和电子围栏:" + vehicle.getVin(), 5, TimeUnit.MINUTES);
});
});
});
diff --git a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml
index d900876..b88e464 100644
--- a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml
@@ -16,9 +16,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
index fa968e9..b0d1d24 100644
--- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
index e3d77cd..d2113ff 100644
--- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
@@ -17,9 +17,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml
index 108c695..41d1fef 100644
--- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml
@@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
- namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
- namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
index 2351484..1de6dd7 100644
--- a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java b/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
index 97046a0..f908473 100644
--- a/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
+++ b/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
@@ -76,7 +76,7 @@ public class MqttMonitor {
//Kafka生产者配置
- private static final String TOPIC_NAME = "xy";
+ private static final String TOPIC_NAME = "topic_lhy";
private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
//线程池,用于异步处理消息到来时的业务逻辑
diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
index d9315bd..91453d0 100644
--- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
index 94d42fc..d219500 100644
--- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
+++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
@@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
- namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
+ namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
- namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
+ namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置