zyf

center-taskexecutor/app/base/db/task/costest/testTask.js

@@ -1097,6 +1097,8 @@ class TestTask extends TaskBase {
     //   // SecretKey: "sTR7jRt0UIsEJGzhCQN7aoEQN2RD5g4C",
     // });
 
+
+
     //创建目录,判断文件目录是否存在，不存在就创建  
     if (!fs.existsSync('upload')) {
       fs.mkdirSync('upload');
@@ -1684,12 +1686,6 @@ class TestTask extends TaskBase {
         "id_url": ""
       }
       //把打包文件上传到cos
-      // var cos1 = new COS({
-      //   SecretId: "AKIDnPWjiUFatAHahwtsV8KJ2jDONAA4KG6k",
-      //   SecretKey: "xJmXncXcbAW9YEeITUWr192t6sQiEYBU",
-      //   // SecretId: "AKIDEEuMglVIlESr3ZQx2jBO5YQ2zsVUpo55",
-      //   // SecretKey: "sTR7jRt0UIsEJGzhCQN7aoEQN2RD5g4C",
-      // });
       var bucket = 'test-1258715722'; /* 必须 */
       var begion = 'ap-beijing';   /* 必须 */
       var cos = new COS({

center-taskexecutor/app/base/utils/restClient.js

@@ -12,7 +12,7 @@ class RestClient{
 
       this.cmdDownLoadFilePattern="curl -G -o {fileName} {url}";
       this.cmdPostPattern2="curl -k -H 'Content-type: application/x-www-form-urlencoded'  -d '{data}' {url}";
-     
+      this.cmdPostPattern3 = "curl -k -H 'Content-type: application/json'  -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJvcnpaWmhXRXBKNVVFZzRZUU5uUmlyVEJXa1FQbnZ6UyIsImlhdCI6MTU5MjcwOTYzNn0.TWk_F6Tz3fRMqspoG24VSt5RiC4ldFembFYcLcAbowE'  -H 'XAPPKEY: 647a68c9-da01-40d3-9763-1ffa0f64cf3f' -d '{data}' {url}";
       // form-data形式post  data参数类型 md5=2&data=1
       this.cmdPostPattern5="curl -k --data '{data}' {url}";
 

center-taskexecutor/app/config/settings.js

@@ -64,6 +64,28 @@ var settings = {
       return "http://jiaxiya-service/";
     }
   },
+  cosGetSecreturl: function () {
+    if (this.env == "dev") {
+      return "http://192.168.1.128:4018/api/uploadAction/txCos/getCosInfo";
+    } else {
+      return "http://192.168.1.128:4018/api/uploadAction/txCos/getCosInfo";
+    }
+  },
+  icpMaterialurl: function () {
+    if (this.env == "dev") {
+      return "http://192.168.1.147:8002";
+    } else {
+      return "http://192.168.1.147:8002";
+    }
+  },
+  // icpUpMaterialurl: function () {
+  //   if (this.env == "dev") {
+  //     return "http://192.168.1.147:8002/web/delivery/materialCtl/updateUrl";
+  //   } else {
+  //     return "http://192.168.1.147:8002/web/delivery/materialCtl/updateUrl";
+  //   }
+  // },
+
   redis:function(){
     if(this.env=="dev"){
       console.log("dev.........................................................");