From 70fba9d74efd3fe66a34e6c449ed1aba3ad46d9c Mon Sep 17 00:00:00 2001 From: joshen Date: Tue, 20 Feb 2024 15:09:22 +0800 Subject: [PATCH 1/7] =?UTF-8?q?Update=20ThirdApi.js=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A7=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83api=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ThirdApi.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 26102ae..ce7a12c 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,5 +1,6 @@ export const BASE = 'https://u-pre.boe.com' export const GET_USER_LIST = `/admin/CheckUser/userInfo` -export const GET_USER_INFO = `/admin/thirdApi/user/searchList` +// export const GET_USER_INFO = `/admin/thirdApi/user/searchList` +export const GET_USER_INFO = `/admin/userbasic/user/searchList` From ebb2b2d89e80cbf9fd40fa2b1a8e79fa75990c5a Mon Sep 17 00:00:00 2001 From: joshen Date: Tue, 20 Feb 2024 15:20:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?Update=20ThirdApi.js=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ThirdApi.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 26102ae..ce7a12c 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,5 +1,6 @@ export const BASE = 'https://u-pre.boe.com' export const GET_USER_LIST = `/admin/CheckUser/userInfo` -export const GET_USER_INFO = `/admin/thirdApi/user/searchList` +// export const GET_USER_INFO = `/admin/thirdApi/user/searchList` +export const GET_USER_INFO = `/admin/userbasic/user/searchList` From d76ff4aca315da4c714392971f109bc9ecbd60f7 Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 21 Feb 2024 14:07:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?Update=20ThirdApi.js=20=E4=BF=AE=E6=94=B9ap?= =?UTF-8?q?i=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ThirdApi.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index ce7a12c..c050059 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,6 +1,8 @@ export const BASE = 'https://u-pre.boe.com' -export const GET_USER_LIST = `/admin/CheckUser/userInfo` + +export const GET_USER_LIST = `/manageApi/admin/CheckUser/userInfo` +export const GET_USER_INFO = `/manageApi/admin/thirdApi/user/searchList` +// export const GET_USER_LIST = `/admin/CheckUser/userInfo` // export const GET_USER_INFO = `/admin/thirdApi/user/searchList` -export const GET_USER_INFO = `/admin/userbasic/user/searchList` From 1869226fcaac1f6d2bbc868ecb634182faba2208 Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 21 Feb 2024 14:14:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Update=20App.vue=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E6=9D=83=E9=99=90=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/App.vue b/src/App.vue index 9635071..390aecd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,6 +33,7 @@ onMounted(() => { window.location.href.includes("/login") || getUserInfo(); }); + function getUserInfo() { if ( import.meta.env.MODE === "development" || @@ -42,10 +43,15 @@ function getUserInfo() { store.commit("SET_USER", res.data); }); } else { - boeRequest(GET_USER_INFO).then((res) => { - res.result.avatar = - res.result.avatar || "/800e23f7-b58c-4192-820d-0c6a2b7544cc.png"; - store.commit("SET_USER", res.result); + // 修改生产环境验证 GET_USER_INFO 接口不存在 选择GET_USER_LIST + // boeRequest(GET_USER_INFO).then((res) => { + // res.result.avatar = + // res.result.avatar || "/800e23f7-b58c-4192-820d-0c6a2b7544cc.png"; + // store.commit("SET_USER", res.result); + // }); + + boeRequest(GET_USER_LIST, {}).then((res) => { + store.commit("SET_USER", res.data); }); } } From 12e489660a600bd14f57760ab4c16b7c13774074 Mon Sep 17 00:00:00 2001 From: qinshengcheng <928194311@qq.com> Date: Wed, 21 Feb 2024 14:41:21 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 390aecd..f1bb513 100644 --- a/src/App.vue +++ b/src/App.vue @@ -39,7 +39,8 @@ function getUserInfo() { import.meta.env.MODE === "development" || import.meta.env.MODE === "test" ) { - request(USER_INFO, {}).then((res) => { + // request(USER_INFO, {}).then((res) => { + request(GET_USER_LIST, {}).then((res) => { store.commit("SET_USER", res.data); }); } else { From 7fa4eaeaed8177cad4f37adc10c1ffcc501a1060 Mon Sep 17 00:00:00 2001 From: qinshengcheng <928194311@qq.com> Date: Wed, 21 Feb 2024 14:45:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/App.vue b/src/App.vue index f1bb513..c6355ab 100644 --- a/src/App.vue +++ b/src/App.vue @@ -40,9 +40,14 @@ function getUserInfo() { import.meta.env.MODE === "test" ) { // request(USER_INFO, {}).then((res) => { - request(GET_USER_LIST, {}).then((res) => { - store.commit("SET_USER", res.data); - }); + boeRequest(GET_USER_INFO).then((res) => { + res.result.avatar = + res.result.avatar || "/800e23f7-b58c-4192-820d-0c6a2b7544cc.png"; + store.commit("SET_USER", res.result); + }) + // request(GET_USER_LIST, {}).then((res) => { + // store.commit("SET_USER", res.data); + // }); } else { // 修改生产环境验证 GET_USER_INFO 接口不存在 选择GET_USER_LIST // boeRequest(GET_USER_INFO).then((res) => { From f0e12d0657e6c4852ccc81bc21e557fa1871f115 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 21 Feb 2024 14:56:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=AA=8C=E8=AF=81537=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index c6355ab..fc98570 100644 --- a/src/App.vue +++ b/src/App.vue @@ -35,10 +35,12 @@ onMounted(() => { function getUserInfo() { + console.log("-- 获取登录用户信息---", answerTime); if ( import.meta.env.MODE === "development" || import.meta.env.MODE === "test" ) { + console.log("-- 获取环境信息 01---", import.meta.env.MODE); // request(USER_INFO, {}).then((res) => { boeRequest(GET_USER_INFO).then((res) => { res.result.avatar = @@ -49,6 +51,7 @@ function getUserInfo() { // store.commit("SET_USER", res.data); // }); } else { + console.log("-- 获取环境信息 02---", import.meta.env.MODE); // 修改生产环境验证 GET_USER_INFO 接口不存在 选择GET_USER_LIST // boeRequest(GET_USER_INFO).then((res) => { // res.result.avatar = @@ -56,7 +59,7 @@ function getUserInfo() { // store.commit("SET_USER", res.result); // }); - boeRequest(GET_USER_LIST, {}).then((res) => { + boeRequest(GET_USER_INFO, {}).then((res) => { store.commit("SET_USER", res.data); }); }