fix: 环境

This commit is contained in:
steven
2022-10-08 16:59:55 +08:00
parent c660b608aa
commit c06c95d540
8 changed files with 13 additions and 24 deletions

View File

@@ -4,9 +4,8 @@ VUE_APP_CURRENTMODE = 'dev'
VUE_APP_BASEOSS = 'https://diaoyan-files.automark.cc' VUE_APP_BASEOSS = 'https://diaoyan-files.automark.cc'
VUE_APP_BASEURL = 'http://planetg-java.test.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_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_SOCKETURL = 'wss://planetg-java.test.automark.cc/survey_sync'
VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken'

View File

@@ -4,10 +4,9 @@ VUE_APP_CURRENTMODE = 'sit'
VUE_APP_BASEOSS = 'https://test-cxp-pubcos.yili.com/uat-yls' VUE_APP_BASEOSS = 'https://test-cxp-pubcos.yili.com/uat-yls'
VUE_APP_BASEURL = 'http://planetg-java.test.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_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_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_SOCKETURL = 'wss://planetg-java.test.automark.cc/survey_sync'
VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken'

View File

@@ -4,10 +4,9 @@ VUE_APP_CURRENTMODE = 'sit'
VUE_APP_BASEOSS = 'https://test-cxp-pubcos.yili.com/uat-yls' VUE_APP_BASEOSS = 'https://test-cxp-pubcos.yili.com/uat-yls'
VUE_APP_BASEURL = 'http://planetg-java.test.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_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_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_SOCKETURL = 'wss://planetg-java.test.automark.cc/survey_sync'
VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken'

View File

@@ -1,9 +1,8 @@
module.exports = { module.exports = {
proxyUrl: process.env.VUE_APP_BASEURL, 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, proxyUrlMessageCenter:process.env.VUE_APP_MESSAGE_CENTER,
baseOss: process.env.VUE_APP_BASEOSS, baseOss: process.env.VUE_APP_BASEOSS,
redUrl: process.env.VUE_APP_REDURL,
loginUrl: process.env.VUE_APP_LOGIN, loginUrl: process.env.VUE_APP_LOGIN,
socketUrl: process.env.VUE_APP_SOCKETURL, socketUrl: process.env.VUE_APP_SOCKETURL,
jsonpUrl: process.env.VUE_APP_JSONPURL, jsonpUrl: process.env.VUE_APP_JSONPURL,

View File

@@ -4,15 +4,15 @@ import router from '@/router/index';
import { message, Modal } from 'ant-design-vue'; import { message, Modal } from 'ant-design-vue';
import { A_COMMON_CLEAR_TOKEN } from '@store/constance/constance.common'; import { A_COMMON_CLEAR_TOKEN } from '@store/constance/constance.common';
const { proxyUrlJava } = require('@/config'); const { proxyUrl } = require('@/config');
const baseURL = process.env.NODE_ENV === 'production' ? proxyUrlJava : '/api'; const baseURL = process.env.NODE_ENV === 'production' ? proxyUrl : '/api';
// axios.defaults.withCredentials = true; // axios.defaults.withCredentials = true;
// create an axios instance // create an axios instance
const service = axios.create({ const service = axios.create({
baseURL: `${baseURL}/api/luck/api/v1/`, // url = base url + request url baseURL: `${baseURL}/api/luck/api/v1/`, // url = base url + request url
withCredentials: true, withCredentials: true,
timeout: 30000, // request timeout timeout: 30000, // request timeout
}); });

View File

@@ -4,8 +4,8 @@ import router from "@/router/index";
import { message, Modal } from "ant-design-vue"; import { message, Modal } from "ant-design-vue";
import { A_COMMON_CLEAR_TOKEN } from "@store/constance/constance.common"; import { A_COMMON_CLEAR_TOKEN } from "@store/constance/constance.common";
const { proxyUrlJava } = require("@/config"); const { proxyUrl } = require("@/config");
const baseURL = process.env.NODE_ENV === "production" ? proxyUrlJava : "/api"; const baseURL = process.env.NODE_ENV === "production" ? proxyUrl : "/api";
// axios.defaults.withCredentials = true; // axios.defaults.withCredentials = true;

View File

@@ -5,8 +5,8 @@ import router from '@/router/index';
import { message, Modal } from 'ant-design-vue'; import { message, Modal } from 'ant-design-vue';
// import { } from '@store/constance/constance.common'; // import { } from '@store/constance/constance.common';
const A_COMMON_CLEAR_TOKEN = `KNWBfEXiflgpgxJV7L8+gZGYFJZ0ceBgsV2uB7MLFtnLMjH1pSZ36A0f89T0N4NGj/5xTvh/aZsyJDwmed63Bg==` const A_COMMON_CLEAR_TOKEN = `KNWBfEXiflgpgxJV7L8+gZGYFJZ0ceBgsV2uB7MLFtnLMjH1pSZ36A0f89T0N4NGj/5xTvh/aZsyJDwmed63Bg==`
const { proxyUrlJava } = require('@/config'); const { proxyUrlDelivery } = require('@/config');
const baseURL = process.env.NODE_ENV === 'production' ? proxyUrlJava : ''; const baseURL = process.env.NODE_ENV === 'production' ? proxyUrlDelivery : '';
// axios.defaults.withCredentials = true; // axios.defaults.withCredentials = true;

View File

@@ -3,7 +3,7 @@ const Components = require('unplugin-vue-components/webpack')
const { ElementPlusResolver } = require('unplugin-vue-components/resolvers') const { ElementPlusResolver } = require('unplugin-vue-components/resolvers')
const MomentLocalesPlugin = require('moment-locales-webpack-plugin'); const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
const LodashModuleReplacementPlugin = require("lodash-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 { baseOss } = require('./src/config');
const path = require('path'); const path = require('path');
@@ -40,7 +40,7 @@ module.exports = {
// }, // },
// }, // },
'/request-java': { '/request-java': {
target: `${proxyUrlJava}/api`, target: `${proxyUrlDelivery}/api`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/request-java': '', // 路径重写 '^/request-java': '', // 路径重写
@@ -53,13 +53,6 @@ module.exports = {
'^/rng': '' '^/rng': ''
} }
}, },
'/redApi': { // 红包
target: `${redUrl}api/v1/`,
changeOrigin: true,
pathRewrite: {
'^/redApi': ''
}
},
}, },
}, },
css: { css: {