diff --git a/.env.development b/.env.development index d335511..e8eb91d 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VITE_BASE_URL = 'http://192.168.1.3:48081' -VITE_SOCKET_SERVER = 'http://192.168.1.3:48081' +VITE_BASE_URL = 'http://192.168.1.3:48080' +VITE_SOCKET_SERVER = 'http://192.168.1.3:48080' diff --git a/.env.production b/.env.production index c4c416d..bb23583 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,2 @@ -VITE_BASE_URL = 'http://192.168.1.3:48081' -VITE_SOCKET_SERVER = 'http://192.168.1.3:48081' \ No newline at end of file +VITE_BASE_URL = 'http://192.168.1.3:48080' +VITE_SOCKET_SERVER = 'http://192.168.1.3:48080' \ No newline at end of file diff --git a/package.json b/package.json index dcf68da..2b4a100 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,7 @@ "docker-save": "docker save -o ./docker_output/chuneng-web.tar chuneng-web" }, "dependencies": { - "@bytemd/plugin-gemoji": "^1.21.0", - "@bytemd/plugin-gfm": "^1.21.0", - "@bytemd/plugin-highlight": "^1.21.0", - "@bytemd/vue-next": "^1.21.0", + "@element-plus/icons-vue": "^2.3.1", "@iconify-json/ep": "^1.1.12", "@iconify/json": "^2.2.217", diff --git a/src/api/server/axiosInstance.ts b/src/api/server/axiosInstance.ts index 3cbc86b..2d53f0a 100644 --- a/src/api/server/axiosInstance.ts +++ b/src/api/server/axiosInstance.ts @@ -122,11 +122,11 @@ const createAxiosInstance = (module: APIConfigKeys, config: Config) => { } else if (code === 401) { if (!isRefreshToken) { isRefreshToken = true - if (!getRefreshToken()) logout() + // if (!getRefreshToken()) logout() try { const refreshTokenRes = await refreshToken() if (refreshTokenRes.data.code !== 0) { - logout() + // logout() return Promise.reject({ code, msg }) } setToken(refreshTokenRes.data.data.accessToken) @@ -139,7 +139,7 @@ const createAxiosInstance = (module: APIConfigKeys, config: Config) => { // openSocket() return service(config) } catch (e) { - logout() + // logout() return Promise.reject({ code, msg }) } finally { requestList = [] diff --git a/src/main.ts b/src/main.ts index 220d8dc..703e7bb 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,4 @@ import 'element-plus/dist/index.css' -import "bytemd/dist/index.css"; import { createApp } from 'vue' import { createPinia } from 'pinia' import App from '@/pages/App.vue' diff --git a/src/pages/fileDoc/index.vue b/src/pages/fileDoc/index.vue index 42a814e..5b4e12d 100644 --- a/src/pages/fileDoc/index.vue +++ b/src/pages/fileDoc/index.vue @@ -309,7 +309,13 @@ async function saveFolder(isAdd: boolean, item: any) { path: getPath(), }) } - if (isResError(res)) return + if (isResError(res)) { + // 删除新增的文件夹 + if (isAdd) { + dataList.value.pop() + } + return + } } async function saveFile(isAdd: boolean, item: any) { let res