kafka配置提交

src/main/java/com/neotel/smfcore/SmfCoreApplication.java

@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-@EnableAsync
+//@EnableAsync
 @EnableScheduling
 @EnableScheduling
 @EnableKafka
 @EnableKafka
 @RestController
 @RestController

src/main/resources/config/application-prod.yml

@@ -15,6 +15,14 @@ spring:
       port: 27017           # 端口
       port: 27017           # 端口
       database: smf        # 数据库
       database: smf        # 数据库
 
 
+#kafka配置
+  kafka:
+    bootstrap-servers: 10.190.196.135:9092
+    consumer:
+      group-id: neotel
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+
 #jwt
 #jwt
 jwt:
 jwt:
   header: Authorization
   header: Authorization
@@ -63,3 +71,10 @@ file:
     path: C:\smf\file\
     path: C:\smf\file\
   # 文件大小 /M
   # 文件大小 /M
   maxSize: 100
   maxSize: 100
+
+
+#迈征配置
+maizheng:
+  stationStatusApi: http://10.190.196.124:8300/API/MZSM
+  export: MU3_1
+

src/main/resources/config/application.yml

@@ -40,7 +40,7 @@ lizhen:
     url: http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial
     url: http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial
   F4:
   F4:
     name: 4F
     name: 4F
-    line: B03-4FSMT-11,B03-4FSMT-01
+    line: B03-4FSMT-11,B03-4FSMT-01,B03-4FSMT-13,B03-4FSMT-03,B03-4FSMT-14
     url: http://172.25.252.12:8001/smf-core/api/Mes/machineCallMaterial
     url: http://172.25.252.12:8001/smf-core/api/Mes/machineCallMaterial
 
 
 
 
@@ -61,7 +61,7 @@ forward:
 
 
 #手动出库料箱
 #手动出库料箱
 manualcheckout:
 manualcheckout:
-  export: MU4_1
+  export:
 
 
 
 
 
 
@@ -101,3 +101,4 @@ app:
 menu:
 menu:
   show:
   show:
   hide:
   hide:
+