From bf3930d29f1914fe531e030914c35ef408471aa4 Mon Sep 17 00:00:00 2001
From: xboard <xboard@xboard.one>
Date: Sun, 3 Dec 2023 09:43:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtg=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E6=97=A0=E6=B3=95=E5=9B=9E=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/XboardInstall.php               | 2 +-
 app/Http/Controllers/V1/Guest/TelegramController.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/XboardInstall.php b/app/Console/Commands/XboardInstall.php
index e7852bf..6b9b966 100644
--- a/app/Console/Commands/XboardInstall.php
+++ b/app/Console/Commands/XboardInstall.php
@@ -59,7 +59,6 @@ class XboardInstall extends Command
                 \Artisan::call('config:cache');
                 return ;
             }
-            $envConfig['APP_KEY'] = 'base64:' . base64_encode(Encrypter::generateKey('AES-256-CBC'));
             // 选择是否使用Sqlite
             if( $this->ask('是否启用Sqlite(无需额外安装)代替Mysql(默认不启用 y/n)','n') == 'y' ) {
                 $sqliteFile = '.docker/.data/database.sqlite';
@@ -88,6 +87,7 @@ class XboardInstall extends Command
                     'DB_PASSWORD' => $this->ask('请输入数据库密码'),
                 ];   
             }
+            $envConfig['APP_KEY'] = 'base64:' . base64_encode(Encrypter::generateKey('AES-256-CBC'));
             $envConfig['INSTALLED'] = 'true';
             // 判断是否为Docker环境
             if ($isDocker == 'true' && ($this->ask('是否启用Docker内置的Redis(默认启用 y/n)','y') === 'y')){
diff --git a/app/Http/Controllers/V1/Guest/TelegramController.php b/app/Http/Controllers/V1/Guest/TelegramController.php
index 576021a..0e6896d 100644
--- a/app/Http/Controllers/V1/Guest/TelegramController.php
+++ b/app/Http/Controllers/V1/Guest/TelegramController.php
@@ -23,8 +23,9 @@ class TelegramController extends Controller
 
     public function webhook(Request $request)
     {
-        $this->formatMessage($request->input());
-        $this->formatChatJoinRequest($request->input());
+        $data = json_decode(get_request_content(),true);
+        $this->formatMessage($data);
+        $this->formatChatJoinRequest($data);
         $this->handle();
     }