Merge branch 'assimon:master' into master

niceluckyday · Nov 30, 2022 · 0d76b12 · 0d76b12
2 parents d4f1fc4 + e6f1fbe
commit 0d76b12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/app/Admin/Forms/EmailTest.php b/app/Admin/Forms/EmailTest.php
@@ -31,7 +31,7 @@ public function handle(array $input)
       $body = $input['body'];
       $sysConfig = cache('system-setting');
       $mailConfig = [
-          'driver' => $sysConfig['driver'] ?? 'stmp',
+          'driver' => $sysConfig['driver'] ?? 'smtp',
           'host' => $sysConfig['host'] ?? '',
           'port' => $sysConfig['port'] ?? '465',
           'username' => $sysConfig['username'] ?? '',

diff --git a/app/Http/Controllers/Home/HomeController.php b/app/Http/Controllers/Home/HomeController.php
@@ -149,7 +149,7 @@ public function doInstall(Request $request)
             ];
             $dbConfig['redis']['default'] = array_merge($dbConfig['redis']['default'], $redisDB);
             config(['database' => $dbConfig]);
-            (new DatabaseServiceProvider(app()))->register();
+            DB::purge();
             // db测试
             DB::connection()->select('select 1 limit 1');
             // redis测试

diff --git a/app/Jobs/MailSend.php b/app/Jobs/MailSend.php
@@ -59,7 +59,7 @@ public function handle()
         $title = $this->title;
         $sysConfig = cache('system-setting');
         $mailConfig = [
-            'driver' => $sysConfig['driver'] ?? 'stmp',
+            'driver' => $sysConfig['driver'] ?? 'smtp',
             'host' => $sysConfig['host'] ?? '',
             'port' => $sysConfig['port'] ?? '465',
             'username' => $sysConfig['username'] ?? '',

diff --git a/resources/views/luna/layouts/_notice.blade.php b/resources/views/luna/layouts/_notice.blade.php
@@ -1,4 +1,14 @@
-<div class="notice layui-hide-xs">
-    <p class="tit">{{ __('dujiaoka.site_announcement') }}:</p>
-    <div class="tips">{!! dujiaoka_config_get('notice') !!}</div>
+<div class="main layui-hide-xs">
+  <div class="layui-row">
+    <div class="layui-col-sm12">
+        <div class="main-box">
+        <div class="title">
+              <p class="tit">{{ __('dujiaoka.site_announcement') }}:</p>
+          </div>
+          <div class="goods">
+              <div class="tips">{!! dujiaoka_config_get('notice') !!}</div>
+          </div>
+      </div>
+    </div>
+  </div>
 </div>