还原

fdc12269 · OFFICE\dingda.li · e17b1576 · fdc12269
Commit fdc12269 authored Oct 29, 2020 by $OFFICE\dingda.li's avatar$ OFFICE\dingda.li
Show whitespace changes
Inline Side-by-side

Showing with 21 additions and 21 deletions

main.cpp
+21 -21

No files found.
--- a/main.cpp
+++ b/main.cpp
@@ -1172,21 +1172,21 @@ int main(int argc, char *argv[])

       QLOG_WARN() << "check zip file failed; begin creat zip file days : "<< days <<"--------------------";

-       //Creatctl(ctlpath, days);
-       //GetXmlAndFiles(days, QString("C:/np6data/newdata/temp"), ip);
+       Creatctl(ctlpath, days);
+       GetXmlAndFiles(days, QString("C:/np6data/newdata/temp"), ip);

-       //tmplist.append(mystoreid);
+       tmplist.append(mystoreid);

-//       QString error;
+       QString error;

-//       if(RunBat(bat, tmplist, error) == false)
-//       {
-//            QLOG_ERROR() << "upload failed day : " << days << "; error : " << error;
-//       }
-//       else
-//       {
-//            QLOG_INFO() << "upload success day : " << days;
-//       }
+       if(RunBat(bat, tmplist, error) == false)
+       {
+            QLOG_ERROR() << "upload failed day : " << days << "; error : " << error;
+       }
+       else
+       {
+            QLOG_INFO() << "upload success day : " << days;
+       }

       QDir daysdir;
       daysdir.mkdir(daysstr);
@@ -1198,9 +1198,9 @@ int main(int argc, char *argv[])
       }


-//       CopyXMLToDir(QString("C:/np6data/newdata/temp"), QString("D:\\fm\\Gomax\\ctllist\\") + days);
-//       CopyDirToDir(QString("C:/np6data/newdata/bak/")+mystoreid, QString("D:\\fm\\Gomax\\ctllist\\") + days);
-//       CopyDirToDir(QString("C:/np6data/newdata/0000000"), QString("D:\\fm\\Gomax\\ctllist\\") + days);
+       CopyXMLToDir(QString("C:/np6data/newdata/temp"), QString("D:\\fm\\Gomax\\ctllist\\") + days);
+       CopyDirToDir(QString("C:/np6data/newdata/bak/")+mystoreid, QString("D:\\fm\\Gomax\\ctllist\\") + days);
+       CopyDirToDir(QString("C:/np6data/newdata/0000000"), QString("D:\\fm\\Gomax\\ctllist\\") + days);

       QLOG_WARN() << "***creat files begin check zip file in " << QString("D:\\fm\\Gomax\\ctllist\\") + days << "--------";

@@ -1227,13 +1227,13 @@ int main(int argc, char *argv[])
                continue;
           }

-//           QLOG_INFO() << "begin upload : " << cvanos << "; file name : " << cvanos1;
+           QLOG_INFO() << "begin upload : " << cvanos << "; file name : " << cvanos1;

-//           if(FMNetWork::HttpPut(ftp2ur+cvanos1, ftp2un, ftp2pw, cvanos) == false)
-//           {
-//                QLOG_ERROR() << "upload  failed : " << cvanos;
-//                continue;
-//           }
+           if(FMNetWork::HttpPut(ftp2ur+cvanos1, ftp2un, ftp2pw, cvanos) == false)
+           {
+                QLOG_ERROR() << "upload  failed : " << cvanos;
+                continue;
+           }

           QLOG_INFO() << "upload success --------------";