debug

package-lock.json

@@ -3419,7 +3419,8 @@
     "date-format": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-3.0.0.tgz",
-      "integrity": "sha1-64eANlx9KxURB4+0keZHl4DzrZU="
+      "integrity": "sha1-64eANlx9KxURB4+0keZHl4DzrZU=",
+      "dev": true
     },
     "dateformat": {
       "version": "2.2.0",
@@ -4036,6 +4037,7 @@
       "version": "3.20.11",
       "resolved": "https://registry.npm.taobao.org/esdk-obs-nodejs/download/esdk-obs-nodejs-3.20.11.tgz?cache=0&sync_timestamp=1610351636380&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesdk-obs-nodejs%2Fdownload%2Fesdk-obs-nodejs-3.20.11.tgz",
       "integrity": "sha1-/bMuzu3qoT+xLgmCcgg8yM6MIsE=",
+      "dev": true,
       "requires": {
         "log4js": "^6.3.0",
         "xml2js": "^0.4.23"
@@ -5216,7 +5218,8 @@
     "flatted": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
     },
     "flatten": {
       "version": "1.0.3",
@@ -5373,6 +5376,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz?cache=0&sync_timestamp=1611075469998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-8.1.0.tgz",
       "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -7716,6 +7720,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161797011&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
       }
@@ -8208,6 +8213,7 @@
       "version": "6.3.0",
       "resolved": "https://registry.npm.taobao.org/log4js/download/log4js-6.3.0.tgz",
       "integrity": "sha1-EN+vu0NDUaPjAnegC5h5RG9xW8s=",
+      "dev": true,
       "requires": {
         "date-format": "^3.0.0",
         "debug": "^4.1.1",
@@ -11856,7 +11862,8 @@
     "rfdc": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/rfdc/download/rfdc-1.2.0.tgz?cache=0&sync_timestamp=1610744108114&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frfdc%2Fdownload%2Frfdc-1.2.0.tgz",
-      "integrity": "sha1-npiUJY9I8oS0PDFDxoBwpPNzuUk="
+      "integrity": "sha1-npiUJY9I8oS0PDFDxoBwpPNzuUk=",
+      "dev": true
     },
     "rgb-regex": {
       "version": "1.0.1",
@@ -12469,6 +12476,7 @@
       "version": "2.2.4",
       "resolved": "https://registry.npm.taobao.org/streamroller/download/streamroller-2.2.4.tgz",
       "integrity": "sha1-wZjO1C25QIamGTYIGHzoCl8rDlM=",
+      "dev": true,
       "requires": {
         "date-format": "^2.1.0",
         "debug": "^4.1.1",
@@ -12478,7 +12486,8 @@
         "date-format": {
           "version": "2.1.0",
           "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-2.1.0.tgz",
-          "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8="
+          "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=",
+          "dev": true
         }
       }
     },
@@ -14040,7 +14049,8 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz?cache=0&sync_timestamp=1603179967633&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-0.1.2.tgz",
-      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY="
+      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=",
+      "dev": true
     },
     "unquote": {
       "version": "1.1.1",
@@ -15098,6 +15108,7 @@
       "version": "0.4.23",
       "resolved": "https://registry.npm.taobao.org/xml2js/download/xml2js-0.4.23.tgz?cache=0&sync_timestamp=1599054229598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxml2js%2Fdownload%2Fxml2js-0.4.23.tgz",
       "integrity": "sha1-oMaVFnUkIesqx1juTUzPWIQ+rGY=",
+      "dev": true,
       "requires": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -15106,7 +15117,8 @@
     "xmlbuilder": {
       "version": "11.0.1",
       "resolved": "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha1-vpuuHIoEbnazESdyY0fQrXACvrM="
+      "integrity": "sha1-vpuuHIoEbnazESdyY0fQrXACvrM=",
+      "dev": true
     },
     "xtend": {
       "version": "4.0.2",

package.json

@@ -19,7 +19,6 @@
     "cssnano": "4.1.10",
     "domino": "2.1.5",
     "dropzone": "5.7.2",
-    "esdk-obs-nodejs": "3.20.11",
     "fast-glob": "3.2.2",
     "file-loader": "6.0.0",
     "fomantic-ui": "2.8.4",
@@ -56,6 +55,7 @@
     "worker-loader": "2.0.0"
   },
   "devDependencies": {
+    "esdk-obs-nodejs": "3.20.11",
     "eslint": "6.8.0",
     "eslint-config-airbnb-base": "14.1.0",
     "eslint-plugin-import": "2.20.2",

templates/repo/datasets/index.tmpl

@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-
+<button id="test">点击</button>
 <div class="repository release dataset-list view">
   {{template "repo/header" .}}
 	<form class="ui container" action="{{.Link}}" method="post">
@@ -135,3 +135,6 @@
 	{{template "base/delete_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
+
+
+<!-- <script src="../web_src/js/features/esdk-obs-browserjs-3.19.5.min.js"></script> -->

web_src/js/components/MinioUploader.vue

@@ -12,7 +12,6 @@
   </div> 
 </template>
 
-
 <script>
 /* eslint-disable eqeqeq */
 // import Dropzone from 'dropzone/dist/dropzone.js';
@@ -23,6 +22,7 @@ import qs from 'qs';
 // import esdk-obs-nodejs from 'esdk-obs-nodejs';
 // import * as ObsClient from 'esdk-obs-nodejs'
 import createDropzone from '../features/dropzone.js';
+import * as ObsClient from '../features/esdk-obs-browserjs-3.19.5.min.js';
 
 const {_AppSubUrl, _StaticUrlPrefix, csrf} = window.config;
 
@@ -86,14 +86,13 @@ export default {
     });
 
     // 文件发送前调用
-    dropzoneUploader.on('sending', (file, xhr, formData) => {
-      console.log(xhr)
-      console.log(formData)
-    });
+    // dropzoneUploader.on('sending', (file, xhr, formData) => {
+    //   console.log(xhr)
+    //   console.log(formData)
+    // });
 
     // 文件复制后触发
     dropzoneUploader.on('addedfile', (file) => {
-      console.log("file",file)
       if(file.status == 'added'){
         this.onFileAdded(file)
       } 
@@ -103,9 +102,9 @@ export default {
       this.emitDropzoneSuccess(file)
     });
 
-    dropzoneUploader.on('totaluploadprogress', function(file, progress){
-      this.updateProgress(file, progress)
-    });
+    // dropzoneUploader.on('totaluploadprogress', function(file, progress){
+    //   this.updateProgress(file, progress)
+    // });
 
     dropzoneUploader.on('maxfilesexceeded', function (file) {
       if (this.files[0].status !== 'success') {
@@ -149,52 +148,81 @@ export default {
       //   .getAttribute('datasetId');
       console.log("执行到我了")
       this.resetStatus();
-      this.status = this.dropzoneParams.data('obs-connectting');
+      var file = document.getElementsByClassName('dropzone').files[0]
+      console.log("file", file)
       
-      // 引入obs库
-      var ObsClient = require('esdk-obs-nodejs');
-
-      // 创建ObsClient实例
-      var obsClient = new ObsClient({
-        access_key_id: 'FDP3LRMHLB9S77VWEHE3',       
-        secret_access_key: 'LyM82Wk80pgjhs2z7AdDcsdpCWhbsJtSzQ7hkESN',       
-        server : 'https://112.95.163.82'
-      });  
-      console.log("obsClient", obsClient)
-
-      // 创建桶
-      // obsClient.createBucket({
-      //   Bucket : 'bucketname'
-      // }, (err, result) => {
-      //   if(err){
-      //           console.error('Error-->' + err);
-      //           this.emitDropzoneFailed(file)
-      //   }else{
-      //           console.log('Status-->' + result.CommonMsg.Status);
-      //   }
-      // });
+    // 创建ObsClient实例
+    var obsClient = new ObsClient({
+      access_key_id: 'FDP3LRMHLB9S77VWEHE3',       
+      secret_access_key: 'LyM82Wk80pgjhs2z7AdDcsdpCWhbsJtSzQ7hkESN',       
+      server : 'https://112.95.163.82'
+    });
 
-      obsClient.uploadFile({
-        Bucket : 'bucketname',
-        Key : this.get_result().key,
-        // 设置待上传的本地文件，localfile为待上传的本地文件路径，需要指定到具体的文件名
-        UploadFile : file.name,
-        // 设置分段大小为10MB
-        PartSize : 10 * 1024 * 1024,
-        // 开启断点续传模式
-        EnableCheckpoint : true
-      }, (err, result) => {
-        if(err){
-          console.error('Error-->' + err);
-          this.emitDropzoneFailed(file)
-        }else{
-          console.log('RequestId-->' + result.InterfaceResult.RequestId);
-          console.log('Bucket-->' + result.InterfaceResult.Bucket);
-          console.log('Key-->' + result.InterfaceResult.Key);
-          console.log('Location-->' + result.InterfaceResult.Location);
-          this.emitDropzoneSuccess(file);
+    var cp;
+    var hook;
+    obsClient.uploadFile({
+      Bucket : 'mybucket',
+      Key : this.get_result().key,
+      SourceFile : document.getElementsByClassName('dropzone').files[0],
+      PartSize : 64 * 1024 * 1024,
+      ProgressCallback : function(transferredAmount, totalAmount, totalSeconds){
+          console.log(transferredAmount * 1.0 / totalSeconds / 1024);
+          console.log(transferredAmount * 100.0 / totalAmount);
+          if(hook && (transferredAmount / totalAmount) > 0.5){
+              // 暂停断点续传任务
+              hook.cancel();
+          }
+      },
+      EventCallback : function(eventType, eventParam, eventResult){
+          // 处理事件响应
+          console.log("1", eventType)
+             console.log("2",eventParam)
+             console.log("3",eventResult)
+      },
+      ResumeCallback : function(resumeHook, uploadCheckpoint){
+          // 获取取消断点续传上传任务控制参数
+          hook = resumeHook;
+          // 记录断点
+          cp = uploadCheckpoint;
+      }
+}, function(err, result){
+    console.error('Error-->' + err);
+    // 出现错误，再次调用断点续传接口，继续上传任务
+    if(err){
+       obsClient.uploadFile({
+          UploadCheckpoint : cp,
+          ProgressCallback : function(transferredAmount, totalAmount, totalSeconds){
+              console.log(transferredAmount * 1.0 / totalSeconds / 1024);
+              console.log(transferredAmount * 100.0 / totalAmount);
+          },
+          EventCallback : function(eventType, eventParam, eventResult){
+             // 处理事件响应
+             console.log(eventType)
+             console.log(eventParam)
+             console.log(eventResult)
+          },
+        }, function(err, result){
+          if(err){
+              console.error('Error-->' + err);
+          }else{
+              if(result.CommonMsg.Status < 300){
+                 console.log('RequestId-->' + result.InterfaceResult.RequestId);
+                 console.log('Bucket-->' + result.InterfaceResult.Bucket);
+                 console.log('Key-->' + result.InterfaceResult.Key);
+                 console.log('Location-->' + result.InterfaceResult.Location);
+              }else{
+                 console.log('Code-->' + result.CommonMsg.Code);
+                 console.log('Message-->' + result.CommonMsg.Message);
+              }
         }
       });
+    }else {
+         console.log('Status-->' + result.CommonMsg.Status);
+         if (result.CommonMsg.Status < 300 && result.InterfaceResult) {
+                console.log('RequestId-->' + result.InterfaceResult.RequestId);
+         }
+    }
+});
     },
 
     get_result(){

webpack.config.js

@@ -240,7 +240,7 @@ module.exports = {
     }),
     new MonacoWebpackPlugin({
       filename: 'js/monaco-[name].worker.js',
-    }),
+    })
   ],
   performance: {
     hints: false,