修改配置文件

胡龙江
1 parent 0bb2965a
Showing 5 changed files with 129 additions and 64 deletions
.env
Dockerfile
config.php
docker-compose.yml
start.php
--- a/.env
View file @5a91274
+++ b/.env
View file @5a91274
+# MySQL 数据库配置
 DB_HOST=140.210.199.111
 DB_PORT=3306
 DB_USER=root
 DB_PASSWORD=Qnbar123!
 DB_NAME=ai
+# Redis 配置
 REDIS_HOST=10.10.1.232
 REDIS_PORT=6379
 REDIS_PASSWORD=qnbarcom
 REDIS_PREFIX=ai_
+
+# TOS (火山引擎对象存储) 配置
+# TOS_AK=your_access_key
+# TOS_SK=your_secret_key
+# TOS_ENDPOINT=tos-cn-shanghai.volces.com
+# TOS_REGION=cn-shanghai
+# TOS_BUCKET=ocxun
+
+# 服务器配置
+# WS_HOST=0.0.0.0
+# WS_PORT=8888
+# HTTP_HOST=0.0.0.0
+# HTTP_PORT=8889
+# WORKER_COUNT=1
+
+# 心跳配置
+# HEARTBEAT_INTERVAL=30
+# HEARTBEAT_CHECK_INTERVAL=10
--- a/Dockerfile
View file @5a91274
+++ b/Dockerfile
View file @5a91274
@@ -45,5 +45,4 @@ RUN composer dump-autoload --optimize
 EXPOSE 8888
 # Command to run the Workerman server
-CMD ["php", "start.php", "start"]
-
+CMD ["php", "start.php", "start"]
--- a/config.php 0 → 100644
View file @5a91274
+++ b/config.php 0 → 100644
View file @5a91274
+<?php
+/**
+ * 配置文件
+ * 优先级: 环境变量 > 配置文件默认值
+ */
+
+return [
+    // Redis 配置
+    'redis' => [
+        'host' => getenv('REDIS_HOST') ?: '127.0.0.1',
+        'port' => (int) (getenv('REDIS_PORT') ?: 6379),
+        'password' => getenv('REDIS_PASSWORD') ?: null,
+        'prefix' => getenv('REDIS_PREFIX') ?: 'ai_',
+    ],
+
+    // 数据库配置
+    'database' => [
+        'host' => getenv('DB_HOST') ?: '127.0.0.1',
+        'port' => (int) (getenv('DB_PORT') ?: 3306),
+        'username' => getenv('DB_USER') ?: 'root',
+        'password' => getenv('DB_PASSWORD') ?: '',
+        'database' => getenv('DB_NAME') ?: 'ai',
+    ],
+
+    // TOS (火山引擎对象存储) 配置
+    'tos' => [
+        'ak' => getenv('TOS_AK') ?: 'AKLTZjkyMzliYjQ5N2IyNDFjNDliMTBiY2E2ZmU5ODhjNTM',
+        'sk' => getenv('TOS_SK') ?: 'WldKbE5XUmpPRGxqWmpZM05EUTBObUpqTTJSa01qVTNNMkprWmpsbU9Uaw==',
+        'endpoint' => getenv('TOS_ENDPOINT') ?: 'tos-cn-shanghai.volces.com',
+        'region' => getenv('TOS_REGION') ?: 'cn-shanghai',
+        'bucket' => getenv('TOS_BUCKET') ?: 'ocxun',
+    ],
+
+    // 服务器配置
+    'server' => [
+        'websocket_host' => getenv('WS_HOST') ?: '0.0.0.0',
+        'websocket_port' => (int) (getenv('WS_PORT') ?: 8888),
+        'http_host' => getenv('HTTP_HOST') ?: '0.0.0.0',
+        'http_port' => (int) (getenv('HTTP_PORT') ?: 8889),
+        'worker_count' => (int) (getenv('WORKER_COUNT') ?: 1),
+    ],
+
+    // 文件上传配置
+    'upload' => [
+        'max_size' => 50 * 1024 * 1024, // 50MB
+        'allowed_extensions' => ['jpg', 'jpeg', 'png', 'gif', 'webp', 'mp4', 'pdf', 'xls', 'xlsx'],
+        'default_user' => 'guest', // TODO: 等待后续对接用户手机号功能
+    ],
+
+    // 心跳配置
+    'heartbeat' => [
+        'interval' => (int) (getenv('HEARTBEAT_INTERVAL') ?: 30),
+        'check_interval' => (int) (getenv('HEARTBEAT_CHECK_INTERVAL') ?: 10),
+    ],
+];
--- a/docker-compose.yml
View file @5a91274
+++ b/docker-compose.yml
View file @5a91274
@@ -8,14 +8,5 @@ services:
       - "8889:8889"
     env_file:
       - .env
-    environment:
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
     volumes:
       - ./:/app
-
-  redis:
-    image: redis:alpine
-    container_name: moltbot-redis
-    ports:
-      - "16379:6379"
--- a/start.php
View file @5a91274
+++ b/start.php
View file @5a91274
@@ -8,38 +8,40 @@ use Tos\Model\PutObjectInput;
 require_once __DIR__ . '/vendor/autoload.php';
+// 加载配置文件
+$config = require __DIR__ . '/config.php';
+
 // Define Heartbeat Interval
-define('HEARTBEAT_TIME', 30);
+define('HEARTBEAT_TIME', $config['heartbeat']['interval']);
 // Create a WebSocket worker
-$ws_worker = new Worker("websocket://0.0.0.0:8888");
+$ws_host = $config['server']['websocket_host'];
+$ws_port = $config['server']['websocket_port'];
+$ws_worker = new Worker("websocket://{$ws_host}:{$ws_port}");
 // Emulate simple routing/state for now
 // In production, use Redis for distributed state
-$ws_worker->count = 1; // Single process for dev simplicity
+$ws_worker->count = $config['server']['worker_count'];
 // Redis Connection
 $redis = null;
 try {
-    $redis_host = getenv('REDIS_HOST') ?: '127.0.0.1';
-    $redis_port = getenv('REDIS_PORT') ?: 6379;
-    $redis_auth = getenv('REDIS_PASSWORD');
-    $redis_prefix = getenv('REDIS_PREFIX') ?: 'ai_';
+    $redis_config = $config['redis'];
     $params = [
         'scheme' => 'tcp',
-        'host' => $redis_host,
-        'port' => $redis_port,
+        'host' => $redis_config['host'],
+        'port' => $redis_config['port'],
     ];
-    if ($redis_auth) {
-        $params['password'] = $redis_auth;
+    if (!empty($redis_config['password'])) {
+        $params['password'] = $redis_config['password'];
     }
     // Predis Client
-    $redis = new Predis\Client($params, ['prefix' => $redis_prefix]);
+    $redis = new Predis\Client($params, ['prefix' => $redis_config['prefix']]);
     $redis->connect();
-    echo "✅ Connected to Redis at $redis_host ($redis_prefix)\n";
+    echo "✅ Connected to Redis at {$redis_config['host']}:{$redis_config['port']} ({$redis_config['prefix']})\n";
 } catch (Exception $e) {
     echo "⚠️ Redis Connection Failed: " . $e->getMessage() . "\n";
 }
@@ -48,11 +50,14 @@ try {
 $clients = []; // ClientID -> Connection
 $devices = []; // DeviceID -> Connection
-$ws_worker->onWorkerStart = function ($worker) {
-    echo "Relay Server Started on 0.0.0.0:8888\n";
+$ws_worker->onWorkerStart = function ($worker) use ($config) {
+    $ws_host = $config['server']['websocket_host'];
+    $ws_port = $config['server']['websocket_port'];
+    echo "Relay Server Started on {$ws_host}:{$ws_port}\n";
     // Heartbeat check
-    Timer::add(10, function () use ($worker) {
+    $check_interval = $config['heartbeat']['check_interval'];
+    Timer::add($check_interval, function () use ($worker) {
         $time_now = time();
         foreach ($worker->connections as $connection) {
             // Check if connection is alive possibly? 
@@ -153,9 +158,11 @@ $ws_worker->onClose = function ($connection) use (&$clients, &$devices) {
 // ---------------------------------------------------------
 // [New] HTTP Server for file uploads and static serving
 // ---------------------------------------------------------
-$http_worker = new Worker("http://0.0.0.0:8889");
-$http_worker->count = 1; // Single process for uploads
-$http_worker->onMessage = function ($connection, $request) {
+$http_host = $config['server']['http_host'];
+$http_port = $config['server']['http_port'];
+$http_worker = new Worker("http://{$http_host}:{$http_port}");
+$http_worker->count = $config['server']['worker_count'];
+$http_worker->onMessage = function ($connection, $request) use ($config) {
     // 1. Static File Serving (Simple implementation)
     $path = $request->path();
     if (strpos($path, '/uploads/') === 0) {
@@ -181,41 +188,38 @@ $http_worker->onMessage = function ($connection, $request) {
         $file = $files['file'];
-        // Validate Size (50MB)
-        if ($file['size'] > 50 * 1024 * 1024) {
-            $connection->send(new \Workerman\Protocols\Http\Response(400, [], json_encode(['ok' => false, 'error' => 'File too large (Max 50MB)'])));
+        // Validate Size
+        $max_size = $config['upload']['max_size'];
+        if ($file['size'] > $max_size) {
+            $max_mb = round($max_size / 1024 / 1024);
+            $connection->send(new \Workerman\Protocols\Http\Response(400, [], json_encode(['ok' => false, 'error' => "File too large (Max {$max_mb}MB)"])));
             return;
         }
         // Validate Extension
         $ext = strtolower(pathinfo($file['name'], PATHINFO_EXTENSION));
-        // Supported: PDF, Excel, Image, Video
-        $allowed = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'mp4', 'pdf', 'xls', 'xlsx'];
+        $allowed = $config['upload']['allowed_extensions'];
         if (!in_array($ext, $allowed)) {
             $connection->send(new \Workerman\Protocols\Http\Response(400, [], json_encode(['ok' => false, 'error' => 'File type not allowed'])));
             return;
         }
-        // TOS Configuration (Keys from hsobs.php)
-        $ak = 'AKLTZjkyMzliYjQ5N2IyNDFjNDliMTBiY2E2ZmU5ODhjNTM';
-        $sk = 'WldKbE5XUmpPRGxqWmpZM05EUTBObUpqTTJSa01qVTNNMkprWmpsbU9Uaw==';
-        $endpoint = 'tos-cn-shanghai.volces.com';
-        $region = 'cn-shanghai';
-        $bucket = 'ocxun';
+        // TOS Configuration
+        $tos_config = $config['tos'];
         try {
             $client = new TosClient([
-                'region' => $region,
-                'endpoint' => $endpoint,
-                'ak' => $ak,
-                'sk' => $sk,
+                'region' => $tos_config['region'],
+                'endpoint' => $tos_config['endpoint'],
+                'ak' => $tos_config['ak'],
+                'sk' => $tos_config['sk'],
             ]);
             // Generate Key
             $uuid = bin2hex(random_bytes(8));
-            // TODO: 暂时使用 'guest'，等待后续对接用户手机号功能
-            $userPhone = 'guest';
+            $userPhone = $config['upload']['default_user'];
             $objectKey = "clawdbot/{$userPhone}/{$uuid}.{$ext}";
+            $bucket = $tos_config['bucket'];
             // Read file content
             $contentFn = fopen($file['tmp_name'], 'r');
@@ -231,7 +235,7 @@ $http_worker->onMessage = function ($connection, $request) {
             }
             // Generate URL
-            $url = "https://{$bucket}.{$endpoint}/{$objectKey}";
+            $url = "https://{$bucket}.{$tos_config['endpoint']}/{$objectKey}";
             $connection->send(json_encode([
                 'ok' => true,
@@ -250,44 +254,40 @@ $http_worker->onMessage = function ($connection, $request) {
         $filename = $query['filename'] ?? 'file_' . time();
         $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-        // Validation - Keep it simple for demo
-        $allowed = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'mp4', 'pdf', 'xls', 'xlsx'];
+        // Validation
+        $allowed = $config['upload']['allowed_extensions'];
         if (!in_array($ext, $allowed) && $ext !== '') {
             // If no extension providing, we might just allow it or fail. 
             // Ideally client should provide full filename with extension.
         }
-        // TOS Configuration (Keys from hsobs.php)
-        $ak = 'AKLTZjkyMzliYjQ5N2IyNDFjNDliMTBiY2E2ZmU5ODhjNTM';
-        $sk = 'WldKbE5XUmpPRGxqWmpZM05EUTBObUpqTTJSa01qVTNNMkprWmpsbU9Uaw==';
-        $endpoint = 'tos-cn-shanghai.volces.com';
-        $region = 'cn-shanghai';
-        $bucket = 'ocxun';
+        // TOS Configuration
+        $tos_config = $config['tos'];
         try {
             $client = new TosClient([
-                'region' => $region,
-                'endpoint' => $endpoint,
-                'ak' => $ak,
-                'sk' => $sk,
+                'region' => $tos_config['region'],
+                'endpoint' => $tos_config['endpoint'],
+                'ak' => $tos_config['ak'],
+                'sk' => $tos_config['sk'],
             ]);
             $uuid = bin2hex(random_bytes(8));
-            // TODO: User ID from token
-            $userPhone = 'guest';
+            $userPhone = $config['upload']['default_user'];
             // Ensure filename is safe
             $safeName = preg_replace('/[^a-zA-Z0-9._-]/', '', $filename);
             if (!$safeName)
                 $safeName = 'unnamed';
             $objectKey = "clawdbot/{$userPhone}/direct_{$uuid}_{$safeName}";
+            $bucket = $tos_config['bucket'];
             // Generate Pre-Signed PUT URL (Valid for 15 mins)
             // Note: The SDK method name might vary slightly based on version, 
             // but `preSignedURL` is standard for TOS PHP SDK v2.
             $input = new \Tos\Model\PreSignedURLInput(
                 'PUT',
-                $bucket,
+                $tos_config['bucket'],
                 $objectKey,
                 300 // 5 minutes validity
             );
@@ -300,7 +300,7 @@ $http_worker->onMessage = function ($connection, $request) {
             // Public Access URL (Assuming bucket is public-read or we use signed Get URL)
             // For this project, we used public-read ACL in previous code, so we assume public access.
-            $publicUrl = "https://{$bucket}.{$endpoint}/{$objectKey}";
+            $publicUrl = "https://{$tos_config['bucket']}.{$tos_config['endpoint']}/{$objectKey}";
             $connection->send(json_encode([
                 'ok' => true,