hex plus plus

2023-03-31 10:21:44 +08:00
parent f369e59f6f
commit 8e6ce23b98
7 changed files with 97 additions and 56 deletions
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
  },
  "dependencies": {
    "axios": "^0.27.2",
+    "buffer": "^6.0.3",
    "clipboard": "^2.0.11",
    "crypto-js": "^4.1.1",
    "escape-html": "^1.0.3",
--- a/src/api/note.js
+++ b/src/api/note.js
@@ -1,8 +1,9 @@
 import axios from "axios";
 import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";
-import { md5, wrap,convertBase64ToHexString,convertHexStringToUint8Array} from "@/libs/secret";
+import { md5, wrap} from "@/libs/secret";
 import NoteConstant from "@/libs/constants";
+import { Buffer } from 'buffer';

 axios.interceptors.response.use(undefined, (err) => {
  const { config: originalRequest } = err;
@@ -48,14 +49,7 @@ export function saveNote(noteForm, secret) {
    });
  }

-  // let bufferArrary = eval("[" + note.text + "]");
-  // let array = Uint8Array.from(bufferArrary);
-
-  // let encoder = new TextEncoder()
-  // let array = encoder.encode(note.text)
-
-  let hexString = convertBase64ToHexString(note.text)
-  let array = convertHexStringToUint8Array(hexString)
+  let array = Buffer.from(note.text, 'base64')

  let blob = new Blob([array], { type: "application/octet-stream" });
  let form = new FormData();
--- a/src/libs/secret.js
+++ b/src/libs/secret.js
@@ -88,15 +88,15 @@ export function aesDecrypt(word, keyWord) {
  return decrypt;
 }

-//base64 encode
-// export function encode(text) {
-//   return Buffer.from(text, 'utf-8').toString('base64');
-// }
+//base64 encode btoa
+export function base64Encode(text) {
+  return Buffer.from(text, 'utf-8').toString('base64');
+}

-//base64 decode
-// export function decode(text) {
-//   return Buffer.from(text,'base64').toString('utf-8');
-// }
+//base64 decode atob
+export function base64Decode(text) {
+  return Buffer.from(text,'base64').toString('utf-8');
+}

 export function noteUnzip(wdary) {
  let data = unzip(wdary);
--- a/src/views/EditNote.vue
+++ b/src/views/EditNote.vue
@@ -549,7 +549,7 @@ export default {
    dataURLToBlob(dataurl) {
      let arr = dataurl.split(',');
      let mime = arr[0].match(/:(.*?);/)[1];
-      let bstr = atob(arr[1]);
+      let bstr = window.atob(arr[1]);
      let n = bstr.length;
      let u8arr = new Uint8Array(n);
      while (n--) {
--- a/src/views/ViewNote.vue
+++ b/src/views/ViewNote.vue
@@ -336,7 +336,7 @@

 <script>

-import { md5, unwrap,convertUint8ArrayToHexString,convertHexStringToBase64 } from "@/libs/secret";
+import { md5, unwrap } from "@/libs/secret";
 import { getStoreKey } from "@/api/lock";
 import { deleteNote, getNoteBlob } from "@/api/note";
 import storage from "@/libs/storage";
@@ -346,6 +346,7 @@ import Clipboard from "clipboard";
 import { saveAs } from 'file-saver';
 import { isWeixin, getNoteUrl } from "@/libs/utils";
 import html2canvas from "html2canvas";
+import { Buffer } from 'buffer';

 export default {
  name: 'ViewNote',
@@ -589,12 +590,7 @@ export default {
              return;
            }

-            // let decoder = new TextDecoder();
-            // let bytesString = decoder.decode(e.target.result);
-
-            let hexString = convertUint8ArrayToHexString(new Uint8Array(e.target.result));
-            let base64String = convertHexStringToBase64(hexString);
-
+            let base64String = Buffer.from(e.target.result).toString('base64')
            that.noteForm.text = unwrap(base64String, that.secret.secretKey);
            //that.noteForm.escapeText = getEscapeText(that.noteForm.text);

@@ -669,7 +665,7 @@ export default {
    dataURLToBlob(dataurl) {
      let arr = dataurl.split(',');
      let mime = arr[0].match(/:(.*?);/)[1];
-      let bstr = atob(arr[1]);
+      let bstr = window.atob(arr[1]);
      let n = bstr.length;
      let u8arr = new Uint8Array(n);
      while (n--) {
@@ -681,7 +677,7 @@ export default {
      let canvasID = this.$refs["html2canvas"];
      let that = this;
      let a = document.createElement('a');
-      html2canvas(canvasID,{
+      html2canvas(canvasID, {
        scale: 1,
        windowWidth: document.getElementById("noteText").offsetWidth,
        onclone: (clonedDocument) => {
@@ -689,16 +685,16 @@ export default {
          const div = clonedDocument.createElement('div')
          div.innerText = nt.value

-          div.style.color="black";
+          div.style.color = "black";
          div.style.padding = "0px";
          div.style.textAlign = "left";
          div.style.wordBreak = "break-word";
          div.style.whiteSpace = "pre-wrap";
          div.style.verticalAlign = "top";
-          div.style.fontSize ="15px";
-          div.style.width= "100%";
-          div.style.border="0px";
-          div.style.fontFamily="'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";
+          div.style.fontSize = "15px";
+          div.style.width = "100%";
+          div.style.border = "0px";
+          div.style.fontFamily = "'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";

          nt.style.display = 'none'

--- a/vue.config.js
+++ b/vue.config.js
@@ -67,13 +67,21 @@ module.exports = defineConfig({
  devServer: {
    proxy: {
      "/note": {
-        target: "https://flagnote.com/", // 后台接口域名
-        //        target: "http://localhost:10000/", // 后台接口域名
+        //target: "https://flagnote.com/", // 后台接口域名
+        target: "http://localhost:20000/", // 后台接口域名
        secure: false, // 如果是https接口，需要配置这个参数
        changeOrigin: true, //是否跨域
        pathRewrite: {
          // '^/': '/'
        },
+      }, "^/[abcdefhikmnopqstuvwxyz23456789]{16}\\.txt$": {
+        //target: "https://flagnote.com/", // 后台接口域名
+        target: "http://localhost:20000/", // 后台接口域名
+        secure: false, // 如果是https接口，需要配置这个参数
+        changeOrigin: true, //是否跨域
+        pathRewrite: {
+          '^/': '/note/'
+        },
      },
    },
  },
--- a/yarn.lock
+++ b/yarn.lock
@@ -2013,6 +2013,11 @@ balanced-match@^1.0.0:
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==

+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
+
 base64-js@^1.3.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2123,6 +2128,14 @@ buffer@^5.5.0:
    base64-js "^1.3.1"
    ieee754 "^1.1.13"

+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 bytes@3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2558,6 +2571,13 @@ css-declaration-sorter@^6.3.1:
  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
  integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==

+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
+  dependencies:
+    utrie "^1.0.2"
+
 css-loader@^6.5.0:
  version "6.7.2"
  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
@@ -3650,6 +3670,14 @@ html-webpack-plugin@^5.1.0:
    pretty-error "^4.0.0"
    tapable "^2.0.0"

+html2canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
+  dependencies:
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
+
 htmlparser2@^6.1.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
@@ -3728,7 +3756,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==

-ieee754@^1.1.13:
+ieee754@^1.1.13, ieee754@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -5927,6 +5955,13 @@ terser@^5.10.0, terser@^5.14.1:
    commander "^2.20.0"
    source-map-support "~0.5.20"

+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
+  dependencies:
+    utrie "^1.0.2"
+
 text-table@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -6120,6 +6155,13 @@ utils-merge@1.0.1:
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==

+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
+  dependencies:
+    base64-arraybuffer "^1.0.2"
+
 uuid@^8.3.2:
  version "8.3.2"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -6204,7 +6246,7 @@ vue-loader@^17.0.0:
    hash-sum "^2.0.0"
    loader-utils "^2.0.0"

-vue-router@^3.5.4:
+vue-router@^3.6.5:
  version "3.6.5"
  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8"
  integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==