diff --git a/.env b/.env index dda511a..a7d74e0 100644 --- a/.env +++ b/.env @@ -17,27 +17,22 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # --------------------------- 开发环境 api地址 ---------------------------------- +VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 -VITE_APP_DEV_SERVICE = http://192.168.101.81:9999 # 邓-本地 -# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 -# VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 -# VITE_APP_DEV_SERVICE = http://localhost:9999 +# VITE_APP_DEV_SERVICE = http://192.168.101.81:9999 # 邓-本地 +# VITE_APP_DEV_SERVICE = http://47.96.250.9:8089/api # 测试线上 # --------------------------- 开发环境 图片访问基础地址 --------------------------- -#VITE_IMAGE_DEV_PATH = http://localhost:9999 -# VITE_IMAGE_DEV_PATH = http://192.168.101.81:9999 # 邓-本地 -# VITE_IMAGE_DEV_PATH = http://220.191.229.171:8090/api # 线上 -# VITE_IMAGE_DEV_PATH = http://pjcloud.center.takin.cc # 张 -#VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上 VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上 +#VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上 +# VITE_IMAGE_DEV_PATH = http://192.168.101.81:9999 # 邓-本地 +# VITE_IMAGE_DEV_PATH = http://47.96.250.9:8089/api # 测试线上 +# VITE_IMAGE_DEV_PATH = http://pjcloud.center.takin.cc # 张-本地 # --------------------------- 生产环境 api地址 ---------------------------------- -#VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api -#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 -# VITE_APP_PROD_SERVICE = http://220.191.229.171:8090/api #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +#VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api # --------------------------- 生产环境 图片访问基础地址 --------------------------- VITE_APP_PROD_IMAGE = https://stgl.pj.gov.cn/api # 域名线上 diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts index 376a2a7..bf2fe7c 100644 --- a/src/sheep/api/user.ts +++ b/src/sheep/api/user.ts @@ -29,8 +29,9 @@ export default { // 浙政钉授权 auth: (token: string): Promise => request({ - url: `/thirdparty/thirdPartyOAth2/zzdsso/${token}`, - method: "GET", + url: "/thirdparty/thirdPartyOAth2/zzdsso", + method: "POST", + data: { token }, custom: { showLoading: false, loadingMsg: "授权中", diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts index 3f13d58..b397bca 100644 --- a/src/sheep/utils/request.ts +++ b/src/sheep/utils/request.ts @@ -58,8 +58,11 @@ async function handleZzdLogin(): Promise { } else { uni.removeStorageSync(TOKEN_KEY) uni.removeStorageSync(USER_INFO_KEY) - // uni.showToast({ title: res.msg || "登录失败", icon: "none" }) - uni.showToast({ title: "用户信息获取失败,请退出然后重新进入智慧后勤应用", icon: "none", duration: 5000 }) + if (res.msg == "token已失效") { + uni.showToast({ title: "用户凭证已失效,请退出并重新进入智慧后勤应用", icon: "none", duration: 6000 }) + } else { + uni.showToast({ title: res.msg || "登录失败", icon: "none" }) + } return false } } catch (error) {