修改测试环境配置文件

src/main/resources/dev/application.yml

@@ -3,8 +3,10 @@ spring:
     name: device-acceptance
   kafka:
     bootstrap-servers: 192.168.0.119:9092
+  profiles:
+    active: all
   redis:
-    host: 192.168.0.119
+    host: 10.25.48.128
     password: tidecloudredis
     timeout: 10000
     port: 6379
@@ -15,81 +17,105 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://192.168.0.118:12000/eureka
+      defaultZone: http://192.168.0.119:12000/eureka
   instance:
     prefer-ip-address: true
-#  port: 16666
-#  localaddress: 10.27.118.76
+#    port: 16666
+#    localaddress: 10.27.118.76
 server:
   port: ${random.int(16000,19999)}
+---
+spring:
+  profiles: all
+  application:
+    name: acceptance-product
+
 acceptance:
  device:
   deviceList:
    -
     name: watch
     topic: device-watch
-    ip: 192.168.0.119
-    port: 7009
+    ip: 10.27.118.76
+    port: 7019
     dataFileDir: /home/service/collector_watch/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.WatchServerHandler
     enable: true
-    
+
    -
     name: bingshui
     topic: device-bingshui
-    ip: 192.168.0.119
+    ip: 10.27.118.76
     port: 6001
     dataFileDir: /home/service/collector_7510/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.BingShuiGpsServerHandler
     enable: true
-    
+
    -
     name: bsj
     topic: device-bsj
-    ip: 192.168.0.119
-    port: 6707
+    ip: 10.25.19.87
+    port: 6717
+    dataFileDir: /home/service/collector_6707/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.BSJGpsServerHandler
+    enable: true
+
+   -
+    name: wangrui-bsj
+    topic: device-bsj
+    ip: 10.29.44.67
+    port: 7518
     dataFileDir: /home/service/collector_6707/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.BSJGpsServerHandler
     enable: false
-    
+
    -
     name: yitong
     topic: device-yitong
-    ip: 192.168.0.119
-    port: 7011
+    ip: 10.27.118.76
+    port: 7111
     dataFileDir: /home/service/collector_yitong/rawdata-car/
     handlerClass: com.tidecloud.dataacceptance.service.impl.YiTongGpsServerHandler
-    enable: false    
+    enable: true
    -
     name: yuguang
     topic: device-yuguang
-    ip: 192.168.0.119
+    ip: 10.27.118.76
     port: 7510
     dataFileDir: /home/service/collector_7510/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.YuGuangGpsServerHandler
-    enable: false       
+    enable: false
 
    -
     name: vorgea
     topic: device-vorgea
-    ip: 192.168.0.119
+    ip: 10.27.118.76
     port: 7511
     dataFileDir: /home/service/collector_vorgea/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.VorgeaUR0401ServerHandler
     enable: false
+
+   -
+    name: pinshen
+    topic: device-pinshen-water
+    ip: 10.25.19.87
+    port: 7521
+    dataFileDir: /home/service/collector_6727/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.PinShenData86ServerHandler
+    enable: true
+
    -
     name: deyijia_watch
     topic: device-deyijia-watch
-    ip: 192.168.0.119
+    ip: 10.25.19.87
     port: 7520
     dataFileDir: /home/service/collector_6727/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.WatchDYJServerHandler
     enable: false
-
    -
     name: kds_gp_gps
     topic: device-kds-gps
-    ip: 192.168.0.119
+    ip: 10.25.19.87
     port: 7519
     dataFileDir: /home/service/collector_7519/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.GK309GpsServerHandler
@@ -97,24 +123,19 @@ acceptance:
    -
     name: jingwei_watch
     topic: device-jingwei-watch
-    ip: 192.168.0.119
+    ip: 10.25.19.87
     port: 6000
     dataFileDir: /home/service/collector_7518/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.WatchJWServerHandler
     enable: true
- -
+   -
     name: hensheng_watch
     topic: device-hensheng-watch
-    ip: 192.168.0.119
+    ip: 10.25.19.87
     port: 7527
     dataFileDir: /home/service/collector_7527/rawdata/
     handlerClass: com.tidecloud.dataacceptance.service.impl.WatchHenShengServerHandler
     enable: true
-      
 logging:
   config:
     classpath: logback.xml
-
-
-
-