From 2206e0f1e66754bc13c3ad75eff2adea9a93a8b6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 5 May 2022 22:15:23 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/SystemController.php  |  4 ++--
 app/Tasks/EmailNoticeTask.php                  | 18 ++++++++++--------
 .../setting/components/SystemEmailSetting.vue  |  2 ++
 resources/views/email/task.blade.php           |  5 +++++
 resources/views/{ => email}/unread.blade.php   |  0
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100755 resources/views/email/task.blade.php
 rename resources/views/{ => email}/unread.blade.php (100%)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 789866b56..7908acb64 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -141,10 +141,10 @@ class SystemController extends AbstractController
         $setting['account'] = $setting['account'] ?: '';
         $setting['password'] = $setting['password'] ?: '';
         $setting['reg_verify'] = $setting['reg_verify'] ?: 'close';
-        $setting['notice'] = $setting['notice'] ?: 'open';
+        $setting['notice'] = $setting['notice'] ?: 'close';
         $setting['task_remind_hours'] = floatval($setting['task_remind_hours']) ?: 0;
         $setting['task_remind_hours2'] = floatval($setting['task_remind_hours2']) ?: 0;
-        $setting['notice_msg'] = $setting['notice_msg'] ?: 'open';
+        $setting['notice_msg'] = $setting['notice_msg'] ?: 'close';
         $setting['msg_unread_user_minute'] = floatval($setting['msg_unread_user_minute']) ?: 0;
         $setting['msg_unread_group_minute'] = floatval($setting['msg_unread_group_minute']) ?: 0;
         //
diff --git a/app/Tasks/EmailNoticeTask.php b/app/Tasks/EmailNoticeTask.php
index 1976e91a9..63c0e9b2a 100644
--- a/app/Tasks/EmailNoticeTask.php
+++ b/app/Tasks/EmailNoticeTask.php
@@ -106,8 +106,6 @@ class EmailNoticeTask extends AbstractTask
         }
 
         $setting = Base::setting('emailSetting');
-        $hours = floatval($setting['task_remind_hours']);
-        $hours2 = floatval($setting['task_remind_hours2']);
 
         /** @var User $user */
         foreach ($users as $user) {
@@ -116,7 +114,7 @@ class EmailNoticeTask extends AbstractTask
                 'userid' => $user->userid,
                 'task_id' => $task->id,
             ];
-            $emailLog = ProjectTaskMailLog::where($data)->first();
+            $emailLog = ProjectTaskMailLog::where($data)->exists();
             if ($emailLog) {
                 continue;
             }
@@ -126,11 +124,15 @@ class EmailNoticeTask extends AbstractTask
                 }
                 if ($isBefore) {
                     $subject = env('APP_NAME') . " 任务提醒";
-                    $content = "<p>{$user->nickname} 您好：</p><p>您有一个任务【{$task->name}】还有{$hours}小时即将超时，请及时处理。</p>";
                 } else {
                     $subject = env('APP_NAME') . " 任务过期提醒";
-                    $content = "<p>{$user->nickname} 您好：</p><p>您的任务【{$task->name}】已经超时{$hours2}小时，请及时处理。</p>";
                 }
+                $content = view('email.task', [
+                    'type' => $isBefore ? 'before' : 'after',
+                    'user' => $user,
+                    'task' => $task,
+                    'setting' => $setting,
+                ]);
                 Factory::mailer()
                     ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
                     ->setMessage(EmailMessage::create()
@@ -168,8 +170,8 @@ class EmailNoticeTask extends AbstractTask
                 continue;
             }
             $setting = Base::setting('emailSetting');
-            $subject = env('APP_NAME') . " 未读消息提醒（" . count($data) . "）条";
-            $content = view('unread', [
+            $subject = env('APP_NAME') . " 未读消息提醒（" . count($data) . "条）";
+            $content = view('email.unread', [
                 'type' => 'head',
                 'nickname' => $user->nickname,
                 'count' => count($data),
@@ -192,7 +194,7 @@ class EmailNoticeTask extends AbstractTask
                         }
                     }
                 }
-                $content .= view('unread', [
+                $content .= view('email.unread', [
                     'type' => 'content',
                     'dialogName' => $dialogName,
                     'unread' => count($items),
diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
index 92cfedb24..8406ca0be 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
@@ -47,6 +47,7 @@
                             <InputNumber v-model="formData.task_remind_hours2" :min="0" :step="0.5" @on-change="hoursChange($event, 'task_remind_hours2')"/>
                             <label>{{ $L('小时') }}</label>
                         </FormItem>
+                        <div class="form-tip">{{$L('填写0则不通知，误差±10分钟')}}</div>
                     </Form>
                 </FormItem>
                 <FormItem :label="$L('消息提醒')" prop="notice_msg">
@@ -65,6 +66,7 @@
                             <InputNumber v-model="formData.msg_unread_group_minute" :min="0" :step="1"/>
                             <label>{{ $L('分钟') }}</label>
                         </FormItem>
+                        <div class="form-tip">{{$L('填写0则不通知，误差±10分钟')}}</div>
                     </Form>
                 </FormItem>
             </div>
diff --git a/resources/views/email/task.blade.php b/resources/views/email/task.blade.php
new file mode 100755
index 000000000..4ae638422
--- /dev/null
+++ b/resources/views/email/task.blade.php
@@ -0,0 +1,5 @@
+@if ($type === 'before')
+    <p>{{ $user->nickname }} 您好：</p><p>您有一个任务【{{ $task->name }}】还有{{ $setting['task_remind_hours'] }}小时即将超时，请及时处理。</p>
+@else
+    <p>{{ $user->nickname }} 您好：</p><p>您的任务【{{ $task->name }}】已经超时{{ $setting['task_remind_hours2'] }}小时，请及时处理。</p>
+@endif
diff --git a/resources/views/unread.blade.php b/resources/views/email/unread.blade.php
similarity index 100%
rename from resources/views/unread.blade.php
rename to resources/views/email/unread.blade.php