删除GOOGLE_CREDENTIALS_1冗余代码

Author: su-kaka

.env.example

@@ -49,11 +49,11 @@ CREDENTIALS_DIR=./creds
 # 默认: false
 AUTO_LOAD_ENV_CREDS=false
 
-# Google 凭证 JSON (可选，可以直接通过环境变量提供凭证)
-# 支持 base64 编码或直接 JSON 字符串
-# GOOGLE_CREDENTIALS={"type":"authorized_user","client_id":"...","refresh_token":"..."}
-# GOOGLE_CREDENTIALS_2={"type":"authorized_user","client_id":"...","refresh_token":"..."}
-# ... 最多支持 GOOGLE_CREDENTIALS_10
+# Google 凭证环境变量配置 (可选，通过 GCLI_CREDS_* 环境变量提供凭证)
+# 支持编号格式和项目名格式
+# GCLI_CREDS_1={"client_id":"your-client-id","client_secret":"your-secret","refresh_token":"your-token","token_uri":"https://oauth2.googleapis.com/token","project_id":"your-project"}
+# GCLI_CREDS_2={"client_id":"...","project_id":"..."}
+# GCLI_CREDS_myproject={"client_id":"...","project_id":"myproject",...}
 
 # ================================================================
 # 凭证轮换配置

README.md

@@ -187,29 +187,26 @@ docker run -d --name gcli2api --network host -e API_PASSWORD=api_pwd -e PANEL_PA
 - `PASSWORD`: 通用密码，设置后覆盖上述两个（默认：pwd）
 
 **凭证配置**
-- `GOOGLE_CREDENTIALS`: Google OAuth 凭证 JSON（支持原始 JSON 或 base64 编码）
-- `GOOGLE_CREDENTIALS_2` 到 `GOOGLE_CREDENTIALS_10`: 额外的凭证（用于多凭证轮换）
+
+支持使用 `GCLI_CREDS_*` 环境变量导入多个凭证：
 
 #### 凭证环境变量使用示例
 
-**方式 1：直接传入 JSON**
+**方式 1：编号格式**
 ```bash
-export GOOGLE_CREDENTIALS='{"type":"authorized_user","client_id":"...","client_secret":"...","refresh_token":"..."}'
+export GCLI_CREDS_1='{"client_id":"your-client-id","client_secret":"your-secret","refresh_token":"your-token","token_uri":"https://oauth2.googleapis.com/token","project_id":"your-project"}'
+export GCLI_CREDS_2='{"client_id":"...","project_id":"..."}'
 ```
 
-**方式 2：Base64 编码（推荐，更安全）**
+**方式 2：项目名格式**
 ```bash
-# 将凭证文件转为 base64
-cat credential.json | base64 -w 0 > credential.b64
-# 设置环境变量
-export GOOGLE_CREDENTIALS=$(cat credential.b64)
+export GCLI_CREDS_myproject='{"client_id":"...","project_id":"myproject",...}'
+export GCLI_CREDS_project2='{"client_id":"...","project_id":"project2",...}'
 ```
 
-**方式 3：多凭证轮换**
+**启用自动加载**
 ```bash
-export GOOGLE_CREDENTIALS='{"type":"authorized_user",...}'  # 第一个凭证
-export GOOGLE_CREDENTIALS_2='{"type":"authorized_user",...}' # 第二个凭证
-export GOOGLE_CREDENTIALS_3='{"type":"authorized_user",...}' # 第三个凭证
+export AUTO_LOAD_ENV_CREDS=true  # 程序启动时自动导入环境变量凭证
 ```
 
 **Docker 使用示例**

src/credential_manager.py

@@ -372,59 +372,14 @@ async def _discover_credential_files(self):
         old_files = set(self._credential_files)
         all_files = []
 
-        # First, check environment variables for credentials
-        env_creds_loaded = False
-        for i in range(1, 11):  # Support up to 10 credentials from env vars
-            env_var_name = f"GOOGLE_CREDENTIALS_{i}" if i > 1 else "GOOGLE_CREDENTIALS"
-            env_creds = os.getenv(env_var_name)
-            
-            if env_creds:
-                try:
-                    # Try to decode if it's base64 encoded
-                    try:
-                        # Check if it's base64 encoded
-                        decoded = base64.b64decode(env_creds)
-                        env_creds = decoded.decode('utf-8')
-                        log.debug(f"Decoded base64 credential from {env_var_name}")
-                    except:
-                        # Not base64, use as is
-                        pass
-                    
-                    # Parse the JSON credential from environment variable
-                    cred_data = json.loads(env_creds)
-                    
-                    # Auto-add 'type' field if missing but has required OAuth fields
-                    if 'type' not in cred_data and all(key in cred_data for key in ['client_id', 'refresh_token']):
-                        cred_data['type'] = 'authorized_user'
-                        log.debug(f"Auto-added 'type' field to credential from {env_var_name}")
-                    
-                    if all(key in cred_data for key in ['type', 'client_id', 'refresh_token']):
-                        # Save to a temporary file for compatibility with existing code
-                        temp_file = os.path.join(CREDENTIALS_DIR, f"env_credential_{i}.json")
-                        os.makedirs(CREDENTIALS_DIR, exist_ok=True)
-                        with open(temp_file, 'w') as f:
-                            json.dump(cred_data, f)
-                        all_files.append(temp_file)
-                        log.info(f"Loaded credential from environment variable: {env_var_name}")
-                        env_creds_loaded = True
-                    else:
-                        log.warning(f"Invalid credential format in {env_var_name}")
-                except json.JSONDecodeError as e:
-                    log.warning(f"Failed to parse JSON from {env_var_name}: {e}")
-                except Exception as e:
-                    log.warning(f"Error loading credential from {env_var_name}: {e}")
+        # Discover from directory
+        credentials_dir = CREDENTIALS_DIR
+        patterns = [os.path.join(credentials_dir, "*.json")]
 
-        # If no env credentials, discover from directory
-        if not env_creds_loaded:
-            credentials_dir = CREDENTIALS_DIR
-            patterns = [os.path.join(credentials_dir, "*.json")]
-            
-            for pattern in patterns:
-                discovered_files = glob.glob(pattern)
-                # Skip env_credential files if loading from directory
-                for file in discovered_files:
-                    if not os.path.basename(file).startswith("env_credential_"):
-                        all_files.append(file)
+        for pattern in patterns:
+            discovered_files = glob.glob(pattern)
+            for file in discovered_files:
+                all_files.append(file)
 
         all_files = sorted(list(set(all_files)))
 
@@ -547,32 +502,6 @@ async def _discover_credential_files_unlocked(self):
             from config import CREDENTIALS_DIR
             import glob
 
-            # 检查环境变量凭证（与 _discover_credential_files 保持一致）
-            for i in range(1, 11):
-                env_var_name = f"GOOGLE_CREDENTIALS_{i}" if i > 1 else "GOOGLE_CREDENTIALS"
-                env_creds = os.getenv(env_var_name)
-                
-                if env_creds:
-                    try:
-                        # 检查是否为base64编码
-                        try:
-                            import base64
-                            decoded = base64.b64decode(env_creds)
-                            env_creds = decoded.decode('utf-8')
-                        except:
-                            pass
-                        
-                        # 验证JSON格式
-                        import json
-                        json.loads(env_creds)
-                        
-                        # 创建临时文件路径标识
-                        temp_env_path = f"<ENV_{env_var_name}>"
-                        if not self.is_cred_disabled(temp_env_path):
-                            temp_files.append(temp_env_path)
-                        
-                    except (json.JSONDecodeError, UnicodeDecodeError) as e:
-                        log.error(f"Invalid JSON in {env_var_name}: {e}")
 
             # 检查文件系统中的凭证
             if os.path.exists(CREDENTIALS_DIR):