新的 .env 管理机制如下：

1. 新增 `scripts/init_env.sh` - 若 `.env` 不存在，从 `.env.example` 复制生成 - 支持 `--force`：覆盖 `.env` 并备份为 `.env.bak` - 首次搭建时统一执行：`./scripts/init_env.sh` 2. 统一加载逻辑 `scripts/lib/load_env.sh` - 移除 `activate.sh` 和 `service_ctl.sh` 中的重复解析逻辑 - 使用共享的 `load_env_file`，并改为 `eval "$(printf 'export %s=%q\n' "$key" "$value")"` 安全导出 - 支持含 ``、`$`、空格等特殊字符的值（需在 `.env` 中用引号包裹） 3. 使用方式 - **activate.sh**：`source scripts/lib/load_env.sh` 后调用 `load_env_file` - **service_ctl.sh**：同上，去掉内联的 `load_env_file` 实现 - **create_tenant_index.sh**：改为使用共享 loader，不再用 `set -a; source .env` 4. 文档更新 - **README.md**：在快速开始中加入 `./scripts/init_env.sh` - **docs/QUICKSTART.md**：说明 `init_env.sh` 用法，并强调含特殊字符的密码需加引号 - **.env.example**：补充注释说明引号规则 5. setup.sh - 用 `./scripts/init_env.sh` 替代原先的 `cp .env.example .env` --- **推荐流程**： ```bash ./scripts/create_venv.sh ./scripts/init_env.sh 从 .env.example 生成本地 .env source activate.sh ./run.sh ``` **密码写法**：若密码包含 ``、`$`、`&`、空格等，需加引号，例如： ```env DB_PASSWORD="qY8tgodLoA&KTyQ" ES_PASSWORD="4hOaLaf41y2VuI8y" ```

新的 .env 管理机制如下：
1. 新增 `scripts/init_env.sh` - 若 `.env` 不存在，从 `.env.example` 复制生成 - 支持 `--force`：覆盖 `.env` 并备份为 `.env.bak` - 首次搭建时统一执行：`./scripts/init_env.sh` 2. 统一加载逻辑 `scripts/lib/load_env.sh` - 移除 `activate.sh` 和 `service_ctl.sh` 中的重复解析逻辑 - 使用共享的 `load_env_file`，并改为 `eval "$(printf 'export %s=%q\n' "$key" "$value")"` 安全导出 - 支持含 ``、`$`、空格等特殊字符的值（需在 `.env` 中用引号包裹） 3. 使用方式 - **activate.sh**：`source scripts/lib/load_env.sh` 后调用 `load_env_file` - **service_ctl.sh**：同上，去掉内联的 `load_env_file` 实现 - **create_tenant_index.sh**：改为使用共享 loader，不再用 `set -a; source .env` 4. 文档更新 - **README.md**：在快速开始中加入 `./scripts/init_env.sh` - **docs/QUICKSTART.md**：说明 `init_env.sh` 用法，并强调含特殊字符的密码需加引号 - **.env.example**：补充注释说明引号规则 5. setup.sh - 用 `./scripts/init_env.sh` 替代原先的 `cp .env.example .env` --- **推荐流程**： ```bash ./scripts/create_venv.sh ./scripts/init_env.sh 从 .env.example 生成本地 .env source activate.sh ./run.sh ``` **密码写法**：若密码包含 ``、`$`、`&`、空格等，需加引号，例如： ```env DB_PASSWORD="qY8tgodLoA&KTyQ" ES_PASSWORD="4hOaLaf41y2VuI8y" ```
tangwang
1 parent 80955935
Showing 11 changed files with 151 additions and 74 deletions Show diff stats
.env
.env.example
README.md
activate.sh
api/translator_app.py
docs/QUICKSTART.md
scripts/create_tenant_index.sh
scripts/init_env.sh
scripts/lib/load_env.sh
scripts/service_ctl.sh
setup.sh
@@ -0,0 +1,41 @@
+# Elasticsearch Configuration
+ES_HOST=http://localhost:9200
+ES_USERNAME=saas
+ES_PASSWORD=4hOaLaf41y2VuI8y
+
+# Redis Configuration (Optional) - AI 生产 10.200.16.14:6479
+REDIS_HOST=10.200.16.14
+REDIS_PORT=6479
+REDIS_PASSWORD=dxEkegEZ@C5SXWKv
+
+# DeepL Translation API
+DEEPL_AUTH_KEY=c9293ab4-ad25-479b-919f-ab4e63b429ed
+
+# API Service Configuration
+API_HOST=0.0.0.0
+API_PORT=6002
+
+# MySQL Database Configuration (Shoplazza) - AI 生产 10.200.16.14:3316
+DB_HOST=10.200.16.14
+DB_PORT=3316
+DB_DATABASE=saas
+DB_USERNAME=root
+DB_PASSWORD=qY8tgodLoA&KT#yQ
+
+# Model Directories
+TEXT_MODEL_DIR=/data/tw/models/bge-m3 # 已经改为web请求了，不使用本地模型
+IMAGE_MODEL_DIR=/data/tw/models/cn-clip # 已经改为web请求了，不使用本地模型
+
+# Cache Directory
+CACHE_DIR=.cache
+
+# Frontend API Base URL
+API_BASE_URL=http://43.166.252.75:6002
+
+
+# 国内
+DASHSCOPE_API_KEY=sk-c3b8d4db061840aa8effb748df2a997b
+# 美国
+DASHSCOPE_API_KEY=sk-482cc3ff37a8467dab134a7a46830556
+
+OPENAI_API_KEY=sk-HvmTMKtuznibZ75l7L2uF2jiaYocCthqd8Cbdkl09KTE7Ft0
 # Environment Configuration Template
-# Copy this file to .env and update with your actual values.
+# Run: ./scripts/init_env.sh  (copies this file to .env if missing)
+# Then edit .env with your actual values.
 # 生产/测试凭证与远程登录方式见 docs/QUICKSTART.md §1.6
+# Note: Values with special chars (#, $, spaces) should be quoted, e.g. PASSWORD="my#pass"
 # Elasticsearch (生产默认 10.200.16.14:9200，本地可用 localhost)
 ES_HOST=http://localhost:9200
@@ -22,6 +22,7 @@ README ç”¨äºŽç»™åŽç»å¼€å‘è€…å»ºç«‹ç»Ÿä¸€è®¤çŸ¥ï¼š**ç³»ç»Ÿæ¡†æž¶ã€æ¨¡å—è¾¹ç•
 ```bash
 # é¦–æ¬¡åˆ›å»ºçŽ¯å¢ƒï¼ˆé»˜è®¤åŸºç¡€ä¾èµ–ï¼‰
 ./scripts/create_venv.sh
+./scripts/init_env.sh   # ä»Ž .env.example ç”Ÿæˆæœ¬åœ° .envï¼ˆè‹¥ä¸å˜åœ¨ï¼‰
 source activate.sh
 # å¯åŠ¨æ ¸å¿ƒæœåŠ¡ï¼ˆbackend/indexer/frontendï¼‰
@@ -67,6 +68,7 @@ START_EMBEDDING=1 START_TRANSLATOR=1 START_RERANKER=1 ./run.sh
 - **å•ä¸€é…ç½®æº**ï¼šæœåŠ¡åœ°å€ã€provider é€‰æ‹©ã€åŽç«¯å‚æ•°ç»Ÿä¸€åœ¨ `config/config.yaml`ï¼ŒçŽ¯å¢ƒå˜é‡ä»…åšè¦†ç›–ã€‚
 - **æŽ¥å£å¥‘çº¦ä¼˜å…ˆ**ï¼šå¤–éƒ¨ API å¥‘çº¦ä¸Ž provider å¥‘çº¦ç¨³å®šï¼Œå†…éƒ¨é‡æž„ä¸å½±å“è°ƒç”¨æ–¹ã€‚
 - **æ‰©å±•èµ°å·¥åŽ‚**ï¼šæ–°å¢ž provider/backend å¿…é¡»åœ¨å·¥åŽ‚å‡½æ•°ä¸æ˜¾å¼æ³¨å†Œï¼Œç¦æ¢æ—è·¯åˆ†æ”¯ã€‚
+- **ç®€æ´å’Œè§„èŒƒä¼˜å…ˆ**ï¼šå¯¹å¾…å¼‚å¸¸æƒ…å†µï¼Œåˆ†æƒ…å†µè€Œå®šï¼Œå¦‚æžœæ˜¯ç³»ç»Ÿå¯åŠ¨æœŸé—´ã€åŠ è½½èµ„æº/é…ç½®ç‰å‡ºé”™ï¼Œå¯ä»¥å°½æ—©æš´éœ²é—®é¢˜ï¼Œä¸è¦fallbackèµ°ä¸€å¥—è·Ÿé…ç½®ä¸ç¬¦åˆçš„å¦å¤–ä¸€å¥—æœºåˆ¶ï¼Œå³å°½é‡ä¿è¯é€»è¾‘æ¸…æ™°ã€ç®€æ´ï¼›ä½†æ˜¯çº¿ä¸Šçš„æœåŠ¡å¦‚æžœé‡åˆ°å¼‚å¸¸æƒ…å†µå¯ä»¥æ ¹æ®æœ€ä½³å®žè·µé€‰å–åº”å¯¹æ–¹æ³•ï¼Œæ¯”å¦‚è®°å½•é”™è¯¯æ—¥å¿—å¹¶ä¸”ä¿è¯æœåŠ¡æ£å¸¸è¿è¡Œã€‚è§„èŒƒä¼˜å…ˆï¼Œå°½é‡ç”¨ä¸€å¥—æœºåˆ¶æ»¡è¶³éœ€æ±‚ï¼Œè€Œä¸æ˜¯å…¼å®¹å„ç§ä¸åˆç†çš„æƒ…å†µï¼Œå¯¹äºŽä¸åˆç†çš„å†…å®¹ä¼˜å…ˆæ¸…ç†ã€é‡æž„ï¼Œè€Œä¸æ˜¯å…¼å®¹ï¼Œä»¥ä¿è¯ä»£ç æ˜¯ç®€æ´çš„ã€‚
 - **å¯è§‚æµ‹æ€§ä¼˜å…ˆ**ï¼šå¥åº·æ£€æŸ¥ã€å…³é”®æ—¥å¿—ã€è¯·æ±‚ä¸Šä¸‹æ–‡å¿…é¡»å¯è¿½è¸ªã€‚
 - **æµ‹è¯•ä¼˜å…ˆä¿éšœå¥‘çº¦**ï¼šCI é¦–å…ˆä¿è¯æŽ¥å£å¥‘çº¦å’Œæ ¸å¿ƒè·¯å¾„å¯ç”¨ï¼Œå†é€æ¥æ‰©å±•æ€§èƒ½ä¸Žä¸šåŠ¡æµ‹è¯•ã€‚
@@ -27,31 +27,9 @@ else
   return 1
 fi
-# 如果需要加载 .env 中的环境变量
-ENV_FILE="${PROJECT_ROOT}/.env"
-if [ -f "${ENV_FILE}" ]; then
-    while IFS= read -r line || [ -n "${line}" ]; do
-        line="${line%$'\r'}"
-        [[ -z "${line//[[:space:]]/}" ]] && continue
-        [[ "${line}" =~ ^[[:space:]]*# ]] && continue
-        [[ "${line}" != *=* ]] && continue
-
-        key="${line%%=*}"
-        value="${line#*=}"
-        key="${key#"${key%%[![:space:]]*}"}"
-        key="${key%"${key##*[![:space:]]}"}"
-        value="${value#"${value%%[![:space:]]*}"}"
-
-        if [[ ${#value} -ge 2 ]]; then
-            first="${value:0:1}"
-            last="${value: -1}"
-            if [[ ("${first}" == '"' && "${last}" == '"') || ("${first}" == "'" && "${last}" == "'") ]]; then
-                value="${value:1:${#value}-2}"
-            fi
-        fi
-
-        export "${key}=${value}"
-    done < "${ENV_FILE}"
-fi
+# 2) Load .env (optional)
+# shellcheck source=scripts/lib/load_env.sh
+source "${PROJECT_ROOT}/scripts/lib/load_env.sh"
+load_env_file "${PROJECT_ROOT}/.env"
 echo "Environment activated (${ENV_KIND}): ${VIRTUAL_ENV:-${CONDA_DEFAULT_ENV:-unknown}}"
@@ -187,7 +187,6 @@ async def startup_event():
         logger.info(f"Translation service ready with default model: {default_model}")
     except Exception as e:
         logger.error(f"Failed to initialize translator: {e}", exc_info=True)
-        logger.warning("Service will start but translation may not work correctly")
 @app.get("/health")
@@ -255,7 +255,13 @@ curl -u &#39;saas:4hOaLaf41y2VuI8y&#39; \
   }'
 ```
-在项目根目录创建 `.env`（可复制 `.env.example` 后按环境修改）：
+在项目根目录创建 `.env`：
+
+```bash
+./scripts/init_env.sh   # 从 .env.example 复制（若 .env 不存在）
+```
+
+然后按环境修改 `.env`。**含特殊字符（#、$、&、空格）的密码需加引号**，例如：
 ```env
 # MySQL（AI 生产 10.200.16.14:3316，推荐 root）
@@ -263,17 +269,17 @@ DB_HOST=10.200.16.14
 DB_PORT=3316
 DB_DATABASE=saas
 DB_USERNAME=root
-DB_PASSWORD=qY8tgodLoA&KT#yQ
+DB_PASSWORD="qY8tgodLoA&KT#yQ"
 # Elasticsearch
 ES_HOST=http://10.200.16.14:9200
 ES_USERNAME=saas
-ES_PASSWORD=4hOaLaf41y2VuI8y
+ES_PASSWORD="4hOaLaf41y2VuI8y"
 # Redis（可选）
 REDIS_HOST=10.200.16.14
 REDIS_PORT=6479
-REDIS_PASSWORD=dxEkegEZ@C5SXWKv
+REDIS_PASSWORD="dxEkegEZ@C5SXWKv"
 # DeepL 翻译（按需）
 DEEPL_AUTH_KEY=your-key
@@ -5,13 +5,12 @@
 # 切换到项目根目录
 cd "$(dirname "$0")/.."
+PROJECT_ROOT="$(pwd)"
 # 加载 .env 文件（如果存在）
-if [ -f .env ]; then
-    set -a
-    source .env
-    set +a
-fi
+# shellcheck source=scripts/lib/load_env.sh
+source "${PROJECT_ROOT}/scripts/lib/load_env.sh"
+load_env_file "${PROJECT_ROOT}/.env"
 ES_HOST="${ES_HOST:-http://localhost:9200}"
 ES_USERNAME="${ES_USERNAME:-}"
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# Initialize .env from .env.example.
+# Usage:
+#   ./scripts/init_env.sh              # Copy .env.example → .env if missing
+#   ./scripts/init_env.sh --force       # Overwrite .env with .env.example (backup to .env.bak)
+#
+# Production credentials: see docs/QUICKSTART.md §1.6
+#
+set -euo pipefail
+
+PROJECT_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "${PROJECT_ROOT}"
+
+ENV_FILE="${PROJECT_ROOT}/.env"
+EXAMPLE_FILE="${PROJECT_ROOT}/.env.example"
+
+if [ ! -f "${EXAMPLE_FILE}" ]; then
+  echo "ERROR: .env.example not found at ${EXAMPLE_FILE}" >&2
+  exit 1
+fi
+
+force="${1:-}"
+if [[ "${force}" == "--force" ]]; then
+  if [ -f "${ENV_FILE}" ]; then
+    cp "${ENV_FILE}" "${ENV_FILE}.bak"
+    echo "[init_env] Backed up .env to .env.bak"
+  fi
+  cp "${EXAMPLE_FILE}" "${ENV_FILE}"
+  echo "[init_env] Created .env from .env.example"
+  exit 0
+fi
+
+if [ -f "${ENV_FILE}" ]; then
+  echo "[init_env] .env already exists, skipping"
+  exit 0
+fi
+
+cp "${EXAMPLE_FILE}" "${ENV_FILE}"
+echo "[init_env] Created .env from .env.example"
+echo ""
+echo "Next: Edit .env with your credentials (see docs/QUICKSTART.md §1.6)"
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Shared .env loader. Uses standard .env format:
+#   KEY=value
+#   KEY="value with spaces"
+#   KEY='value'
+#
+# Values with special chars (#, $, spaces) should be quoted in .env.
+# Usage: source scripts/lib/load_env.sh && load_env_file /path/to/.env
+#
+load_env_file() {
+  local env_file="${1:-}"
+  [[ -z "${env_file}" || ! -f "${env_file}" ]] && return 0
+
+  while IFS= read -r line || [[ -n "${line}" ]]; do
+    line="${line%$'\r'}"
+    [[ -z "${line//[[:space:]]/}" ]] && continue
+    [[ "${line}" =~ ^[[:space:]]*# ]] && continue
+    [[ "${line}" != *=* ]] && continue
+
+    local key="${line%%=*}"
+    local value="${line#*=}"
+    key="${key#"${key%%[![:space:]]*}"}"
+    key="${key%"${key##*[![:space:]]}"}"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+
+    # Strip surrounding quotes (standard .env behavior)
+    if [[ ${#value} -ge 2 ]]; then
+      local first="${value:0:1}"
+      local last="${value: -1}"
+      if [[ ("${first}" == '"' && "${last}" == '"') || ("${first}" == "'" && "${last}" == "'") ]]; then
+        value="${value:1:${#value}-2}"
+      fi
+    fi
+
+    # Safe export: %q produces shell-quoted string for values with spaces/special chars
+    eval "$(printf 'export %s=%q\n' "$key" "$value")"
+  done < "${env_file}"
+}
@@ -11,6 +11,9 @@ LOG_DIR=&quot;${PROJECT_ROOT}/logs&quot;
 mkdir -p "${LOG_DIR}"
+# shellcheck source=scripts/lib/load_env.sh
+source "${PROJECT_ROOT}/scripts/lib/load_env.sh"
+
 CORE_SERVICES=("backend" "indexer" "frontend")
 OPTIONAL_SERVICES=("embedding" "translator" "reranker" "tei")
 LEGACY_SERVICES=("clip" "cnclip")
@@ -19,36 +22,6 @@ all_services() {
   echo "${CORE_SERVICES[@]} ${OPTIONAL_SERVICES[@]} ${LEGACY_SERVICES[@]}"
 }
-load_env_file() {
-  local env_file="${PROJECT_ROOT}/.env"
-  if [ ! -f "${env_file}" ]; then
-    return 0
-  fi
-
-  while IFS= read -r line || [ -n "${line}" ]; do
-    line="${line%$'\r'}"
-    [[ -z "${line//[[:space:]]/}" ]] && continue
-    [[ "${line}" =~ ^[[:space:]]*# ]] && continue
-    [[ "${line}" != *=* ]] && continue
-
-    local key="${line%%=*}"
-    local value="${line#*=}"
-    key="${key#"${key%%[![:space:]]*}"}"
-    key="${key%"${key##*[![:space:]]}"}"
-    value="${value#"${value%%[![:space:]]*}"}"
-
-    if [[ ${#value} -ge 2 ]]; then
-      local first="${value:0:1}"
-      local last="${value: -1}"
-      if [[ ("${first}" == '"' && "${last}" == '"') || ("${first}" == "'" && "${last}" == "'") ]]; then
-        value="${value:1:${#value}-2}"
-      fi
-    fi
-
-    export "${key}=${value}"
-  done < "${env_file}"
-}
-
 get_port() {
   local service="$1"
   case "${service}" in
@@ -387,7 +360,7 @@ main() {
   local action="$1"
   shift || true
-  load_env_file
+  load_env_file "${PROJECT_ROOT}/.env"
   local targets
   targets="$(resolve_targets "${action}" "$@")"
   if [ -z "${targets}" ]; then
@@ -34,12 +34,7 @@ echo -e &quot;\n${YELLOW}Current Python version:${NC}&quot;
 python --version
 echo -e "\n${YELLOW}Step 2: Loading configuration${NC}"
-# Check if .env exists
-if [ ! -f ".env" ]; then
-    echo -e "${YELLOW}Creating .env from .env.example...${NC}"
-    cp .env.example .env
-    echo -e "${GREEN}.env file created. Please update it with your actual configuration.${NC}"
-fi
+./scripts/init_env.sh
 # Display configuration
 echo -e "${GREEN}Configuration loaded:${NC}"