From 69e05f61a303587470dcf67390fa0aede78d7cbd Mon Sep 17 00:00:00 2001 From: simple321vip Date: Sun, 17 Jul 2022 10:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E4=BA=91=E6=94=BE=E7=9B=98?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +++--- src/api/blog.ts | 16 ++++++++-------- src/api/blogView.ts | 6 +++--- src/api/bookmark.ts | 10 +++++----- src/api/cloud.ts | 2 +- src/api/login.ts | 2 +- src/api/master.ts | 2 +- src/api/onenote.ts | 10 +++++----- src/api/user.ts | 4 ++-- src/components/login/login.vue | 2 +- src/main.ts | 22 +++++++++++++--------- 11 files changed, 43 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index b43bf2b..c459e95 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "g-home", + "name": "violin-home", "private": true, - "version": "0.0.0", + "version": "0.0.5", "scripts": { "dev": "vite --host", "build": "vue-tsc --noEmit && vite build", @@ -39,4 +39,4 @@ "vite-plugin-compression": "^0.5.1", "vue-tsc": "^0.29.8" } -} +} \ No newline at end of file diff --git a/src/api/blog.ts b/src/api/blog.ts index 2eaaeb7..7eb4fdf 100644 --- a/src/api/blog.ts +++ b/src/api/blog.ts @@ -6,14 +6,14 @@ const headers = { const listAll = () => { return request({ - url: '/api/v1/author/blog/list', + url: '/auth/api/v1/author/blog/list', method: 'GET' }) } const updateBtName = (data: Object) => { return request({ - url: '/api/v1/author/blog_type', + url: '/auth/api/v1/author/blog_type', method: 'POST', headers: headers, data: data @@ -22,7 +22,7 @@ const updateBtName = (data: Object) => { const putBlogType = (data: Object) => { return request({ - url: '/api/v1/author/blog_type', + url: '/auth/api/v1/author/blog_type', method: 'PUT', headers: headers, data: data @@ -31,7 +31,7 @@ const putBlogType = (data: Object) => { const removeBlogType = (data: Object) => { return request({ - url: '/api/v1/author/blog_type', + url: '/auth/api/v1/author/blog_type', method: 'DELETE', headers: headers, data: data @@ -40,7 +40,7 @@ const removeBlogType = (data: Object) => { const getContent = (id: string) => { return request({ - url: '/api/v1/author/blog/content/' + id, + url: '/auth/api/v1/author/blog/content/' + id, method: 'GET', headers: headers, }) @@ -48,7 +48,7 @@ const getContent = (id: string) => { const putBlog = (postData: Object) => { return request({ - url: '/api/v1/author/blog/content', + url: '/auth/api/v1/author/blog/content', method: 'PUT', headers: headers, data: postData @@ -57,7 +57,7 @@ const putBlog = (postData: Object) => { const updateContent = (postData: Object) => { return request({ - url: '/api/v1/author/blog/content', + url: '/auth/api/v1/author/blog/content', method: 'POST', headers: headers, data: postData @@ -66,7 +66,7 @@ const updateContent = (postData: Object) => { const deleteContent = (bid: string) => { return request({ - url: '/api/v1/author/blog/' + bid, + url: '/auth/api/v1/author/blog/' + bid, method: 'DELETE', headers: headers, }) diff --git a/src/api/blogView.ts b/src/api/blogView.ts index ad21718..0d9f1f1 100644 --- a/src/api/blogView.ts +++ b/src/api/blogView.ts @@ -7,7 +7,7 @@ const headers = { const getBlogs = (params: Object) => { return request({ - url: '/api/v1/reader/blogs', + url: '/auth/api/v1/reader/blogs', method: 'GET', params: params, paramsSerializer: (params) => { @@ -18,7 +18,7 @@ const getBlogs = (params: Object) => { const getBtName = () => { return request({ - url: '/api/v1/reader/blog_type', + url: '/auth/api/v1/reader/blog_type', method: 'GET', headers: headers }) @@ -26,7 +26,7 @@ const getBtName = () => { const getBlog = (bid: string) => { return request({ - url: '/api/v1/reader/blog/' + bid, + url: '/auth/api/v1/reader/blog/' + bid, method: 'GET', headers: headers }) diff --git a/src/api/bookmark.ts b/src/api/bookmark.ts index 2dd7f7b..c9fc46a 100644 --- a/src/api/bookmark.ts +++ b/src/api/bookmark.ts @@ -2,7 +2,7 @@ import request from '../utils/request' import Qs from 'qs' const search_bookmark = (params: Object) => { return request({ - url: '/api/v1/bookmark', + url: '/auth/api/v1/bookmark', method: 'get', params: params, paramsSerializer: (params) => { @@ -13,7 +13,7 @@ const search_bookmark = (params: Object) => { const put_bookmark = (params: Object) => { return request({ - url: '/api/v1/bookmark/insert', + url: '/auth/api/v1/bookmark/insert', method: 'put', data: params }) @@ -21,7 +21,7 @@ const put_bookmark = (params: Object) => { const update_bookmark = (params: Object) => { return request({ - url: '/api/v1/bookmark/update', + url: '/auth/api/v1/bookmark/update', method: 'post', data: params }) @@ -29,14 +29,14 @@ const update_bookmark = (params: Object) => { const delete_bookmark = (query: number) => { return request({ - url: '/api/v1/bookmark/delete/' + query, + url: '/auth/api/v1/bookmark/delete/' + query, method: 'delete', }) } const delete_bookmarks = (params: Object) => { return request({ - url: '/api/v1/bookmark', + url: '/auth/api/v1/bookmark', method: 'delete', headers: {}, data: params diff --git a/src/api/cloud.ts b/src/api/cloud.ts index 8e30657..f222a62 100644 --- a/src/api/cloud.ts +++ b/src/api/cloud.ts @@ -6,7 +6,7 @@ const headers = { const getAudioInfo = (url: string) => { return request({ - url: '/api/v1/common/audio-info', + url: '/auth/api/v1/common/audio-info', method: 'GET', params: { url: url }, }) diff --git a/src/api/login.ts b/src/api/login.ts index ce0bc0d..3b52c97 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -6,7 +6,7 @@ const headers = { const getQrCode = () => { return request({ - url: '/authorize/baidu', + url: '/auth/authorize/baidu', method: 'GET', headers: headers, }) diff --git a/src/api/master.ts b/src/api/master.ts index 0098def..023982f 100644 --- a/src/api/master.ts +++ b/src/api/master.ts @@ -1,7 +1,7 @@ import request from '../utils/request' const bookmark_type = () => { return request({ - url: '/api/v1/master/bookmark/type', + url: '/auth/api/v1/master/bookmark/type', method: 'get', data: {} }) diff --git a/src/api/onenote.ts b/src/api/onenote.ts index 4667353..5ddc243 100644 --- a/src/api/onenote.ts +++ b/src/api/onenote.ts @@ -2,7 +2,7 @@ import request from '../utils/request' const get_notes = (params: Object) => { return request({ - url: '/api/v1/one_note', + url: '/auth/api/v1/one_note', method: 'get', params: params }) @@ -10,7 +10,7 @@ const get_notes = (params: Object) => { const update_page = (params: Object) => { return request({ - url: '/api/v1/one_note/update_page', + url: '/auth/api/v1/one_note/update_page', method: 'post', data: params }) @@ -18,7 +18,7 @@ const update_page = (params: Object) => { const update_section = (params: Object) => { return request({ - url: '/api/v1/one_note/update_section', + url: '/auth/api/v1/one_note/update_section', method: 'post', data: params }) @@ -26,14 +26,14 @@ const update_section = (params: Object) => { const insert_section = () => { return request({ - url: '/api/v1/one_note/insert_section', + url: '/auth/api/v1/one_note/insert_section', method: 'put' }) } const insert_page = (params: Object) => { return request({ - url: '/one_note/insert_page', + url: '/auth/one_note/insert_page', method: 'put', data: params }) diff --git a/src/api/user.ts b/src/api/user.ts index 7e21575..4636978 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,7 +1,7 @@ import request from '../utils/request' const authorize = (params: any) => { return request({ - url: '/auth/v1/authorize', + url: '/auth/api/v1/authorize', method: 'post', data: params }) @@ -9,7 +9,7 @@ const authorize = (params: any) => { const obtainUserInfo = (token: string) => { return request({ - url: '/auth/v1/user_info', + url: '/auth/api/v1/user_info', method: 'GET', params: { token: token } }) diff --git a/src/components/login/login.vue b/src/components/login/login.vue index 33dec18..2887918 100644 --- a/src/components/login/login.vue +++ b/src/components/login/login.vue @@ -14,7 +14,7 @@ -->

请使用百度App扫码登录

百度App diff --git a/src/main.ts b/src/main.ts index a1eca3e..a83fd3f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -18,16 +18,20 @@ import Cookies from 'js-cookie' import { obtainUserInfo } from './api/user' const whiteList = ['/login'] let url = window.location.href -if (url.search("token") != -1) { - let authorizeToken = url.split("token=")[1] - setToken(authorizeToken) - await obtainUserInfo(authorizeToken).then(response => { - setUser(response.data) - }) - router.push({ - path: '/home', - }) + +async function checktoken(url: string) { + if (url.search("token") != -1) { + let authorizeToken = url.split("token=")[1] + setToken(authorizeToken) + await obtainUserInfo(authorizeToken).then(response => { + setUser(response.data) + }) + router.push({ + path: '/home', + }) + } } +checktoken(url) /** * ルーター監視