eats

src/components/ContextMenu.vue

@@ -28,8 +28,9 @@ const optionRef = ref()
 const contextMenuOptions = computed(() => {
   const folderOpts = [
     { id: 'newFolder', name: '新建文件夹' },
-    { type: 'divider', class: 'cm-option-divider' },
     { id: 'newFile', name: '新建文件' },
+    // { type: 'divider', class: 'cm-option-divider' },
+    // { id: 'deleteFile', name: '删除...' },
   ]
 
   const fileOpts = [

src/pages/index.vue

@@ -8,7 +8,6 @@
 </template>
 
 <script setup>
-import { Base64 } from 'js-base64'
 import { ref, shallowRef, watch, onMounted } from 'vue'
 import Editor from '@/components/Editor.vue';
 import { useModel } from '@zjxpcyc/vue-tiny-store'
@@ -26,7 +25,7 @@ const handleSave = () => {
 
 watch(note, (newVal) => {
   if (newVal && newVal.content) {
-    valueHtml.value = Base64.decode(newVal.content)
+    valueHtml.value = newVal.content
   } else {
     valueHtml.value = ''
   }

src/plugins/core/index.js

@@ -0,0 +1,33 @@
+
+// from redux code
+function compose(...funcs) {
+  if (funcs.length === 0) {
+      return arg => arg
+  }
+
+  if (funcs.length === 1) {
+      return funcs[0]
+  }
+
+  return funcs.reduce((a, b) => (...args) => a(b(...args)))
+}
+
+function createPlugin() {
+  const hooks = {};
+
+  const apply = (type, func) => {
+    let listeners = hooks[type] || []
+    listeners = listeners.filter(x => x !== func).concat(func)
+    hooks[type] = listeners
+  }
+
+  const invoke = (type, ...args) => {
+    const listeners = hooks[type] || []
+    return compose(...listeners)(...args)
+  }
+
+  return { apply, invoke }
+}
+
+const plugins = createPlugin()
+export default plugins

src/plugins/index.js

@@ -1,34 +1,6 @@
-import createEvent from '@zjxpcyc/js_event'
-const eventBus = createEvent();
+import plugins from "./core/index";
+import onNote from "./plugins/onNote";
 
-// from redux code
-function compose(...funcs) {
-  if (funcs.length === 0) {
-      return arg => arg
-  }
+onNote(plugins)
 
-  if (funcs.length === 1) {
-      return funcs[0]
-  }
-
-  return funcs.reduce((a, b) => (...args) => a(b(...args)))
-}
-
-function createPlugin(hookBus) {
-  const hooks = {};
-
-  const apply = (type, func) => {
-    let listeners = hooks[type] || []
-    listeners = listeners.filter(x => x !== func).concat(func)
-    hooks[type] = apply
-  }
-
-  const invoke = (type, ...args) => {
-    const listeners = hooks[type] || []
-    return compose(...listeners)(...args)
-  }
-
-  return { apply, invoke }
-}
-
-const plugins = createPlugin(eventBus)
+export default plugins

src/plugins/plugins/onNote.js

@@ -1,18 +1,28 @@
 import CryptoJS from 'crypto-js'
+import { Base64 } from 'js-base64'
 import * as cache from '@/utils/cache'
-import plugins from '../index'
 
+export default (plugins) => {
 
-plugins.apply('readNote', (rawNote) => {
-  const secretKey = cache.get('encrypt_secret')
-  if (!secretKey) return rawNote;
+  plugins.apply('readNote', (rawNote) => {
+    debugger
+    const base64Data = Base64.decode(rawNote)
+    const secretKey = cache.get('encrypt_secret')
+    if (!secretKey) return base64Data;
+  
+    const decrypted = CryptoJS.AES.decrypt(base64Data, secretKey)
+    return decrypted.toString(CryptoJS.enc.Utf8);
+  })
+  
+  plugins.apply('writeNote', (rawNote) => {
+    const secretKey = cache.get('encrypt_secret')
+    if (!secretKey) return Base64.encode(rawNote);
 
-  return CryptoJS.AES.decrypt(rawNote, secretKey).toString(CryptoJS.enc.Utf8)
-})
-
-plugins.apply('writeNote', (rawNote) => {
-  const secretKey = cache.get('encrypt_secret')
-  if (!secretKey) return rawNote;
-
-  return CryptoJS.AES.encrypt(rawNote, secretKey).toString()
-})
+    const encrypted = CryptoJS.AES.encrypt(rawNote, secretKey, {
+      mode: CryptoJS.mode.CBC,
+      padding: CryptoJS.pad.Pkcs7,
+    })  
+    return Base64.encode(encrypted.toString())
+  })
+  
+}

src/service/gitee.js

@@ -1,6 +1,5 @@
 
-import { Base64 } from 'js-base64'
-import request, { BASE_URL } from '@/utils/request'
+import request from '@/utils/request'
 import { getToken, setToken } from '@/utils/token'
 
 // 获取当前用户信息
@@ -96,7 +95,7 @@ export const newFile = (user, content, path, repo = 'my-note') => {
   const { access_token } = getToken() || {}
   const data = {
     access_token,
-    content: Base64.encode(content),
+    content,
     message: new Date().toJSON(),
   }
   const options = {
@@ -112,12 +111,12 @@ export const newFolder = (user, path, repo = 'my-note') => {
 }
 
 // 更新文件
-export const updateFile = (user, fileInfo) => {
+export const updateFile = (user, fileInfo, repo = 'my-note') => {
   const { access_token } = getToken() || {}
   const { path, sha, content } = fileInfo
   const data = {
     access_token,
-    content: Base64.encode(content),
+    content,
     sha,
     message: new Date().toJSON(),
   }
@@ -125,7 +124,7 @@ export const updateFile = (user, fileInfo) => {
     loading: 'loading.note',
   }
 
-  return request.put(path, data, options)
+  return request.put(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, data, options)
 }
 
 export const deleteFile = (user, fileInfo, repo = 'my-note') => {

src/store/model/note.js

@@ -1,6 +1,7 @@
 import { reactive, ref, computed } from 'vue'
 import { message } from 'ant-design-vue';
 import * as gitee from '@/service/gitee'
+import plugins from '@/plugins'
 
 const getParentPath = path => {
   const paths = path.split('/')
@@ -8,6 +9,9 @@ const getParentPath = path => {
   return paths.join('/')       
 }
 
+const decodeData = raw => plugins.invoke('readNote', raw)
+const encodeData = raw => plugins.invoke('writeNote', raw)
+
 export default function useNote() {
   const fileArr = reactive([])
   // const fileTree = reactive([])
@@ -34,23 +38,38 @@ export default function useNote() {
   })
 
   const getNote = (user, path = '', repo = 'my-note') => {
-    return gitee.getFile(user, path, repo).then(res => note.value = res)
+    return gitee.getFile(user, path, repo).then(res => {
+      const content = res.content ? decodeData(res.content) : undefined
+
+      note.value = {
+        ...res,
+        content
+      }
+    })
   }
 
   const newNote = (user, path, repo = 'my-note') => {
-    gitee.newFile(user, '又是一篇崭新的日记...', path, repo).then(() => {
+    const content = encodeData('又是一篇崭新的日记...')
+    gitee.newFile(user, content, path, repo).then(() => {
       getFiles(user, getParentPath(path), repo)
     })
   }
 
-  const updateNote = (content, user) => {
-    const filePath = note.value.url.replace(BASE_URL, '')
-    const fileInfo = { filePath, sha: note.value.sha, content }
+  const updateNote = (content, user, repo = 'my-note') => {
+    const path = note.value.path
+    const fileInfo = { path, sha: note.value.sha, content: encodeData(content) }
 
-    return gitee.updateFile(user, content, fileInfo).then(() => {
+    return gitee.updateFile(user, fileInfo, repo).then(() => {
       message.success('保存成功');
       // 获取最新的数据, 目的是更新 sha 值
-      gitee.getFile(user, filePath, 'my-note').then(res => note.value = res)
+      gitee.getFile(user, path, repo).then(res => {
+        const content = res.content ? decodeData(res.content) : undefined
+  
+        note.value = {
+          ...res,
+          content
+        }
+      })
     })
   }
 
@@ -71,6 +90,7 @@ export default function useNote() {
     }
 
     if (!file) return;
+
     gitee.deleteFile(user, { path, sha: file.sha }, repo).then(() => {
       fileArr.splice(pos, 1)
     })