diff --git a/.env b/.env index 42a95366..846233c6 100644 --- a/.env +++ b/.env @@ -8,6 +8,8 @@ VUE_APP_PROXY_URL=http://111.231.196.214:30001/ VUE_APP_LOGIN_URL=https://u-pre.boe.com/web # boe域名 VUE_APP_BOE_API_URL=https://u-pre.boe.com +#打包路径 +VUE_APP_OUTPUT_DIR=./dist # iframe嵌套url VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe diff --git a/.env.test b/.env.test index 77826102..9df71ee6 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,6 @@ NODE_ENV=test VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi +VUE_APP_OUTPUT_DIR=./docker/dist VUE_APP_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..26171038 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,5 @@ +FROM devforth/spa-to-http:latest +WORKDIR / + +ADD ./dist/ . +EXPOSE 8080 diff --git a/src/views/login.vue b/src/views/login.vue index 1d5e5365..ebae75bf 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -50,7 +50,8 @@ export default { const router = useRouter(); const state = reactive({ form: { - account: "10181457", + account: "00004409", + // account: "10181457", password: "1234567890Aa", }, }); diff --git a/vue.config.js b/vue.config.js index 0d841393..079769f5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,26 +6,24 @@ * @FilePath: /fe-manage/vue.config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -const { defineConfig } = require("@vue/cli-service"); +const {defineConfig} = require("@vue/cli-service"); module.exports = defineConfig({ - publicPath: process.env.VUE_APP_BASE, - // transpileDependencies: true, - devServer: { - port: 8080, - proxy: { - "/manageApi": { - target: process.env.VUE_APP_PROXY_URL, - changeOrigin: true, //表示是否改变原域名 - // secure: false, - // ws: false, //表示WebSocket协议 - pathRewrite: { - "^/manageApi": "", - }, - }, "/userbasic": { - target: process.env.VUE_APP_BOE_API_URL, - changeOrigin: true, //表示是否改变原域名 - }, - }, - }, + publicPath: process.env.VUE_APP_BASE, + outputDir: process.env.VUE_APP_OUTPUT_DIR, + devServer: { + port: 8080, + proxy: { + "/manageApi": { + target: process.env.VUE_APP_PROXY_URL, + changeOrigin: true, //表示是否改变原域名 + pathRewrite: { + "^/manageApi": "", + }, + }, "/userbasic": { + target: process.env.VUE_APP_BOE_API_URL, + changeOrigin: true, //表示是否改变原域名 + }, + }, + }, });