From 649c03c21446a4eba00ae1a4fce7d4e6b6df3b70 Mon Sep 17 00:00:00 2001
From: tokumeikoi <tokumeikoi@protonmail.com>
Date: Sun, 15 May 2022 01:10:27 +0800
Subject: [PATCH] update: error message

---
 app/Exceptions/Handler.php                    | 25 +++++++++++++++++--
 .../Controllers/Admin/ThemeController.php     |  8 ++++--
 resources/lang/en-US.json                     |  3 ++-
 resources/lang/zh-CN.json                     |  3 ++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index df41bbbe..2dd0f68c 100755
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,7 +3,10 @@
 namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Support\Arr;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
+use Facade\Ignition\Exceptions\ViewException;
 
 class Handler extends ExceptionHandler
 {
@@ -50,9 +53,27 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $exception)
     {
-        if ($exception instanceof \Facade\Ignition\Exceptions\ViewException) {
-            abort(501, '主题初始化发生错误，请在后台对主题检查或配置后重试。');
+        if ($exception instanceof ViewException) {
+            return response([
+                'message' => "主题初始化发生错误，请在后台对主题检查或配置后重试。"
+            ]);
         }
         return parent::render($request, $exception);
     }
+
+
+    protected function convertExceptionToArray(Throwable $e)
+    {
+        return config('app.debug') ? [
+            'message' => $e->getMessage(),
+            'exception' => get_class($e),
+            'file' => $e->getFile(),
+            'line' => $e->getLine(),
+            'trace' => collect($e->getTrace())->map(function ($trace) {
+                return Arr::except($trace, ['args']);
+            })->all(),
+        ] : [
+            'message' => $this->isHttpException($e) ? $e->getMessage() : __("Uh-oh, we've had some problems, we're working on it."),
+        ];
+    }
 }
diff --git a/app/Http/Controllers/Admin/ThemeController.php b/app/Http/Controllers/Admin/ThemeController.php
index 35a37c44..62bb17d1 100644
--- a/app/Http/Controllers/Admin/ThemeController.php
+++ b/app/Http/Controllers/Admin/ThemeController.php
@@ -28,8 +28,12 @@ class ThemeController extends Controller
         }
 
         $data = var_export($data, 1);
-        if (!File::put(base_path() . "/config/theme/{$themeName}.php", "<?php\n return $data ;")) {
-            abort(500, "{$themeName}初始化失败");
+        try {
+            if (!File::put(base_path() . "/config/theme/{$themeName}.php", "<?php\n return $data ;")) {
+                abort(500, "{$themeName}初始化失败");
+            }
+        } catch (\Exception $e) {
+            abort(500, '请检查V2Board目录权限');
         }
 
         try {
diff --git a/resources/lang/en-US.json b/resources/lang/en-US.json
index b44bed14..afe34317 100644
--- a/resources/lang/en-US.json
+++ b/resources/lang/en-US.json
@@ -88,5 +88,6 @@
     "The coupon can only be used :limit_use_with_user per person": "The coupon can only be used :limit_use_with_user per person",
     "The coupon code cannot be used for this period": "The coupon code cannot be used for this period",
     "Request failed, please try again later": "Request failed, please try again later",
-    "Register frequently, please try again after 1 hour": "Register frequently, please try again after 1 hour"
+    "Register frequently, please try again after 1 hour": "Register frequently, please try again after 1 hour",
+    "Uh-oh, we've had some problems, we're working on it.": "Uh-oh, we've had some problems, we're working on it."
 }
diff --git a/resources/lang/zh-CN.json b/resources/lang/zh-CN.json
index 4aaba82d..c839a982 100644
--- a/resources/lang/zh-CN.json
+++ b/resources/lang/zh-CN.json
@@ -88,5 +88,6 @@
     "The coupon can only be used :limit_use_with_user per person": "该优惠券每人只能用 :limit_use_with_user 次",
     "The coupon code cannot be used for this period": "此优惠券无法用于该付款周期",
     "Request failed, please try again later": "请求失败，请稍后再试",
-    "Register frequently, please try again after 1 hour": "注册频繁，请等待1小时后再次尝试"
+    "Register frequently, please try again after 1 hour": "注册频繁，请等待1小时后再次尝试",
+    "Uh-oh, we've had some problems, we're working on it.": "遇到了些问题，我们正在进行处理"
 }