Merge branch 'tencentyun:master' into feat/add-uploadFile

livehigh · livehigh · commit a7ba7576297a · 2021-06-11T11:45:22.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v1.2.12](https://github.com/tencentyun/cos-js-sdk-v5/compare/v1.2.11...v1.2.12) - 2021-06-03
+
+-demo新增简单上传base64内容文件
+-sliceUploadFile方法新增返回值UploadId
+
+### Merged
+
+- Feat/put object base64&return upload [`#111`](https://github.com/tencentyun/cos-js-sdk-v5/pull/111)
+
+### Commits
+
+- feat [`1e2ca3a`](https://github.com/tencentyun/cos-js-sdk-v5/commit/1e2ca3ae255f64fee4aaab36c01d5a03eb3162a2)
+- upd：sliceUploadFile返回UploadId [`54d100f`](https://github.com/tencentyun/cos-js-sdk-v5/commit/54d100f41c8bd124c978860532d8a2a81ab1ff9d)
+- Updated CHANGELOG.md [`4a04539`](https://github.com/tencentyun/cos-js-sdk-v5/commit/4a0453966d67b586dbfe186e38973f72ffa8f9bd)
+- update version 1.2.12 [`843ffba`](https://github.com/tencentyun/cos-js-sdk-v5/commit/843ffba1ed4bb22ed5b23e5aeb7833f17f5577ad)
+- update version 1.2.12 [`cd0be19`](https://github.com/tencentyun/cos-js-sdk-v5/commit/cd0be1996ee5bf9e1cd007da2f44b121f23c04ab)
+- upd：sliceUploadFile返回UploadId [`4ff8a8e`](https://github.com/tencentyun/cos-js-sdk-v5/commit/4ff8a8ef35e5e6e80ed6aa2fdac629a954e596d6)
+- upd：优化base64文件上传demo [`cb8f356`](https://github.com/tencentyun/cos-js-sdk-v5/commit/cb8f356b2774280d7dce7886f4016a84c724fa14)
+- _No commit message_ [`c20924e`](https://github.com/tencentyun/cos-js-sdk-v5/commit/c20924e01e53e2045c2e30e76449a3d38dba6d57)
+
 ## [v1.2.11](https://github.com/tencentyun/cos-js-sdk-v5/compare/v1.2.10...v1.2.11) - 2021-05-28
 
 ### Merged
diff --git a/demo/crc64.html b/demo/crc64.html
@@ -0,0 +1,53 @@
+
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>CRC64</title>
+    <style>
+        h1 {
+            font-weight: normal;
+        }
+    </style>
+</head>
+<body>
+
+<div>
+    <h1>JS 计算 CRC64</h1>
+    <form id="form">
+        <label>选择文件，计算 crc64：</label>
+        <input id="file" type="file">
+    </form>
+    <div id="msg"></div>
+</div>
+
+<script src="./crc64.js"></script>
+<script>
+    var el = function (id) {
+        return document.getElementById(id);
+    };
+    var calc = function (file) {
+        var time0 = Date.now();
+        CRC64.file_crc64(file, function (err, hash) {
+            if (err) return console.log('crc64 error:', err);
+            var time1 = Date.now();
+            el('msg').innerHTML = 'cost ' + (time1 - time0) + 'ms, crc64=' + hash;
+            el('form').reset();
+        }, function (percent) {
+            el('msg').innerHTML = (percent * 100).toFixed(2) + '%';
+        });
+    };
+    el('file').onchange = function () {
+        var file = this.files[0];
+        calc(file);
+    };
+
+    // calc string crc64
+    console.log(CRC64.crc64('123456789'));
+</script>
+
+</body>
+</html>
diff --git a/demo/crc64.js b/demo/crc64.js
