feat: plugin controller config system with guest_comm_config hook integration

- Add HasPluginConfig trait and PluginController base class
- Integrate guest_comm_config hook in CommController for plugin frontend config injection
- Add user creation functionality to UserService and fix null value handling
- Enhance AbstractPlugin.getConfig() with key parameter support
- Multiple service layer optimizations and architecture improvements

app/Http/Controllers/PluginController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Traits\HasPluginConfig;
+
+/**
+ * 插件控制器基类
+ * 
+ * 为所有插件控制器提供通用功能
+ */
+abstract class PluginController extends Controller
+{
+  use HasPluginConfig;
+
+  /**
+   * 执行插件操作前的检查
+   */
+  protected function beforePluginAction(): ?array
+  {
+    return null;
+  }
+}

app/Http/Controllers/V1/Guest/CommController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\V1\Guest;
 
 use App\Http\Controllers\Controller;
+use App\Services\Plugin\HookManager;
 use App\Utils\Dict;
 use App\Utils\Helper;
 use Illuminate\Support\Facades\Http;
@@ -30,6 +31,9 @@ class CommController extends Controller
             // 保持向后兼容
             'is_recaptcha' => (int) admin_setting('captcha_enable', 0) ? 1 : 0,
         ];
+
+        $data = HookManager::filter('guest_comm_config', $data);
+
         return $this->success($data);
     }
 }

app/Http/Controllers/V2/Admin/UserController.php

@@ -10,6 +10,7 @@ use App\Jobs\SendEmailJob;
 use App\Models\Plan;
 use App\Models\User;
 use App\Services\AuthService;
+use App\Services\UserService;
 use App\Traits\QueryOperators;
 use App\Utils\Helper;
 use Illuminate\Database\Eloquent\Builder;
@@ -342,30 +343,26 @@ class UserController extends Controller
     public function generate(UserGenerate $request)
     {
         if ($request->input('email_prefix')) {
-            if ($request->input('plan_id')) {
-                $plan = Plan::find($request->input('plan_id'));
-                if (!$plan) {
-                    return $this->fail([400202, '订阅计划不存在']);
-                }
-            }
-            $user = [
-                'email' => $request->input('email_prefix') . '@' . $request->input('email_suffix'),
-                'plan_id' => isset($plan->id) ? $plan->id : NULL,
-                'group_id' => isset($plan->group_id) ? $plan->group_id : NULL,
-                'transfer_enable' => isset($plan->transfer_enable) ? $plan->transfer_enable * 1073741824 : 0,
-                'expired_at' => $request->input('expired_at') ?? NULL,
-                'uuid' => Helper::guid(true),
-                'token' => Helper::guid()
-            ];
-            if (User::where('email', $user['email'])->first()) {
+            $email = $request->input('email_prefix') . '@' . $request->input('email_suffix');
+
+            if (User::where('email', $email)->exists()) {
                 return $this->fail([400201, '邮箱已存在于系统中']);
             }
-            $user['password'] = password_hash($request->input('password') ?? $user['email'], PASSWORD_DEFAULT);
-            if (!User::create($user)) {
+
+            $userService = app(UserService::class);
+            $user = $userService->createUser([
+                'email' => $email,
+                'password' => $request->input('password') ?? $email,
+                'plan_id' => $request->input('plan_id'),
+                'expired_at' => $request->input('expired_at'),
+            ]);
+
+            if (!$user->save()) {
                 return $this->fail([500, '生成失败']);
             }
             return $this->success(true);
         }
+
         if ($request->input('generate_count')) {
             return $this->multiGenerate($request);
         }
@@ -373,37 +370,32 @@ class UserController extends Controller
 
     private function multiGenerate(Request $request)
     {
-        if ($request->input('plan_id')) {
-            $plan = Plan::find($request->input('plan_id'));
-            if (!$plan) {
-                return $this->fail([400202, '订阅计划不存在']);
-            }
-        }
-        $users = [];
+        $userService = app(UserService::class);
+        $usersData = [];
+
         for ($i = 0; $i < $request->input('generate_count'); $i++) {
-            $user = [
-                'email' => Helper::randomChar(6) . '@' . $request->input('email_suffix'),
-                'plan_id' => isset($plan->id) ? $plan->id : NULL,
-                'group_id' => isset($plan->group_id) ? $plan->group_id : NULL,
-                'transfer_enable' => isset($plan->transfer_enable) ? $plan->transfer_enable * 1073741824 : 0,
-                'expired_at' => $request->input('expired_at') ?? NULL,
-                'uuid' => Helper::guid(true),
-                'token' => Helper::guid(),
-                'created_at' => time(),
-                'updated_at' => time()
+            $email = Helper::randomChar(6) . '@' . $request->input('email_suffix');
+            $usersData[] = [
+                'email' => $email,
+                'password' => $request->input('password') ?? $email,
+                'plan_id' => $request->input('plan_id'),
+                'expired_at' => $request->input('expired_at'),
             ];
-            $user['password'] = password_hash($request->input('password') ?? $user['email'], PASSWORD_DEFAULT);
-            array_push($users, $user);
         }
+
+
+
         try {
             DB::beginTransaction();
-            if (!User::insert($users)) {
-                throw new \Exception();
+            $users = [];
+            foreach ($usersData as $userData) {
+                $user = $userService->createUser($userData);
+                $user->save();
+                $users[] = $user;
             }
             DB::commit();
         } catch (\Exception $e) {
             DB::rollBack();
-            Log::error($e);
             return $this->fail([500, '生成失败']);
         }
 
@@ -417,6 +409,7 @@ class UserController extends Controller
                 $handle = fopen('php://output', 'w');
                 fputcsv($handle, ['账号', '密码', '过期时间', 'UUID', '创建时间', '订阅地址']);
                 foreach ($users as $user) {
+                    $user = $user->refresh();
                     $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
                     $createDate = date('Y-m-d H:i:s', $user['created_at']);
                     $password = $request->input('password') ?? $user['email'];

app/Services/Auth/RegisterService.php

@@ -6,6 +6,7 @@ use App\Models\InviteCode;
 use App\Models\Plan;
 use App\Models\User;
 use App\Services\CaptchaService;
+use App\Services\UserService;
 use App\Utils\CacheKey;
 use App\Utils\Dict;
 use App\Utils\Helper;
@@ -100,16 +101,11 @@ class RegisterService
     /**
      * 处理邀请码
      *
-     * @param User $user 用户对象
-     * @param string|null $inviteCode 邀请码
-     * @return array [是否成功, 错误消息]
+     * @param string $inviteCode 邀请码
+     * @return array [邀请人ID或成功状态, 错误消息]
      */
-    public function handleInviteCode(User $user, ?string $inviteCode): array
+    public function handleInviteCode(string $inviteCode): array
     {
-        if (!$inviteCode) {
-            return [true, null];
-        }
-
         $inviteCodeModel = InviteCode::where('code', $inviteCode)
             ->where('status', 0)
             ->first();
@@ -118,38 +114,18 @@ class RegisterService
             if ((int) admin_setting('invite_force', 0)) {
                 return [false, [400, __('Invalid invitation code')]];
             }
-            return [true, null];
+            return [null, null];
         }
 
-        $user->invite_user_id = $inviteCodeModel->user_id ? $inviteCodeModel->user_id : null;
-
         if (!(int) admin_setting('invite_never_expire', 0)) {
             $inviteCodeModel->status = true;
             $inviteCodeModel->save();
         }
 
-        return [true, null];
+        return [$inviteCodeModel->user_id, null];
     }
 
-    /**
-     * 处理试用计划
-     *
-     * @param User $user 用户对象
-     * @return void
-     */
-    public function handleTryOut(User $user): void
-    {
-        if ((int) admin_setting('try_out_plan_id', 0)) {
-            $plan = Plan::find(admin_setting('try_out_plan_id'));
-            if ($plan) {
-                $user->transfer_enable = $plan->transfer_enable * 1073741824;
-                $user->plan_id = $plan->id;
-                $user->group_id = $plan->group_id;
-                $user->expired_at = time() + (admin_setting('try_out_hour', 1) * 3600);
-                $user->speed_limit = $plan->speed_limit;
-            }
-        }
-    }
+
 
     /**
      * 注册用户
@@ -167,24 +143,25 @@ class RegisterService
 
         $email = $request->input('email');
         $password = $request->input('password');
+        $inviteCode = $request->input('invite_code');
 
-        // 创建用户
-        $user = new User();
-        $user->email = $email;
-        $user->password = password_hash($password, PASSWORD_DEFAULT);
-        $user->uuid = Helper::guid(true);
-        $user->token = Helper::guid();
-        $user->remind_expire = admin_setting('default_remind_expire', 1);
-        $user->remind_traffic = admin_setting('default_remind_traffic', 1);
-
-        // 处理邀请码
-        [$inviteSuccess, $inviteError] = $this->handleInviteCode($user, $request->input('invite_code'));
-        if (!$inviteSuccess) {
-            return [false, $inviteError];
+        // 处理邀请码获取邀请人ID
+        $inviteUserId = null;
+        if ($inviteCode) {
+            [$inviteSuccess, $inviteError] = $this->handleInviteCode($inviteCode);
+            if (!$inviteSuccess) {
+                return [false, $inviteError];
+            }
+            $inviteUserId = $inviteSuccess;
         }
 
-        // 处理试用计划
-        $this->handleTryOut($user);
+        // 创建用户
+        $userService = app(UserService::class);
+        $user = $userService->createUser([
+            'email' => $email,
+            'password' => $password,
+            'invite_user_id' => $inviteUserId,
+        ]);
 
         // 保存用户
         if (!$user->save()) {

app/Services/CaptchaService.php

@@ -80,7 +80,7 @@ class CaptchaService
         // 检查分数阈值（如果有的话）
         $score = $recaptchaResp->getScore();
         $threshold = admin_setting('recaptcha_v3_score_threshold', 0.5);
-        if ($score !== null && $score < $threshold) {
+        if ($score < $threshold) {
             return [false, [400, __('Invalid code is incorrect')]];
         }
 

app/Services/MailService.php

@@ -30,7 +30,7 @@ class MailService
     /**
      * 分块处理用户提醒邮件
      */
-    public function processUsersInChunks(int $chunkSize, callable $progressCallback = null): array
+    public function processUsersInChunks(int $chunkSize, ?callable $progressCallback = null): array
     {
         $statistics = [
             'processed_users' => 0,

app/Services/Plugin/AbstractPlugin.php

@@ -58,9 +58,13 @@ abstract class AbstractPlugin
     /**
      * 获取配置
      */
-    public function getConfig(): array
+    public function getConfig(?string $key = null, $default = null): mixed
     {
-        return $this->config;
+        $config = $this->config;
+        if ($key) {
+            $config = $config[$key] ?? $default;
+        }
+        return $config;
     }
 
     /**

app/Services/Plugin/PluginManager.php

@@ -34,7 +34,7 @@ class PluginManager
      */
     public function getPluginPath(string $pluginCode): string
     {
-        return $this->pluginPath . '/' .  Str::studly($pluginCode);
+        return $this->pluginPath . '/' . Str::studly($pluginCode);
     }
 
     /**
@@ -85,16 +85,21 @@ class PluginManager
     {
         $routesPath = $this->getPluginPath($pluginCode) . '/routes';
         if (File::exists($routesPath)) {
-            $files = ['web.php', 'api.php'];
-            foreach ($files as $file) {
-                $routeFile = $routesPath . '/' . $file;
-                if (File::exists($routeFile)) {
-                    Route::middleware('web')
-                        ->namespace($this->getPluginNamespace($pluginCode) . '\\Controllers')
-                        ->group(function () use ($routeFile) {
-                            require $routeFile;
-                        });
-                }
+            $webRouteFile = $routesPath . '/web.php';
+            $apiRouteFile = $routesPath . '/api.php';
+            if (File::exists($webRouteFile)) {
+                Route::middleware('web')
+                    ->namespace($this->getPluginNamespace($pluginCode) . '\\Controllers')
+                    ->group(function () use ($webRouteFile) {
+                        require $webRouteFile;
+                    });
+            }
+            if (File::exists($apiRouteFile)) {
+                Route::middleware('api')
+                    ->namespace($this->getPluginNamespace($pluginCode) . '\\Controllers')
+                    ->group(function () use ($apiRouteFile) {
+                        require $apiRouteFile;
+                    });
             }
         }
     }

app/Services/TrafficResetService.php

@@ -274,7 +274,7 @@ class TrafficResetService
   /**
    * Batch check and reset users. Processes all eligible users in batches.
    */
-  public function batchCheckReset(int $batchSize = 100, callable $progressCallback = null): array
+  public function batchCheckReset(int $batchSize = 100, ?callable $progressCallback = null): array
   {
     $startTime = microtime(true);
     $totalResetCount = 0;

app/Services/UserService.php

@@ -11,6 +11,8 @@ use App\Models\User;
 use App\Services\Plugin\HookManager;
 use App\Services\TrafficResetService;
 use App\Models\TrafficResetLog;
+use App\Utils\Helper;
+use Illuminate\Support\Facades\Hash;
 
 class UserService
 {
@@ -23,22 +25,22 @@ class UserService
         // Use TrafficResetService to calculate the next reset time
         $trafficResetService = app(TrafficResetService::class);
         $nextResetTime = $trafficResetService->calculateNextResetTime($user);
-        
+
         if (!$nextResetTime) {
             return null;
         }
-        
+
         // Calculate the remaining days from now to the next reset time
         $now = time();
         $resetTimestamp = $nextResetTime->timestamp;
-        
+
         if ($resetTimestamp <= $now) {
             return 0; // Reset time has passed or is now
         }
-        
+
         // Calculate the difference in days (rounded up)
         $daysDifference = ceil(($resetTimestamp - $now) / 86400);
-        
+
         return (int) $daysDifference;
     }
 
@@ -115,7 +117,7 @@ class UserService
     {
         list($server, $protocol, $data) = HookManager::filter('traffic.before_process', [
             $server,
-            $protocol, 
+            $protocol,
             $data
         ]);
 
@@ -134,10 +136,10 @@ class UserService
     {
         // 检查是否需要重置流量
         app(TrafficResetService::class)->checkAndReset($user, TrafficResetLog::SOURCE_USER_ACCESS);
-        
+
         // 重新获取用户数据（可能已被重置）
         $user->refresh();
-        
+
         return [
             'upload' => $user->u ?? 0,
             'download' => $user->d ?? 0,
@@ -150,4 +152,97 @@ class UserService
             'reset_count' => $user->reset_count,
         ];
     }
+
+    /**
+     * 创建用户
+     */
+    public function createUser(array $data): User
+    {
+        $user = new User();
+
+        // 基本信息
+        $user->email = $data['email'];
+        $user->password = isset($data['password'])
+            ? Hash::make($data['password'])
+            : Hash::make($data['email']);
+        $user->uuid = Helper::guid(true);
+        $user->token = Helper::guid();
+
+        // 默认设置
+        $user->remind_expire = admin_setting('default_remind_expire', 1);
+        $user->remind_traffic = admin_setting('default_remind_traffic', 1);
+
+        // 可选字段
+        $this->setOptionalFields($user, $data);
+
+        $user->expired_at = null;
+
+        // 处理计划
+        if (isset($data['plan_id'])) {
+            $this->setPlanForUser($user, $data['plan_id'], $data['expired_at'] ?? null);
+        } else {
+            $this->setTryOutPlan(user: $user);
+        }
+
+        return $user;
+    }
+
+    /**
+     * 设置可选字段
+     */
+    private function setOptionalFields(User $user, array $data): void
+    {
+        $optionalFields = [
+            'invite_user_id',
+            'telegram_id',
+            'group_id',
+            'speed_limit',
+            'expired_at',
+            'transfer_enable'
+        ];
+
+        foreach ($optionalFields as $field) {
+            if (array_key_exists($field, $data)) {
+                $user->{$field} = $data[$field];
+            }
+        }
+    }
+
+    /**
+     * 为用户设置计划
+     */
+    private function setPlanForUser(User $user, int $planId, ?int $expiredAt = null): void
+    {
+        $plan = Plan::find($planId);
+        if (!$plan)
+            return;
+
+        $user->plan_id = $plan->id;
+        $user->group_id = $plan->group_id;
+        $user->transfer_enable = $plan->transfer_enable * 1073741824;
+        $user->speed_limit = $plan->speed_limit;
+
+        if ($expiredAt) {
+            $user->expired_at = $expiredAt;
+        }
+    }
+
+    /**
+     * 设置试用计划
+     */
+    private function setTryOutPlan(User $user): void
+    {
+        if (!(int) admin_setting('try_out_plan_id', 0))
+            return;
+
+        $plan = Plan::find(admin_setting('try_out_plan_id'));
+        if (!$plan)
+            return;
+
+        $user->transfer_enable = $plan->transfer_enable * 1073741824;
+        $user->plan_id = $plan->id;
+        $user->group_id = $plan->group_id;
+        $user->expired_at = time() + (admin_setting('try_out_hour', 1) * 3600);
+        $user->speed_limit = $plan->speed_limit;
+    }
 }

app/Support/Setting.php

@@ -72,7 +72,7 @@ class Setting
      * @param  mixed  $value
      * @return bool 设置是否成功
      */
-    public function set(string $key, $value = null): bool
+    public function set(string $key, mixed $value = null): bool
     {
         $key = strtolower($key);
         SettingModel::createOrUpdate($key, $value);

app/Traits/HasPluginConfig.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Traits;
+
+use App\Models\Plugin;
+use Illuminate\Support\Facades\Cache;
+
+trait HasPluginConfig
+{
+    /**
+     * 缓存的插件配置
+     */
+    protected ?array $pluginConfig = null;
+
+    /**
+     * 插件代码
+     */
+    protected ?string $pluginCode = null;
+
+    /**
+     * 获取插件配置
+     */
+    public function getConfig(?string $key = null, $default = null): mixed
+    {
+        $config = $this->getPluginConfig();
+        
+        if ($key) {
+            return $config[$key] ?? $default;
+        }
+        
+        return $config;
+    }
+
+    /**
+     * 获取完整的插件配置
+     */
+    protected function getPluginConfig(): array
+    {
+        if ($this->pluginConfig === null) {
+            $pluginCode = $this->getPluginCode();
+
+            \Log::channel('daily')->info('Telegram Login: 获取插件配置', [
+                'plugin_code' => $pluginCode
+            ]);
+
+            $this->pluginConfig = Cache::remember(
+                "plugin_config_{$pluginCode}",
+                3600,
+                function () use ($pluginCode) {
+                    $plugin = Plugin::where('code', $pluginCode)
+                        ->where('is_enabled', true)
+                        ->first();
+
+                    if (!$plugin || !$plugin->config) {
+                        return [];
+                    }
+
+                    return json_decode($plugin->config, true) ?? [];
+                }
+            );
+        }
+
+        return $this->pluginConfig;
+    }
+
+    /**
+     * 获取插件代码
+     */
+    public function getPluginCode(): string
+    {
+        if ($this->pluginCode === null) {
+            $this->pluginCode = $this->autoDetectPluginCode();
+        }
+
+        return $this->pluginCode;
+    }
+
+    /**
+     * 设置插件代码（如果自动检测不准确可以手动设置）
+     */
+    public function setPluginCode(string $pluginCode): void
+    {
+        $this->pluginCode = $pluginCode;
+        $this->pluginConfig = null; // 重置配置缓存
+    }
+
+    /**
+     * 自动检测插件代码
+     */
+    protected function autoDetectPluginCode(): string
+    {
+        $reflection = new \ReflectionClass($this);
+        $namespace = $reflection->getNamespaceName();
+        
+        // 从命名空间提取插件代码
+        // 例如: Plugin\TelegramLogin\Controllers => telegram_login
+        if (preg_match('/^Plugin\\\\(.+?)\\\\/', $namespace, $matches)) {
+            return $this->convertToKebabCase($matches[1]);
+        }
+        
+        throw new \RuntimeException('Unable to detect plugin code from namespace: ' . $namespace);
+    }
+
+    /**
+     * 将 StudlyCase 转换为 kebab-case
+     */
+    protected function convertToKebabCase(string $string): string
+    {
+        return strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $string));
+    }
+
+    /**
+     * 检查插件是否启用
+     */
+    public function isPluginEnabled(): bool
+    {
+        return (bool) $this->getConfig('enable', false);
+    }
+
+    /**
+     * 清除插件配置缓存
+     */
+    public function clearConfigCache(): void
+    {
+        $pluginCode = $this->getPluginCode();
+        Cache::forget("plugin_config_{$pluginCode}");
+        $this->pluginConfig = null;
+    }
+} 

app/Utils/CacheKey.php

@@ -31,7 +31,7 @@ class CacheKey
     /**
      * 生成缓存键
      */
-    public static function get(string $key, $uniqueValue = null): string
+    public static function get(string $key, mixed $uniqueValue = null): string
     {
         // 检查是否为核心键
         if (array_key_exists($key, self::CORE_KEYS)) {