Merge #13 into dev from dev_jacy
部署文件上传,修改环境变量为development * dev_jacy: (1 commits) 部署文件上传,修改环境变量为development Signed-off-by: jacy <moonjie444@163.com> Reviewed-by: jacy <moonjie444@163.com> Merged-by: jacy <moonjie444@163.com> CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/13
This commit is contained in:
@@ -53,9 +53,11 @@ log "PULL $LOCAL_SHA -> $REMOTE_SHA"
|
|||||||
# 保留生产密钥,避免 reset 覆盖
|
# 保留生产密钥,避免 reset 覆盖
|
||||||
ENV_BACKUP="$(mktemp)"
|
ENV_BACKUP="$(mktemp)"
|
||||||
API_ENV_BACKUP="$(mktemp)"
|
API_ENV_BACKUP="$(mktemp)"
|
||||||
|
API_ENV_DEV_BACKUP="$(mktemp)"
|
||||||
API_ENV_PROD_BACKUP="$(mktemp)"
|
API_ENV_PROD_BACKUP="$(mktemp)"
|
||||||
cp "$ENV_FILE" "$ENV_BACKUP" 2>/dev/null || true
|
cp "$ENV_FILE" "$ENV_BACKUP" 2>/dev/null || true
|
||||||
cp "$APP_ROOT/server/dukang-api/.env" "$API_ENV_BACKUP" 2>/dev/null || true
|
cp "$APP_ROOT/server/dukang-api/.env" "$API_ENV_BACKUP" 2>/dev/null || true
|
||||||
|
cp "$APP_ROOT/server/dukang-api/.env.development" "$API_ENV_DEV_BACKUP" 2>/dev/null || true
|
||||||
cp "$APP_ROOT/server/dukang-api/.env.production" "$API_ENV_PROD_BACKUP" 2>/dev/null || true
|
cp "$APP_ROOT/server/dukang-api/.env.production" "$API_ENV_PROD_BACKUP" 2>/dev/null || true
|
||||||
|
|
||||||
git checkout "$GIT_BRANCH"
|
git checkout "$GIT_BRANCH"
|
||||||
@@ -63,8 +65,9 @@ git reset --hard "$GIT_REMOTE/$GIT_BRANCH"
|
|||||||
|
|
||||||
cp "$ENV_BACKUP" "$ENV_FILE" 2>/dev/null || true
|
cp "$ENV_BACKUP" "$ENV_FILE" 2>/dev/null || true
|
||||||
cp "$API_ENV_BACKUP" "$APP_ROOT/server/dukang-api/.env" 2>/dev/null || true
|
cp "$API_ENV_BACKUP" "$APP_ROOT/server/dukang-api/.env" 2>/dev/null || true
|
||||||
|
cp "$API_ENV_DEV_BACKUP" "$APP_ROOT/server/dukang-api/.env.development" 2>/dev/null || true
|
||||||
cp "$API_ENV_PROD_BACKUP" "$APP_ROOT/server/dukang-api/.env.production" 2>/dev/null || true
|
cp "$API_ENV_PROD_BACKUP" "$APP_ROOT/server/dukang-api/.env.production" 2>/dev/null || true
|
||||||
rm -f "$ENV_BACKUP" "$API_ENV_BACKUP" "$API_ENV_PROD_BACKUP"
|
rm -f "$ENV_BACKUP" "$API_ENV_BACKUP" "$API_ENV_DEV_BACKUP" "$API_ENV_PROD_BACKUP"
|
||||||
sed -i 's/\r$//' "$ENV_FILE" 2>/dev/null || true
|
sed -i 's/\r$//' "$ENV_FILE" 2>/dev/null || true
|
||||||
|
|
||||||
# 修复 Windows 换行
|
# 修复 Windows 换行
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ module.exports = {
|
|||||||
instances: 1,
|
instances: 1,
|
||||||
exec_mode: 'fork',
|
exec_mode: 'fork',
|
||||||
env: {
|
env: {
|
||||||
NODE_ENV: 'production',
|
// 预发/联调阶段用 development;正式上线后改回 production
|
||||||
|
NODE_ENV: 'development',
|
||||||
PORT: 8090,
|
PORT: 8090,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# 服务器机器相关(覆盖 .env.development 中的同名项)
|
||||||
|
PORT=8090
|
||||||
|
DATABASE_URL="mysql://dukang:Dukang2026!@localhost:3306/dukang_haoke"
|
||||||
|
REDIS_URL="redis://localhost:6379"
|
||||||
Reference in New Issue
Block a user