diff --git a/.env.dev b/.env.dev index 4117e361..38419ba1 100644 --- a/.env.dev +++ b/.env.dev @@ -4,9 +4,8 @@ VUE_APP_CURRENTMODE = 'dev' VUE_APP_BASEOSS = 'https://diaoyan-files.automark.cc' VUE_APP_BASEURL = 'http://planetg-java.test.automark.cc/' -VUE_APP_JAVA_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' +VUE_APP_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.dcin-test.digitalyili.com/apigtech/message-send-center/'; -VUE_APP_REDURL = 'https://red.test.automark.cc/' VUE_APP_SOCKETURL = 'wss://planetg-java.test.automark.cc/survey_sync' VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' diff --git a/.env.prod b/.env.prod index 85f75a6f..17a6d45b 100644 --- a/.env.prod +++ b/.env.prod @@ -4,10 +4,9 @@ VUE_APP_CURRENTMODE = 'sit' VUE_APP_BASEOSS = 'https://test-cxp-pubcos.yili.com/uat-yls' VUE_APP_BASEURL = 'http://planetg-java.test.automark.cc/' -VUE_APP_JAVA_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' +VUE_APP_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.dcin-test.digitalyili.com/apigtech/message-send-center/'; VUE_APP_LOGIN = 'https://yip-uat.dctest.digitalyili.com/login' -VUE_APP_REDURL = 'https://luck.yls-api-uat.dcin-test.digitalyili.com' VUE_APP_SOCKETURL = 'wss://planetg-java.test.automark.cc/survey_sync' VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' diff --git a/.env.uat b/.env.uat index 85f75a6f..17a6d45b 100644 --- a/.env.uat +++ b/.env.uat @@ -4,10 +4,9 @@ VUE_APP_CURRENTMODE = 'sit' VUE_APP_BASEOSS = 'https://test-cxp-pubcos.yili.com/uat-yls' VUE_APP_BASEURL = 'http://planetg-java.test.automark.cc/' -VUE_APP_JAVA_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' +VUE_APP_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.dcin-test.digitalyili.com/apigtech/message-send-center/'; VUE_APP_LOGIN = 'https://yip-uat.dctest.digitalyili.com/login' -VUE_APP_REDURL = 'https://luck.yls-api-uat.dcin-test.digitalyili.com' VUE_APP_SOCKETURL = 'wss://planetg-java.test.automark.cc/survey_sync' VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' diff --git a/src/config.js b/src/config.js index 2b3d5e4f..9be32366 100644 --- a/src/config.js +++ b/src/config.js @@ -1,9 +1,8 @@ module.exports = { proxyUrl: process.env.VUE_APP_BASEURL, - proxyUrlJava: process.env.VUE_APP_JAVA_DELiVERY_BASEURL, + proxyUrlDelivery: process.env.VUE_APP_DELiVERY_BASEURL, proxyUrlMessageCenter:process.env.VUE_APP_MESSAGE_CENTER, baseOss: process.env.VUE_APP_BASEOSS, - redUrl: process.env.VUE_APP_REDURL, loginUrl: process.env.VUE_APP_LOGIN, socketUrl: process.env.VUE_APP_SOCKETURL, jsonpUrl: process.env.VUE_APP_JSONPURL, diff --git a/src/utils/redRequest.js b/src/utils/redRequest.js index ce31972d..9b36c15f 100644 --- a/src/utils/redRequest.js +++ b/src/utils/redRequest.js @@ -4,15 +4,15 @@ import router from '@/router/index'; import { message, Modal } from 'ant-design-vue'; import { A_COMMON_CLEAR_TOKEN } from '@store/constance/constance.common'; -const { proxyUrlJava } = require('@/config'); -const baseURL = process.env.NODE_ENV === 'production' ? proxyUrlJava : '/api'; +const { proxyUrl } = require('@/config'); +const baseURL = process.env.NODE_ENV === 'production' ? proxyUrl : '/api'; // axios.defaults.withCredentials = true; // create an axios instance const service = axios.create({ baseURL: `${baseURL}/api/luck/api/v1/`, // url = base url + request url - withCredentials: true, + withCredentials: true, timeout: 30000, // request timeout }); diff --git a/src/utils/request.js b/src/utils/request.js index a82e5a13..cd002458 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,8 +4,8 @@ import router from "@/router/index"; import { message, Modal } from "ant-design-vue"; import { A_COMMON_CLEAR_TOKEN } from "@store/constance/constance.common"; -const { proxyUrlJava } = require("@/config"); -const baseURL = process.env.NODE_ENV === "production" ? proxyUrlJava : "/api"; +const { proxyUrl } = require("@/config"); +const baseURL = process.env.NODE_ENV === "production" ? proxyUrl : "/api"; // axios.defaults.withCredentials = true; diff --git a/src/utils/requestJava.js b/src/utils/requestJava.js index ff7ccd3d..a3b18bdf 100644 --- a/src/utils/requestJava.js +++ b/src/utils/requestJava.js @@ -5,8 +5,8 @@ import router from '@/router/index'; import { message, Modal } from 'ant-design-vue'; // import { } from '@store/constance/constance.common'; const A_COMMON_CLEAR_TOKEN = `KNWBfEXiflgpgxJV7L8+gZGYFJZ0ceBgsV2uB7MLFtnLMjH1pSZ36A0f89T0N4NGj/5xTvh/aZsyJDwmed63Bg==` -const { proxyUrlJava } = require('@/config'); -const baseURL = process.env.NODE_ENV === 'production' ? proxyUrlJava : ''; +const { proxyUrlDelivery } = require('@/config'); +const baseURL = process.env.NODE_ENV === 'production' ? proxyUrlDelivery : ''; // axios.defaults.withCredentials = true; diff --git a/vue.config.js b/vue.config.js index df6eea42..0bb9d134 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,7 +3,7 @@ const Components = require('unplugin-vue-components/webpack') const { ElementPlusResolver } = require('unplugin-vue-components/resolvers') const MomentLocalesPlugin = require('moment-locales-webpack-plugin'); const LodashModuleReplacementPlugin = require("lodash-webpack-plugin"); -const { proxyUrl, redUrl, proxyUrlJava } = require('./src/config'); +const { proxyUrl, proxyUrlDelivery } = require('./src/config'); const { baseOss } = require('./src/config'); const path = require('path'); @@ -40,7 +40,7 @@ module.exports = { // }, // }, '/request-java': { - target: `${proxyUrlJava}/api`, + target: `${proxyUrlDelivery}/api`, changeOrigin: true, pathRewrite: { '^/request-java': '', // 路径重写 @@ -53,13 +53,6 @@ module.exports = { '^/rng': '' } }, - '/redApi': { // 红包 - target: `${redUrl}api/v1/`, - changeOrigin: true, - pathRewrite: { - '^/redApi': '' - } - }, }, }, css: {