push Develop

src/tool/https.js

@@ -33,6 +33,8 @@ let httpIp = process.env.NODE_ENV == 'development' ? "" : "";
 // console.log(axios.defaults.baseURL);
 axios.defaults.baseURL = process.env.VUE_APP_BASE_URL;   //配置接口地址
 
+// 创建取消令牌
+let cancelList = []
 // console.log(process.env.VUE_APP_BASE_URL);
 //POST传参序列化(添加请求拦截器)
 axios.interceptors.request.use((config) => {
@@ -41,7 +43,9 @@ axios.interceptors.request.use((config) => {
         // config.data = qs.stringify(config.data);
         // config.data = JSON.stringify(config.data);
     }
-
+	// config['cancelToken'] = axios.CancelToken(function(c){
+	// 	cancel.push(c)
+	// })
     // config.headers.Authorization = 'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA'; 
     config.headers.Authorization = getCookie('token'); 
 
@@ -49,7 +53,7 @@ axios.interceptors.request.use((config) => {
 },(error) =>{
     return Promise.reject(error);
 });
-
+let isLoginTime = false
 //返回状态判断(添加响应拦截器)
 axios.interceptors.response.use((res) =>{
 	// if(res.data.data == null){
@@ -84,18 +88,39 @@ axios.interceptors.response.use((res) =>{
             return Promise.reject(res.data);
 		}
     }
+	removeCancelToken(res.config.cancelToken);
     
 }, function(error) {
     if(error?.response?.status === 401 && router.currentRoute._value.name != 'setIdentification'){//如果是记录浏览器页面就不跳转login
-        router.replace('/login')
-		clonAllCookie()
+		if(!isLoginTime){
+			isLoginTime = true
+			router.replace('/')
+			message.warning('请登陆后重试~')
+			cancelAllRequests()
+			clonAllCookie()
+			setTimeout(()=>[
+				isLoginTime = false
+			],2000)
+		}
+       
         return Promise.reject()
     }
     let data_new = error?.response?.data
     // message.error(data_new?.errMsg || 'Error: server exception')
     return Promise.reject(data_new);
-    
 });
+function removeCancelToken(cancelTokenToRemove) {
+    const index = cancelList.findIndex(source => source.token === cancelTokenToRemove);
+    if (index !== -1) {
+        cancelList.splice(index, 1);
+    }
+}
+function cancelAllRequests() {
+    // cancelList.forEach(source => {
+	// 	console.log(123123,source);
+    //     source('123');
+    // });
+}
 export const Https = {
     httpUrls: {
         interfaceUrl: '',
@@ -120,6 +145,9 @@ export const Https = {
         endpoint:`api/third/party/your-secured-endpoint`, //获取唯一标识是否存在
 		
 
+		designWorksRegister:'/api/account/designWorksRegister', //注册
+		designWorksRegisterCode:'/api/account/designWorksRegisterCode', //注册
+		
 
         preLogin:'/api/account/preLogin',//预先登入
         accountSendEmail:`/api/account/sendEmail`, //发送邮件
@@ -225,12 +253,33 @@ export const Https = {
 		getPorfolio:`/api/portfolio/page`,//查询作品广场
 		getPorfolioDetail:`/api/portfolio/detail`,//查询作品广场作品详情
 		setPorfolioChoose:`/api/portfolio/choose`,//二次创作
+		portfolioLike:`/api/portfolio/like`,//作品广场点赞
+		portfolioNoLike:`/api/portfolio/unlike`,//作品广场取消点赞
+		portfolioComment:`/api/portfolio/comment`,//作品广场评论
+		portfolioCommentPage:`/api/portfolio/commentPage`,//作品广场评论列表
 
+		//product生成
+		toProduct:`/api/history/toProduct`,//开始生成
+		toProductImageResult:`/api/history/toProductImageResult`,//获取结果
+		toProductImageElementUpload:`/api/history/toProductImageElementUpload`,//上传
+		productImageLike:`/api/history/productImageLike`,//like生成结果
+		productImageUnLike:`/api/history/productImageUnLike`,//取消like生成结果
+		productImageLikeList:`/api/history/productImageLikeList`,//like生成结果
+		
+
+		//保存画布
+		canvasElementUpload:`/api/history/canvasElementUpload`,//画布上传临时图片
+		exportSave:`/api/history/exportSave`,//保存画布
+		exportSearch:`/api/history/exportSearch`,//保存画布
 
     },
 
     axiosGet(url,config) {
         return new Promise((resolve, reject) => {
+			if(isLoginTime) {
+				resolve('')
+				return
+			}
             axios.get(url,config).then(response => {
                     resolve(response)
                 }).catch((error) => {
@@ -241,6 +290,10 @@ export const Https = {
 
     axiosPut(url, data) {
         return new Promise((resolve, reject) => {
+			if(isLoginTime) {
+				resolve('')
+				return
+			}
             axios.put(url, data).then(response => {
                     resolve(response)
                 }).catch((error) => {
@@ -251,6 +304,10 @@ export const Https = {
 
     axiosPost(url, data,config) {
         return new Promise((resolve, reject) => {
+			if(isLoginTime) {
+				resolve('')
+				return
+			}
             axios.post(url, data,config).then(response => {
                     resolve(response)
                 }).catch((error) => {
@@ -261,6 +318,10 @@ export const Https = {
 
     axiosDelete(url, newData) {
         return new Promise((resolve, reject) => {
+			if(isLoginTime) {
+				resolve('')
+				return
+			}
             axios.delete(url,{data:newData}).then(response => {
                     resolve(response)
                 }).catch((error) => {