区分正式与测试配置修改

data-collect-service/pom.xml

@@ -140,6 +140,9 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.2.12.RELEASE</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -151,5 +154,4 @@
 
         </plugins>
     </build>
-
 </project>

data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java

@@ -114,7 +114,19 @@ public class MqttConfigUtil {
             "+/device/5d4297256f02ebc2",
             "+/device/67aa37e699e1e08f",
             "+/device/ea0ebfbfa1487bd2",
-            "+/device/aa8a43d326dddb3f"
+            "+/device/aa8a43d326dddb3f",
+            "+/device/82d40d7dbcfc884e",
+            "+/device/34ee15e05a3133bc",
+            "+/device/ee2508ba91664376",
+            "+/device/48c18f2a756dcc28",
+            "+/device/056d38ac91f61ffd",
+            "+/device/60f2bbbc054bfa03",
+            "+/device/50fdebcf6eb85a49",
+            "+/device/227a752b9bfb6b02",
+            "+/device/d60a05bcd086f160",
+            "+/device/f3c813d5e3d7fd99",
+            "+/device/cd6cb4a64b42bda5",
+            "+/device/436de647bbf01b22"
     };
 
     /**

data-collect-service/src/main/resources/application-prod.yml

@@ -47,7 +47,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.142:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
@@ -63,7 +63,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.153.121 #单机
+    host: 192.168.0.236 #单机
     password: zzkj@688737
     database: 0
     lettuce:

data-collect-service/src/main/resources/bootstrap.yml

@@ -53,7 +53,7 @@ largeScreen:
 #mqtt接外部数据使用
 mqtt1:
   url: tcp://1.95.131.171:1883
-  userName: root
+  userName: admin
   passWord: zzkj@688737
   timeout: 5000
   keepAlive: 60

data-collect-service/src/main/resources/logback.xml

@@ -9,9 +9,9 @@
     </appender>
 
     <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/home/hocloud/logs/datacollect-service/datacollect-service.log</file>
+        <file>/www/zzkjcloud/logs/datacollect-service/datacollect-service.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/hocloud/logs/datacollect-service/datacollect-service.%d{yyyy-MM-dd}-%i.log
+            <fileNamePattern>/www/zzkjcloud/logs/datacollect-service/datacollect-service.%d{yyyy-MM-dd}-%i.log
             </fileNamePattern>
             <maxHistory>10</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
@@ -28,9 +28,9 @@
 
     <!--Error级别-->
     <appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/home/hocloud/logs/datacollect-service/datacollect-service-error.log</file>
+        <file>/www/zzkjcloud/logs/datacollect-service/datacollect-service-error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/hocloud/logs/datacollect-service/datacollect-service-error.%d{yyyy-MM-dd}-%i.log
+            <fileNamePattern>/www/zzkjcloud/logs/datacollect-service/datacollect-service-error.%d{yyyy-MM-dd}-%i.log
             </fileNamePattern>
             <!--180天-->
             <maxHistory>10</maxHistory>