Commit 22f69d70 authored by 方建宇's avatar 方建宇

仅跳过登录验证和去掉登录页远程未连接提示

parent 246bf8e0
......@@ -29,50 +29,50 @@ axios.interceptors.request.use((config) => {
}, (error) => {
return Promise.reject(error);
});
axios.interceptors.response.use((res) => {
closeLoading();
checkResponse(res);
return Promise.resolve(res);
}, (error) => {
closeLoading();
alert(error)
let httpMessage = '';
if (error.response) {
if (error.response.status == '401') {
if (error.response.data && error.response.data.status == 401) {
if (!localStorage.getItem('user')) {
Message.error({
showClose: true,
message: '登陆已过期',
type: 'error'
});
}
toLogin();
return;
}
}
if (error.response.status == '404') {
httpMessage = "未找到请求地址";
}
else if (error.response.data && error.response.data.message) {
httpMessage = error.response.data.message;
}
}
if (error.request) {
httpMessage = "未连接到远程服务器!";
console.log(httpMessage + error.message);
if(error.config.url!='/api/User/getVierificationCode'){
toLogin();
}
}
else {
httpMessage = '服务器处理异常';
}
redirect(httpMessage);
return Promise.reject(error.response || {}, httpMessage);
});
//远程服务器连接提示
// axios.interceptors.response.use((res) => {
// closeLoading();
// checkResponse(res);
// return Promise.resolve(res);
// }, (error) => {
// closeLoading();
// alert(error)
// let httpMessage = '';
// if (error.response) {
// if (error.response.status == '401') {
// if (error.response.data && error.response.data.status == 401) {
// if (!localStorage.getItem('user')) {
// Message.error({
// showClose: true,
// message: '登陆已过期',
// type: 'error'
// });
// }
// toLogin();
// return;
// }
//
// }
// if (error.response.status == '404') {
// httpMessage = "未找到请求地址";
// }
// else if (error.response.data && error.response.data.message) {
// httpMessage = error.response.data.message;
// }
// }
// if (error.request) {
// httpMessage = "未连接到远程服务器!";
// console.log(httpMessage + error.message);
// if(error.config.url!='/api/User/getVierificationCode'){
// toLogin();
// }
// }
// else {
// httpMessage = '服务器处理异常';
// }
// redirect(httpMessage);
// return Promise.reject(error.response || {}, httpMessage);
// });
function changeIP(IP){
axios.defaults.baseURL = IP;
......@@ -251,7 +251,13 @@ function toLogin () {
}
window.location.href = window.location.origin + '/login'
}
// function toLogin () {
// if (window.location.hash) {
// window.location.href = window.location.origin + '/#/GisHome'
// return
// }
// window.location.href = window.location.origin + '/GisHome'
// }
//动态刷新token
function replaceToken () {
ajax({
......
......@@ -208,7 +208,7 @@ import {
reactive,
toRefs,
getCurrentInstance,
onMounted,
onMounted,
onUpdated,
onBeforeUnmount,
handleError
......@@ -243,7 +243,7 @@ async function fetchClientIp() {
const res = await fetch('https://api.ipify.org?format=json');
const data = await res.json();
clientIp.value = data.ip;
store.commit('setSERVEICE', data.ip);
//http.ipAddress = store.getters.getSERVEICE;
console.log("changeip:"+clientIp.value + " " );
......@@ -282,35 +282,54 @@ getUserInfo();
let appContext = getCurrentInstance()!.appContext;
let $message = appContext.config.globalProperties.$message;
// function login() {
//
// if(code.value == ''){
// showMessage.value=true;
// errorMessage.value="请输入验证码";
// return $message.error(errorMessage.value);
// }
// loading.value = true;
// userInfo.verificationCode = code.value;
// code.value='';
// http.post('/api/user/login', userInfo, '正在登录....').then((result) => {
// if (!result.success) {
// loading.value = false;
// getPicture();
// showMessage.value=true;
// errorMessage.value=result.message;
// return $message.error(result.message);
// }
// $message.success('登录成功,正在跳转!');
// store.commit('setUserInfo', result.data);
// // router.push({ path: '/Home'});
// if(isRemember.value){
// saveUserInfo(userInfo);
// }
// window.removeEventListener('keydown',handleKeyEvent)
// router.push({ path: '/GisHome'});
// });
// }
function login() {
if(code.value == ''){
showMessage.value=true;
errorMessage.value="请输入验证码";
return $message.error(errorMessage.value);
}
loading.value = true;
userInfo.verificationCode = code.value;
code.value='';
http.post('/api/user/login', userInfo, '正在登录....').then((result) => {
if (!result.success) {
loading.value = false;
getPicture();
showMessage.value=true;
errorMessage.value=result.message;
return $message.error(result.message);
}
$message.success('登录成功,正在跳转!');
store.commit('setUserInfo', result.data);
// router.push({ path: '/Home'});
if(isRemember.value){
saveUserInfo(userInfo);
}
window.removeEventListener('keydown',handleKeyEvent)
router.push({ path: '/GisHome'});
});
// 模拟登录成功
const mockResponse = {
success: true,
data: {
userId: 1,
userName: 'testUser',
token: 'mockToken'
},
message: '登录成功'
};
$message.success(mockResponse.message);
store.commit('setUserInfo', mockResponse.data);
if (isRemember.value) {
saveUserInfo(userInfo);
}
window.removeEventListener('keydown', handleKeyEvent);
router.push({ path: '/GisHome' });
}
function handleKeyEvent(event){
if(event.key === 'Enter'){
login();
......@@ -366,4 +385,4 @@ setKeyEvent()
function setKeyEvent(){
window.addEventListener('keydown',handleKeyEvent);
}
</script>
\ No newline at end of file
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment