|
|
@@ -17,6 +17,7 @@ use App\Services\UserService;
|
|
|
use App\Services\WalletService;
|
|
|
use App\Services\WithdrawService;
|
|
|
use App\Services\BalanceLogService;
|
|
|
+use Exception;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\App;
|
|
|
use Illuminate\Support\Facades\Cache;
|
|
|
@@ -79,36 +80,17 @@ class TelegramWebHook extends BaseController
|
|
|
IssueService::init($telegram, $data, $chatId, $firstName, $messageId);
|
|
|
DB::commit();
|
|
|
} //
|
|
|
- catch (MessageException $e) {
|
|
|
- DB::rollBack();
|
|
|
- $msg = $e->getMessage();
|
|
|
- $msg = json_decode($msg, true);
|
|
|
- $telegram->sendMessage($msg);
|
|
|
- } //
|
|
|
catch (TelegramSDKException $e) {
|
|
|
DB::rollBack();
|
|
|
- $m = new Message();
|
|
|
- $m->json = $e->getMessage();
|
|
|
- $m->save();
|
|
|
- $telegram->sendMessage([
|
|
|
- 'chat_id' => $chatId,
|
|
|
- 'text' => '‼️‼️系统发生了错误,请联系客服'
|
|
|
- ]);
|
|
|
+ $telegram->sendMessage(['chat_id' => $chatId, 'text' => '‼️‼️系统发生了错误,请联系客服']);
|
|
|
}//
|
|
|
- catch (\Exception $e) {
|
|
|
+ catch (Exception $e) {
|
|
|
DB::rollBack();
|
|
|
- $m = new Message();
|
|
|
- $m->json = json_encode([
|
|
|
- 'line' => $e->getLine(),
|
|
|
- 'message' => $e->getMessage()
|
|
|
- ]);
|
|
|
- $m->save();
|
|
|
- $telegram->sendMessage([
|
|
|
- 'chat_id' => $chatId,
|
|
|
- 'text' => '‼️‼️系统发生了错误,请联系客服'
|
|
|
- ]);
|
|
|
+ $json = json_encode(['line' => $e->getLine(), 'message' => $e->getMessage()]);
|
|
|
+ Log::error('Telegram 处理消息异常: ');
|
|
|
+ Log::error($json);
|
|
|
+ $telegram->sendMessage(['chat_id' => $chatId, 'text' => '‼️‼️系统发生了错误,请联系客服']);
|
|
|
}
|
|
|
-
|
|
|
} //
|
|
|
else {
|
|
|
$update = $request->all();
|
|
|
@@ -119,10 +101,6 @@ class TelegramWebHook extends BaseController
|
|
|
$messageId = $message['message_id'];
|
|
|
DB::beginTransaction();
|
|
|
try {
|
|
|
- $m = new Message();
|
|
|
- $m->json = json_encode($update);
|
|
|
- $m->save();
|
|
|
-
|
|
|
$returnMsg = $this->processChatMessage($chatId, $messageId, $message, $message['from']);
|
|
|
if ($returnMsg) {
|
|
|
if (isset($returnMsg['image']) && $returnMsg['image'] != '') {
|
|
|
@@ -132,52 +110,30 @@ class TelegramWebHook extends BaseController
|
|
|
} else {
|
|
|
$this->telegram->sendMessage($returnMsg);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
DB::commit();
|
|
|
- } catch (MessageException $e) {
|
|
|
+ } catch (TelegramSDKException $e) {
|
|
|
DB::rollBack();
|
|
|
- $msg = $e->getMessage();
|
|
|
- $msg = json_decode($msg, true);
|
|
|
- $telegram->sendMessage($msg);
|
|
|
- } //
|
|
|
- catch (TelegramSDKException $e) {
|
|
|
- DB::rollBack();
|
|
|
- $m = new Message();
|
|
|
- $m->json = $e->getMessage();
|
|
|
- $m->save();
|
|
|
- $telegram->sendMessage([
|
|
|
- 'chat_id' => $chatId,
|
|
|
- 'text' => '‼️‼️系统发生了错误,请联系客服'
|
|
|
- ]);
|
|
|
+ $telegram->sendMessage(['chat_id' => $chatId, 'text' => '‼️‼️系统发生了错误,请联系客服']);
|
|
|
}//
|
|
|
- catch (\Exception $e) {
|
|
|
+ catch (Exception $e) {
|
|
|
DB::rollBack();
|
|
|
- $m = new Message();
|
|
|
- $m->json = json_encode([
|
|
|
- 'line' => $e->getLine(),
|
|
|
- 'message' => $e->getMessage()
|
|
|
- ]);
|
|
|
- $m->save();
|
|
|
- Log::error('Telegram 处理消息异常: ' . $e->getMessage());
|
|
|
- $telegram->sendMessage([
|
|
|
- 'chat_id' => $chatId,
|
|
|
- 'text' => '‼️‼️系统发生了错误,请联系客服'
|
|
|
- ]);
|
|
|
+ $json = json_encode(['line' => $e->getLine(), 'message' => $e->getMessage()]);
|
|
|
+ Log::error('Telegram 处理消息异常: ');
|
|
|
+ Log::error($json);
|
|
|
+ $telegram->sendMessage(['chat_id' => $chatId, 'text' => '‼️‼️系统发生了错误,请联系客服']);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
} //
|
|
|
- catch (\Exception $e) {
|
|
|
- $m = new Message();
|
|
|
- $m->json = $e->getMessage();
|
|
|
- $m->save();
|
|
|
+ catch (Exception $e) {
|
|
|
if (!empty($chatId)) {
|
|
|
- $telegram->sendMessage([
|
|
|
- 'chat_id' => $chatId,
|
|
|
- 'text' => '‼️‼️系统发生了错误,请联系客服'
|
|
|
- ]);
|
|
|
+ try {
|
|
|
+ $telegram->sendMessage(['chat_id' => $chatId, 'text' => '‼️‼️系统发生了错误,请联系客服']);
|
|
|
+ } catch (TelegramSDKException $e) {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return response()->json(['status' => 'ok']);
|