Merge branch 'dev-zyj' of usky-cloud-paas/data-writer into master

DataWriteDog/dogcore.cpp

@@ -62,7 +62,7 @@ void DogCore::time_out()
         if((dataWriteShm->processStatus[1].t_time>0)
                 &&(static_cast<int>(chkTime1-dataWriteShm->processStatus[1].t_time)>120)){
             if(system("killall ytDataWriteProcess")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/ytDataWriteProcess &")!=-1){
                     logThread->appendData(QString("[%1 dataWriteDog %2] ytDataWriteProcess time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))

ytDataWriteProcess/databaseeventthread.cpp

@@ -1,7 +1,7 @@
 #include "databaseeventthread.h"
 
-//#define HostName "172.17.35.51"
-#define HostName "172.16.120.165"
+#define HostName "172.17.35.51"
+//#define HostName "124.71.140.20"
 #define HostPort 3306
 #define UserName "usky"
 #define PassWord "Yt#75Usky"

ytDataWriteProcess/databasethread.cpp

@@ -1,7 +1,7 @@
 #include "databasethread.h"
 
-//#define HostName "172.17.35.51"
-#define HostName "172.16.120.165"
+#define HostName "172.17.35.51"
+//#define HostName "124.71.140.20"
 #define HostPort 3306
 #define UserName "usky"
 #define PassWord "Yt#75Usky"