From eb882aa05b5a9a6cde1edbf034bff7d15f0beb6e Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 31 Oct 2023 09:54:05 +0800 Subject: [PATCH] chore: Support test and prod ebv --- .env.staging => .env.test | 4 ++-- docker/{ => prod}/Dockerfile | 0 docker/{ => prod}/default.conf | 0 docker/{ => prod}/docker-compose.yaml | 0 docker/{ => prod}/secret/ssl.key | 0 docker/{ => prod}/secret/ssl.pem | 0 docker/test/Dockerfile | 9 ++++++++ docker/test/default.conf | 30 +++++++++++++++++++++++++++ docker/test/docker-compose.yaml | 14 +++++++++++++ package.json | 2 +- vue.config.js | 5 +++-- 11 files changed, 59 insertions(+), 5 deletions(-) rename .env.staging => .env.test (56%) rename docker/{ => prod}/Dockerfile (100%) rename docker/{ => prod}/default.conf (100%) rename docker/{ => prod}/docker-compose.yaml (100%) rename docker/{ => prod}/secret/ssl.key (100%) rename docker/{ => prod}/secret/ssl.pem (100%) create mode 100644 docker/test/Dockerfile create mode 100644 docker/test/default.conf create mode 100644 docker/test/docker-compose.yaml diff --git a/.env.staging b/.env.test similarity index 56% rename from .env.staging rename to .env.test index e116ff0..a002d53 100644 --- a/.env.staging +++ b/.env.test @@ -1,7 +1,7 @@ NODE_ENV = production # 测试环境配置 -ENV = 'staging' +ENV = 'test' # 接口地址 -VUE_APP_BASE_API = '/staging' +VUE_APP_BASE_API = '/prod-api' diff --git a/docker/Dockerfile b/docker/prod/Dockerfile similarity index 100% rename from docker/Dockerfile rename to docker/prod/Dockerfile diff --git a/docker/default.conf b/docker/prod/default.conf similarity index 100% rename from docker/default.conf rename to docker/prod/default.conf diff --git a/docker/docker-compose.yaml b/docker/prod/docker-compose.yaml similarity index 100% rename from docker/docker-compose.yaml rename to docker/prod/docker-compose.yaml diff --git a/docker/secret/ssl.key b/docker/prod/secret/ssl.key similarity index 100% rename from docker/secret/ssl.key rename to docker/prod/secret/ssl.key diff --git a/docker/secret/ssl.pem b/docker/prod/secret/ssl.pem similarity index 100% rename from docker/secret/ssl.pem rename to docker/prod/secret/ssl.pem diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile new file mode 100644 index 0000000..5958cc7 --- /dev/null +++ b/docker/test/Dockerfile @@ -0,0 +1,9 @@ +FROM nginx + +COPY ./dist /data + +RUN rm /etc/nginx/conf.d/default.conf + +ADD default.conf /etc/nginx/conf.d/ + +RUN /bin/bash -c 'echo init ok' diff --git a/docker/test/default.conf b/docker/test/default.conf new file mode 100644 index 0000000..a6ba0b5 --- /dev/null +++ b/docker/test/default.conf @@ -0,0 +1,30 @@ +server { + # 自定义访问端口 + listen 3002; + client_max_body_size 100M; + + # 服务名称 + server_name localhost; + + # 代理访问根地址 + root /data; + + #设置转发请求头参数 + proxy_connect_timeout 15s; + proxy_send_timeout 15s; + proxy_read_timeout 15s; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # Nginx 服务器上的 CORS(跨源资源共享)配置 + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Credentials' 'true'; + add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,Cache-Control,X-Mx-ReqToken,X-Requested-With'; + add_header 'Access-Control-Allow-Methods' '*'; + + # 代理访问 + location / { + try_files $uri $uri/ /index.html; + error_page 405 =200 http://$host$request_uri; + } +} diff --git a/docker/test/docker-compose.yaml b/docker/test/docker-compose.yaml new file mode 100644 index 0000000..f31a4a3 --- /dev/null +++ b/docker/test/docker-compose.yaml @@ -0,0 +1,14 @@ +# PROJECT: 康来生物有限公司kicc(智慧冷链)分布式架构平台 +# VERSION: 1.0.0 +# Author: 康来生物科技有限公司-王翔 + +version: '3' +services: + kicc-workflow-design: + build: + context: . + restart: always + container_name: kicc-workflow-design + image: kicc-workflow-design + ports: + - 3002:3002 diff --git a/package.json b/package.json index 7302bd0..0c38d17 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "serve:workflow": "vue-cli-service serve", "build:workflow": "vue-cli-service build", - "build:workflow:stage": "vue-cli-service build --mode staging", + "build:workflow:test": "vue-cli-service build --mode test", "lint:workflow": "vue-cli-service lint" }, "dependencies": { diff --git a/vue.config.js b/vue.config.js index 672a158..ee5210c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -2,11 +2,12 @@ const path = require('path'); const { name } = require('./package'); const resolve = (dir) => path.join(__dirname, dir) const DEV_PORT = 7102 -const OUTPUT_DIR = 'docker/dist' +const TEST_OUTPUT_DIR = 'docker/test/dist' +const PROD_OUTPUT_DIR = 'docker/prod/dist' module.exports = { assetsDir: 'static', - outputDir: OUTPUT_DIR, + outputDir: process.env.ENV === 'test' ? TEST_OUTPUT_DIR : PROD_OUTPUT_DIR, chainWebpack: config => { config.resolve.alias.set('@', resolve('src')) config.resolve.alias.set('@components', resolve('src/components'))