feats

src/components/SubMenu.vue

           <template #title>
             <ContextMenuVue @menuClick="tipVisible = false" />
           </template>
-          <div @contextmenu="handleContextMenu(`/@@dir@@/${menu.path}`)">
+          <div @contextmenu.stop="handleContextMenu(`/@@dir@@/${menu.path}`)">
             {{menu.name}}
           </div>
           </a-tooltip>

src/layouts/components/SiderBar.vue

   })
 }
 
-const createNewFolder = (newFolderName) => {
-  if (!curMenu.value) return;
-
-  const path = curMenu.value.path + `/${newFolderName}`
-
-  newFolder(path, user).then(() => {
-    // 获取父级信息, 目的刷新当前目录
-    getMenus(user, curMenu.value.path).then(res => {
-      curMenu.value.children = res || []
+// 创建新文件
+const createNewFile = (newFileName) => {
+  const parentPath = curMenu.value ? curMenu.value.path : undefined
+  const newFilePath = parentPath ? `${parentPath}/${newFileName}.html` : `${newFileName}.html`
+
+  newFile('又是一篇崭新的日记...', newFilePath, user).then(() => {
+    getMenus(user, parentPath).then(res => {
+      const newDIR = (res || []).filter(x => x.path.indexOf('.gitignore') === -1)
+      if (curMenu.value) {
+        curMenu.value.children = newDIR
+      } else {
+        menus.splice().push(...newDIR || [])
+      }
     })
   })
-
 }
 
+// 创建新目录
+const createNewFolder = (newFolderName) => {
+  const parentPath = curMenu.value ? curMenu.value.path : undefined
+  const newFilePath = parentPath ? `${parentPath}/${newFolderName}` : newFolderName
+
+  newFolder(newFilePath, user).then(() => {
+    getMenus(user, parentPath).then(res => {
+      const newDIR = (res || []).filter(x => x.path.indexOf('.gitignore') === -1)
+      if (curMenu.value) {
+        curMenu.value.children = newDIR
+      } else {
+        menus.push(...newDIR || [])
+      }
+    })
+  })
+}
 
+eventBus.addEventListener('menu.newFile', createNewFile)
 eventBus.addEventListener('menu.newFolder', createNewFolder)
 </script>

src/route.js

   routes, // `routes: routes` 的缩写
 })
 
+const isEmpty = x => !x || !x.length || !Object.keys(x).length
+
 router.beforeEach((to, from, next) => {
   NProgress.start();
   const { user, getUserInfo } = store.getState('user')
-  if (!user.token) {
+
+  if (to.name === 'login') {
     NProgress.done();
-    if (to.name != 'login') {
-      next({ name: 'login' })
-    } else {
-      next()
-    }
-  } else {
-    if (!user.id && to.name != 'login') {
-      getUserInfo(user.token).then(() => {
-        NProgress.done();
-        next()
-      })
-    } else {
+    return next()
+  }
+
+  if (isEmpty(user)) {    
+    getUserInfo(user.token).then(() => {
       NProgress.done();
       next()
-    }
+    }).catch(() => {
+      NProgress.done();
+      next({ name: 'login' })
+    })
+    return
+  } else {
+    NProgress.done();
+    next()
   }
   
 })

src/service/gitee.js

+
+import { Base64 } from 'js-base64'
+import request, { BASE_URL } from '@/utils/request'
+import { getToken, setToken } from '@/utils/token'
+
+// 获取当前用户信息
+export const getCurrentUser = () => {
+  const { access_token } = getToken() || {}
+  return request.get('/api/v5/user', { params: { access_token } })
+}
+
+// 登录
+export const signIn = (data) => {
+  return request.post('/oauth/token', data, { contentType: 'application/x-www-form-urlencoded' }).then(res => {
+    setToken(res)
+    return res;
+  })
+}
+
+// 刷新 token
+export const refreshToken = (token) => {
+  const { refresh_token } = token || {}
+  return request.post('/oauth/token', null, { params: { grant_type: 'refresh_token', refresh_token } }).then(res => {
+    setToken(res)
+    return res
+  })
+}
+
+// 获取仓库信息
+export const getRepo = (user, repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  return request.get(`/api/v5/repos/${user.login}/${repo}`, { params: { access_token } })
+}
+
+// 新建仓库
+export const newRepo = (name = 'my-note') => {
+  const { access_token } = getToken() || {}
+  const data = {
+    access_token,
+    name,
+    private: false,
+    auto_init: true,
+  }
+  return request.post('/api/v5/user/repos', data)
+}
+
+// 创建分支
+export const newBranch = (user, branch_name = 'master', repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  const data = {
+    access_token,
+    refs: 'master',
+    branch_name,
+  }
+  return request.post(`/api/v5/repos/${user.login}/${repo}`, data)
+}
+
+// 获取文件树
+export const getTree = (user, repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  const sha = '4f26aeafdb2367620a393c973eddbe8f8b846ebd' // master
+  return request.get(`/api/v5/repos/${user.login}/${repo}/git/trees/${sha}`, { params: { access_token, recursive: 1 } })
+}
+
+// 获取文件列表
+export const getFiles = (user, path = '', repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  return request.get(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, { params: { access_token } })
+}
+
+// 获取文件详情
+export const getFile = (user, path = '', repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  return request.get(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, { params: { access_token } })
+}
+
+// 新增文件
+export const newFile = (user, content, path, repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  const data = {
+    access_token,
+    content: Base64.encode(content),
+    message: new Date().toJSON(),
+  }
+  return request.post(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, data)
+}
+
+// 新增目录, 其实就是新增一个 内容是 # 的 .gitignore 文件
+export const newFolder = (user, path, repo = 'my-note') => {
+  const filePath = `${path}/.gitignore`
+  return newFile('#', filePath, user, repo)
+}
+
+// 更新文件
+export const updateFile = (user, content, fileInfo) => {
+  const { access_token } = getToken() || {}
+  const { url, sha } = fileInfo
+  const data = {
+    access_token,
+    content: Base64.encode(content),
+    sha,
+    message: new Date().toJSON(),
+  }
+
+  const filePath = url.replace(BASE_URL, '')
+
+  return request.put(filePath, data)
+}

src/store/model/menu.js

 import { reactive, ref } from "vue";
-import request from '@/utils/request'
+import * as gitee from '@/service/gitee'
 
 export default function useMenu() {
   const menus = reactive([])
   const curMenu = ref()
 
   const getMenus = (user, path = '', repo = 'my-note') => {
-    const { access_token } = user.token
-    return request.get(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, { params: { access_token } })
+    gitee.getTree(user, repo).then(console.log)
+
+    return gitee.getFiles(user, path, repo).then(res => {
+      menus.push(...res)
+    })
   }
 
   return {

src/store/model/repo.js

-import { reactive } from "vue";
-import { Base64 } from 'js-base64'
-import request from '@/utils/request'
+import { reactive, ref } from "vue";
+import * as gitee from '@/service/gitee'
 
 export default function useRepo() {
   const repo = reactive({})
+  const user = ref()
 
   const getRepo = (user, repo = 'my-note') => {
-    const { access_token } = user.token
-    return request.get(`/api/v5/repos/${user.login}/${repo}`, { params: { access_token } }).then(res => Object.assign(repo, res))
+    return gitee.getRepo(user, repo).then(res => Object.assign(repo, res))
   }
 
   const newRepo = (user, name = 'my-note') => {
-    const { access_token } = user.token
-    const data = {
-      access_token,
-      name,
-      private: false,
-      auto_init: true,
-    }
-    return request.post('/api/v5/user/repos', data).then(res => Object.assign(repo, res))
+    return gitee.newRepo(data).then(res => Object.assign(repo, res))
   }
 
   const newBranch = (user, branch_name = 'master', repo = 'my-note') => {
-    const { access_token } = user.token
-    const data = {
-      access_token,
-      refs: 'master',
-      branch_name,
-    }
-    return request.post(`/api/v5/repos/${user.login}/${repo}`, data).then(res => Object.assign(repo, res))
+    return gitee.newBranch(user, branch_name, repo).then(res => Object.assign(repo, res))
   }
 
   // 新增文件
   const newFile = (content, path, user, repo = 'my-note') => {
-    const { access_token } = user.token
-    const data = {
-      access_token,
-      content: Base64.encode(content),
-      message: new Date().toJSON(),
-    }
-    return request.post(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, data)
+    return gitee.newFile(user, content, path, repo)
   }
   
   // 新增目录, 其实就是新增一个 内容是 # 的 .gitignore 文件
   const newFolder = (path, user, repo = 'my-note') => {
-    const filePath = `${path}/.gitignore`
-    return newFile('#', filePath, user, repo)
+    return gitee.newFile(user, path, repo)
   }
 
   return {

src/store/model/user.js

 import { reactive } from 'vue'
-import request from '@/utils/request'
-import { getToken, setToken } from '@/utils/token'
+import * as gitee from '@/service/gitee'
+import { getToken } from '@/utils/token'
 
 export default function useUser() {
-  const user = reactive({ token: getToken() })
+  const user = reactive({})
 
-  const signIn = (data) => {
-    return request.post('/oauth/token', data, { contentType: 'application/x-www-form-urlencoded' }).then(res => {
-      setToken(res)
-      user.token = res
-      if (user.token) {
-        getUserInfo(user.token)
-      }
+  const getUserInfo = () => {
+    return gitee.getCurrentUser().then(res => {
+      Object.assign(user, res || {})
     })
   }
+
+  const signIn = (data) => {
+    return gitee.signIn(data).then(getUserInfo)
+  }
   
   const signOut = () => {
     // xxx
   }
 
-  const getUserInfo = (token) => {
-    return request.get('/api/v5/user', { params: { access_token: token.access_token } }).then(res => {
-      Object.assign(user, res || {})
-    })
-  }
 
   // 快过期的需要刷新 token
-  const refreshToken = (token) => {
+  const refreshToken = () => {
+    const token = getToken()
     const now = (new Date()).valueOf() / 1000
     const expire = token.expires_in + token.created_at
     const diff = 1 * 60 * 60 // 小时
 
     if (now + diff > expire) {
-      return request.post('/oauth/token', null, { params: { grant_type: 'refresh_token', refresh_token: token.refresh_token } }).then(res => {
-        setToken(res)
-        user.token = res
-      })
+      return gitee.refreshToken(token)
     }
   }
   
   const t = setTimeout(() => {
+    const token = getToken()
     clearTimeout(t)
 
-    if (user.token) {
-      refreshToken(user.token)
-      // getUserInfo(user.token)
+    if (token) {
+      refreshToken()
     }
   }, 0)