zyf

center-taskexecutor/app/base/db/task/ic/icZipTask.js

@@ -45,7 +45,7 @@ class IcZipTask extends TaskBase {
         return;
         return;
       }
       }
     } catch (error) {
     } catch (error) {
-      // console.log(error);
+      console.log(error);
       return;
       return;
     }
     }
     try {
     try {
@@ -99,8 +99,6 @@ class IcZipTask extends TaskBase {
         //下载文件
         //下载文件
         var files = icinfo.uploadList;
         var files = icinfo.uploadList;
         await this.downFile(files, id_dir);
         await this.downFile(files, id_dir);
-
-
         //打包压缩
         //打包压缩
         var zipdir = id_dir + '.zip';
         var zipdir = id_dir + '.zip';
         var output = fs.createWriteStream(zipdir);
         var output = fs.createWriteStream(zipdir);

center-taskexecutor/app/base/db/task/icp/icpGenerateTask.js

@@ -39,46 +39,46 @@ class IcpGenerateTask extends TaskBase {
         return;
         return;
       }
       }
     } catch (error) {
     } catch (error) {
-      // console.log(error);
+      console.log(error);
       return;
       return;
     }
     }
     try {
     try {
       var that = this;
       var that = this;
-    var bucketandregion = await this.getBucketRegion(that.cosgetsecreturl)
-    var bucket = bucketandregion.bucket; /* 必须 */
-    var region = bucketandregion.region;   /* 必须 */
-    var cos = new COS({
-      getAuthorization: function (options, callback) {
-        // 异步获取临时密钥
-        request({
-          url: that.cosgetsecreturl,
-          data: {
-            // 可从 options 取需要的参数
-            // Bucket: 'test-1258715722', /* 必须 */
-            // Region: 'ap-beijing',    /* 必须 */
-          }
-        }, function (err, response, body) {
-          try {
-            var resultdata = JSON.parse(body);
-            if (resultdata.status == 1) {
-              var data = resultdata.data;
-              var credentials = data.credentials;
+      var bucketandregion = await this.getBucketRegion(that.cosgetsecreturl)
+      var bucket = bucketandregion.bucket; /* 必须 */
+      var region = bucketandregion.region;   /* 必须 */
+      var cos = new COS({
+        getAuthorization: function (options, callback) {
+          // 异步获取临时密钥
+          request({
+            url: that.cosgetsecreturl,
+            data: {
+              // 可从 options 取需要的参数
+              // Bucket: 'test-1258715722', /* 必须 */
+              // Region: 'ap-beijing',    /* 必须 */
             }
             }
-          } catch (e) { }
-          if (!data || !credentials) return console.error('credentials invalid');
-          callback({
-            TmpSecretId: credentials.tmpSecretId,        // 临时密钥的 tmpSecretId
-            TmpSecretKey: credentials.tmpSecretKey,      // 临时密钥的 tmpSecretKey
-            XCosSecurityToken: credentials.sessionToken, // 临时密钥的 sessionToken
-            ExpiredTime: data.expiredTime,               // 临时密钥失效时间戳，是申请临时密钥时，时间戳加 durationSeconds
+          }, function (err, response, body) {
+            try {
+              var resultdata = JSON.parse(body);
+              if (resultdata.status == 1) {
+                var data = resultdata.data;
+                var credentials = data.credentials;
+              }
+            } catch (e) { }
+            if (!data || !credentials) return console.error('credentials invalid');
+            callback({
+              TmpSecretId: credentials.tmpSecretId,        // 临时密钥的 tmpSecretId
+              TmpSecretKey: credentials.tmpSecretKey,      // 临时密钥的 tmpSecretKey
+              XCosSecurityToken: credentials.sessionToken, // 临时密钥的 sessionToken
+              ExpiredTime: data.expiredTime,               // 临时密钥失效时间戳，是申请临时密钥时，时间戳加 durationSeconds
+            });
           });
           });
-        });
-      }
-    });
+        }
+      });
     } catch (error) {
     } catch (error) {
       return;
       return;
     }
     }
-    
+
     //遍历数据
     //遍历数据
     var datalist = materiadata;
     var datalist = materiadata;
     for (var j = 0; j < datalist.length; j++) {
     for (var j = 0; j < datalist.length; j++) {
@@ -692,11 +692,9 @@ class IcpGenerateTask extends TaskBase {
 
 
       } catch (error) {
       } catch (error) {
         console.log(error);
         console.log(error);
-
         continue;
         continue;
       }
       }
 
 
-
     }
     }
     // 删除文件夹
     // 删除文件夹
     for (var j = 0; j < datalist.length; j++) {
     for (var j = 0; j < datalist.length; j++) {

center-taskexecutor/app/config/settings.js

@@ -75,21 +75,21 @@ var settings = {
   },
   },
   cosGetSecreturl: function () {
   cosGetSecreturl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://192.168.1.128:4018/api/uploadAction/txCos/getCosInfo";
+      return "http://192.168.210.93:4018/api/uploadAction/txCos/getCosInfo";
     } else {
     } else {
       return "http://sytxpublic-msgq-service/api/uploadAction/txCos/getCosInfo";
       return "http://sytxpublic-msgq-service/api/uploadAction/txCos/getCosInfo";
     }
     }
   },
   },
   icpMaterialurl: function () {
   icpMaterialurl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://192.168.1.147:8002";
+      return "http://192.168.210.46:8002";
     } else {
     } else {
       return "http://icpdeliver-service";
       return "http://icpdeliver-service";
     }
     }
   },
   },
   icMaterialurl: function () {
   icMaterialurl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://192.168.1.125:8888";
+      return "http://192.168.210.178:8888";
     } else {
     } else {
       return "http://icdeliver-service";
       return "http://icdeliver-service";
     }
     }