Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4

ym-gateway/src/main/resources/application-dev.yml

@@ -61,14 +61,14 @@ dynamic:
 #      username: root
 #      password: 1qaz@WSX3edc$RFV
     ## camline系统
-#    camline:
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: root
-#      password: 1qaz@WSX3edc$RFV
-#
     camline:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: offline_data
+      username: root
-      password: tpvmfab4
+      password: 1qaz@WSX3edc$RFV
+#
+#    camline:
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      username: offline_data
+#      password: tpvmfab4

ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java

@@ -150,12 +150,12 @@ public class KukaJoinThread implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
-        kukaStep1.scheduleAtFixedRate(new Runnable() {
+//        kukaStep1.scheduleAtFixedRate(new Runnable() {
-            @Override
+//            @Override
-            public void run() {
+//            public void run() {
-                logger.info("=================  现在开始执行 过程一 任务   ==================");
+//                logger.info("=================  现在开始执行 过程一 任务   ==================");
-            }
+//            }
-        },1,1, TimeUnit.SECONDS);
+//        },1,1, TimeUnit.SECONDS);