调整Notice目录结构

app/Console/Tasks/DeliverTask.php

@@ -19,7 +19,7 @@ use App\Repos\Vip as VipRepo;
 use App\Services\Logic\Deliver\CourseDeliver as CourseDeliverService;
 use App\Services\Logic\Deliver\PackageDeliver as PackageDeliverService;
 use App\Services\Logic\Deliver\VipDeliver as VipDeliverService;
-use App\Services\Logic\Notice\OrderFinish as OrderFinishNotice;
+use App\Services\Logic\Notice\External\OrderFinish as OrderFinishNotice;
 use App\Services\Logic\Point\History\OrderConsume as OrderConsumePointHistory;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset;

app/Console/Tasks/NoticeTask.php

@@ -8,16 +8,15 @@
 namespace App\Console\Tasks;
 
 use App\Models\Task as TaskModel;
-use App\Services\Logic\Notice\AccountLogin as AccountLoginNotice;
-use App\Services\Logic\Notice\ConsultReply as ConsultReplyNotice;
-use App\Services\Logic\Notice\DingTalk\ConsultCreate as ConsultCreateNotice;
-use App\Services\Logic\Notice\DingTalk\CustomService as CustomServiceNotice;
-use App\Services\Logic\Notice\DingTalk\ServerMonitor as ServerMonitorNotice;
-use App\Services\Logic\Notice\DingTalk\TeacherLive as TeacherLiveNotice;
-use App\Services\Logic\Notice\LiveBegin as LiveBeginNotice;
-use App\Services\Logic\Notice\OrderFinish as OrderFinishNotice;
-use App\Services\Logic\Notice\PointGoodsDeliver as PointGoodsDeliverNotice;
-use App\Services\Logic\Notice\RefundFinish as RefundFinishNotice;
+use App\Services\Logic\Notice\External\AccountLogin as AccountLoginNotice;
+use App\Services\Logic\Notice\External\ConsultReply as ConsultReplyNotice;
+use App\Services\Logic\Notice\External\DingTalk\ConsultCreate as ConsultCreateNotice;
+use App\Services\Logic\Notice\External\DingTalk\ServerMonitor as ServerMonitorNotice;
+use App\Services\Logic\Notice\External\DingTalk\TeacherLive as TeacherLiveNotice;
+use App\Services\Logic\Notice\External\LiveBegin as LiveBeginNotice;
+use App\Services\Logic\Notice\External\OrderFinish as OrderFinishNotice;
+use App\Services\Logic\Notice\External\PointGoodsDeliver as PointGoodsDeliverNotice;
+use App\Services\Logic\Notice\External\RefundFinish as RefundFinishNotice;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
 
@@ -62,9 +61,6 @@ class NoticeTask extends Task
                     case TaskModel::TYPE_STAFF_NOTICE_SERVER_MONITOR:
                         $this->handleServerMonitorNotice($task);
                         break;
-                    case TaskModel::TYPE_STAFF_NOTICE_CUSTOM_SERVICE:
-                        $this->handleCustomServiceNotice($task);
-                        break;
                 }
 
                 $task->status = TaskModel::STATUS_FINISHED;
@@ -157,13 +153,6 @@ class NoticeTask extends Task
         $notice->handleTask($task);
     }
 
-    protected function handleCustomServiceNotice(TaskModel $task)
-    {
-        $notice = new CustomServiceNotice();
-
-        $notice->handleTask($task);
-    }
-
     /**
      * @param int $limit
      * @return ResultsetInterface|Resultset|TaskModel[]
@@ -181,7 +170,6 @@ class NoticeTask extends Task
             TaskModel::TYPE_STAFF_NOTICE_CONSULT_CREATE,
             TaskModel::TYPE_STAFF_NOTICE_TEACHER_LIVE,
             TaskModel::TYPE_STAFF_NOTICE_SERVER_MONITOR,
-            TaskModel::TYPE_STAFF_NOTICE_CUSTOM_SERVICE,
         ];
 
         $status = TaskModel::STATUS_PENDING;

app/Console/Tasks/PointGiftDeliverTask.php

@@ -17,7 +17,7 @@ use App\Repos\User as UserRepo;
 use App\Repos\Vip as VipRepo;
 use App\Services\Logic\Deliver\CourseDeliver as CourseDeliverService;
 use App\Services\Logic\Deliver\VipDeliver as VipDeliverService;
-use App\Services\Logic\Notice\DingTalk\PointGiftRedeem as PointGiftRedeemNotice;
+use App\Services\Logic\Notice\External\DingTalk\PointGiftRedeem as PointGiftRedeemNotice;
 use App\Services\Logic\Point\History\PointGiftRefund as PointGiftRefundPointHistory;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;

app/Console/Tasks/RefundTask.php

@@ -16,7 +16,7 @@ use App\Repos\Order as OrderRepo;
 use App\Repos\Refund as RefundRepo;
 use App\Repos\Trade as TradeRepo;
 use App\Repos\User as UserRepo;
-use App\Services\Logic\Notice\RefundFinish as RefundFinishNotice;
+use App\Services\Logic\Notice\External\RefundFinish as RefundFinishNotice;
 use App\Services\Pay\Alipay as AlipayService;
 use App\Services\Pay\Wxpay as WxpayService;
 use Phalcon\Mvc\Model\Resultset;

app/Console/Tasks/ServerMonitorTask.php

@@ -9,7 +9,7 @@ namespace App\Console\Tasks;
 
 use App\Library\Benchmark;
 use App\Models\User as UserModel;
-use App\Services\Logic\Notice\DingTalk\ServerMonitor as ServerMonitorNotice;
+use App\Services\Logic\Notice\External\DingTalk\ServerMonitor as ServerMonitorNotice;
 use App\Services\Search\UserSearcher;
 use GatewayClient\Gateway;
 

app/Console/Tasks/TeacherLiveNoticeTask.php

@@ -9,7 +9,7 @@ namespace App\Console\Tasks;
 
 use App\Models\ChapterLive as ChapterLiveModel;
 use App\Repos\ChapterLive as ChapterLiveRepo;
-use App\Services\Logic\Notice\DingTalk\TeacherLive as TeacherLiveNotice;
+use App\Services\Logic\Notice\External\DingTalk\TeacherLive as TeacherLiveNotice;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
 

app/Http/Admin/Controllers/TestController.php

@@ -13,8 +13,8 @@ use App\Http\Admin\Services\WxpayTest as WxpayTestService;
 use App\Services\Captcha as CaptchaService;
 use App\Services\DingTalkNotice as DingTalkNoticeService;
 use App\Services\Live as LiveService;
-use App\Services\Logic\Notice\Mail\Test as MailTestService;
-use App\Services\Logic\Notice\Sms\Test as SmsTestService;
+use App\Services\Logic\Notice\External\Mail\Test as MailTestService;
+use App\Services\Logic\Notice\External\Sms\Test as SmsTestService;
 use App\Services\MyStorage as StorageService;
 use App\Services\Vod as VodService;
 use App\Services\WeChat as WeChatService;

app/Http/Admin/Services/Answer.php

@@ -21,9 +21,9 @@ use App\Repos\Report as ReportRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Logic\Answer\AnswerDataTrait;
 use App\Services\Logic\Answer\AnswerInfo as AnswerInfoService;
-use App\Services\Logic\Notice\System\AnswerApproved as AnswerApprovedNotice;
-use App\Services\Logic\Notice\System\AnswerRejected as AnswerRejectedNotice;
-use App\Services\Logic\Notice\System\QuestionAnswered as QuestionAnsweredNotice;
+use App\Services\Logic\Notice\Internal\AnswerApproved as AnswerApprovedNotice;
+use App\Services\Logic\Notice\Internal\AnswerRejected as AnswerRejectedNotice;
+use App\Services\Logic\Notice\Internal\QuestionAnswered as QuestionAnsweredNotice;
 use App\Services\Logic\Point\History\AnswerPost as AnswerPostPointHistory;
 use App\Validators\Answer as AnswerValidator;
 

app/Http/Admin/Services/Article.php

@@ -24,8 +24,8 @@ use App\Repos\User as UserRepo;
 use App\Services\Logic\Article\ArticleDataTrait;
 use App\Services\Logic\Article\ArticleInfo as ArticleInfoService;
 use App\Services\Logic\Article\XmTagList as XmTagListService;
-use App\Services\Logic\Notice\System\ArticleApproved as ArticleApprovedNotice;
-use App\Services\Logic\Notice\System\ArticleRejected as ArticleRejectedNotice;
+use App\Services\Logic\Notice\Internal\ArticleApproved as ArticleApprovedNotice;
+use App\Services\Logic\Notice\Internal\ArticleRejected as ArticleRejectedNotice;
 use App\Services\Logic\Point\History\ArticlePost as ArticlePostPointHistory;
 use App\Services\Sync\ArticleIndex as ArticleIndexSync;
 use App\Validators\Article as ArticleValidator;

app/Http/Admin/Services/Consult.php

@@ -16,7 +16,7 @@ use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Consult as ConsultRepo;
 use App\Repos\Course as CourseRepo;
 use App\Services\Logic\Consult\ConsultInfo as ConsultInfoService;
-use App\Services\Logic\Notice\ConsultReply as ConsultReplyNotice;
+use App\Services\Logic\Notice\External\ConsultReply as ConsultReplyNotice;
 use App\Validators\Consult as ConsultValidator;
 
 class Consult extends Service

app/Http/Admin/Services/PointGiftRedeem.php

@@ -11,7 +11,7 @@ use App\Library\Paginator\Query as PagerQuery;
 use App\Models\PointGift as PointGiftModel;
 use App\Models\PointGiftRedeem as PointGiftRedeemModel;
 use App\Repos\PointGiftRedeem as PointGiftRedeemRepo;
-use App\Services\Logic\Notice\PointGoodsDeliver as PointGoodsDeliverNotice;
+use App\Services\Logic\Notice\External\PointGoodsDeliver as PointGoodsDeliverNotice;
 use App\Validators\PointGiftRedeem as PointGiftRedeemValidator;
 
 class PointGiftRedeem extends Service

app/Http/Admin/Services/Question.php

@@ -20,8 +20,8 @@ use App\Repos\Category as CategoryRepo;
 use App\Repos\Question as QuestionRepo;
 use App\Repos\Report as ReportRepo;
 use App\Repos\User as UserRepo;
-use App\Services\Logic\Notice\System\QuestionApproved as QuestionApprovedNotice;
-use App\Services\Logic\Notice\System\QuestionRejected as QuestionRejectedNotice;
+use App\Services\Logic\Notice\Internal\QuestionApproved as QuestionApprovedNotice;
+use App\Services\Logic\Notice\Internal\QuestionRejected as QuestionRejectedNotice;
 use App\Services\Logic\Point\History\QuestionPost as QuestionPostPointHistory;
 use App\Services\Logic\Question\QuestionDataTrait;
 use App\Services\Logic\Question\QuestionInfo as QuestionInfoService;

app/Http/Api/Services/Connect.php

@@ -12,7 +12,7 @@ use App\Models\User as UserModel;
 use App\Repos\Connect as ConnectRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Auth\Api as ApiAuthService;
-use App\Services\Logic\Notice\AccountLogin as AccountLoginNoticeService;
+use App\Services\Logic\Notice\External\AccountLogin as AccountLoginNoticeService;
 use App\Services\OAuth\QQ as QQAuth;
 use App\Services\OAuth\WeChat as WeChatAuth;
 use App\Services\OAuth\WeiBo as WeiBoAuth;

app/Http/Home/Services/Connect.php

@@ -16,7 +16,7 @@ use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
 use App\Services\Auth\Home as AuthService;
 use App\Services\Auth\Home as HomeAuthService;
 use App\Services\Logic\Account\Register as RegisterService;
-use App\Services\Logic\Notice\AccountLogin as AccountLoginNotice;
+use App\Services\Logic\Notice\External\AccountLogin as AccountLoginNotice;
 use App\Services\OAuth\QQ as QQAuth;
 use App\Services\OAuth\WeiBo as WeiBoAuth;
 use App\Services\OAuth\WeiXin as WeiXinAuth;

app/Listeners/Account.php

@@ -8,7 +8,7 @@
 namespace App\Listeners;
 
 use App\Models\User as UserModel;
-use App\Services\Logic\Notice\AccountLogin as AccountLoginNoticeService;
+use App\Services\Logic\Notice\External\AccountLogin as AccountLoginNoticeService;
 use App\Services\Logic\Point\History\AccountRegister as AccountRegisterPointHistory;
 use Phalcon\Events\Event as PhEvent;
 

app/Models/Task.php

@@ -35,7 +35,7 @@ class Task extends Model
     const TYPE_STAFF_NOTICE_CONSULT_CREATE = 31; // 咨询创建通知
     const TYPE_STAFF_NOTICE_TEACHER_LIVE = 32; // 直播讲师通知
     const TYPE_STAFF_NOTICE_SERVER_MONITOR = 33; // 服务监控通知
-    const TYPE_STAFF_NOTICE_CUSTOM_SERVICE = 34; // 客服消息通知
+    const TYPE_STAFF_NOTICE_CUSTOM_SERVICE = 34; // 客服消息通知（废弃）
     const TYPE_STAFF_NOTICE_POINT_GIFT_REDEEM = 35; // 积分兑换通知
     const TYPE_STAFF_NOTICE_LUCKY_GIFT_REDEEM = 36; // 抽奖兑换通知
 

app/Services/LiveNotify.php

@@ -12,7 +12,7 @@ use App\Models\Chapter as ChapterModel;
 use App\Models\ChapterLive as ChapterLiveModel;
 use App\Repos\Chapter as ChapterRepo;
 use App\Repos\CourseUser as CourseUserRepo;
-use App\Services\Logic\Notice\LiveBegin as LiveBeginNotice;
+use App\Services\Logic\Notice\External\LiveBegin as LiveBeginNotice;
 use Phalcon\Logger\Adapter\File as FileLogger;
 
 class LiveNotify extends Service

app/Services/Logic/Answer/AnswerAccept.php

@@ -10,7 +10,7 @@ namespace App\Services\Logic\Answer;
 use App\Models\Answer as AnswerModel;
 use App\Models\User as UserModel;
 use App\Services\Logic\AnswerTrait;
-use App\Services\Logic\Notice\System\AnswerAccepted as AnswerAcceptedNotice;
+use App\Services\Logic\Notice\Internal\AnswerAccepted as AnswerAcceptedNotice;
 use App\Services\Logic\Point\History\AnswerAccepted as AnswerAcceptPointHistory;
 use App\Services\Logic\QuestionTrait;
 use App\Services\Logic\Service as LogicService;

app/Services/Logic/Answer/AnswerCreate.php

@@ -13,7 +13,7 @@ use App\Models\User as UserModel;
 use App\Repos\Question as QuestionRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Logic\AnswerTrait;
-use App\Services\Logic\Notice\System\QuestionAnswered as QuestionAnsweredNotice;
+use App\Services\Logic\Notice\Internal\QuestionAnswered as QuestionAnsweredNotice;
 use App\Services\Logic\Point\History\AnswerPost as AnswerPostPointHistory;
 use App\Services\Logic\QuestionTrait;
 use App\Services\Logic\Service as LogicService;

app/Services/Logic/Answer/AnswerLike.php

@@ -12,7 +12,7 @@ use App\Models\AnswerLike as AnswerLikeModel;
 use App\Models\User as UserModel;
 use App\Repos\AnswerLike as AnswerLikeRepo;
 use App\Services\Logic\AnswerTrait;
-use App\Services\Logic\Notice\System\AnswerLiked as AnswerLikedNotice;
+use App\Services\Logic\Notice\Internal\AnswerLiked as AnswerLikedNotice;
 use App\Services\Logic\Point\History\AnswerLiked as AnswerLikedPointHistory;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;

app/Services/Logic/Article/ArticleFavorite.php

@@ -12,7 +12,7 @@ use App\Models\ArticleFavorite as ArticleFavoriteModel;
 use App\Models\User as UserModel;
 use App\Repos\ArticleFavorite as ArticleFavoriteRepo;
 use App\Services\Logic\ArticleTrait;
-use App\Services\Logic\Notice\System\ArticleFavorited as ArticleFavoritedNotice;
+use App\Services\Logic\Notice\Internal\ArticleFavorited as ArticleFavoritedNotice;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;
 

app/Services/Logic/Article/ArticleLike.php

@@ -12,7 +12,7 @@ use App\Models\ArticleLike as ArticleLikeModel;
 use App\Models\User as UserModel;
 use App\Repos\ArticleLike as ArticleLikeRepo;
 use App\Services\Logic\ArticleTrait;
-use App\Services\Logic\Notice\System\ArticleLiked as ArticleLikedNotice;
+use App\Services\Logic\Notice\Internal\ArticleLiked as ArticleLikedNotice;
 use App\Services\Logic\Point\History\ArticleLiked as ArticleLikedPointHistory;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;

app/Services/Logic/Comment/AfterCreateTrait.php

@@ -11,10 +11,10 @@ use App\Models\Answer as AnswerModel;
 use App\Models\Article as ArticleModel;
 use App\Models\Comment as CommentModel;
 use App\Models\Question as QuestionModel;
-use App\Services\Logic\Notice\System\AnswerCommented as AnswerCommentedNotice;
-use App\Services\Logic\Notice\System\ArticleCommented as ArticleCommentedNotice;
-use App\Services\Logic\Notice\System\CommentReplied as CommentRepliedNotice;
-use App\Services\Logic\Notice\System\QuestionCommented as QuestionCommentedNotice;
+use App\Services\Logic\Notice\Internal\AnswerCommented as AnswerCommentedNotice;
+use App\Services\Logic\Notice\Internal\ArticleCommented as ArticleCommentedNotice;
+use App\Services\Logic\Notice\Internal\CommentReplied as CommentRepliedNotice;
+use App\Services\Logic\Notice\Internal\QuestionCommented as QuestionCommentedNotice;
 use App\Services\Logic\Point\History\CommentPost as CommentPostPointHistory;
 
 trait AfterCreateTrait

app/Services/Logic/Comment/CommentLike.php

@@ -12,7 +12,7 @@ use App\Models\CommentLike as CommentLikeModel;
 use App\Models\User as UserModel;
 use App\Repos\CommentLike as CommentLikeRepo;
 use App\Services\Logic\CommentTrait;
-use App\Services\Logic\Notice\System\CommentLiked as CommentLikedNotice;
+use App\Services\Logic\Notice\Internal\CommentLiked as CommentLikedNotice;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;
 

app/Services/Logic/Consult/ConsultCreate.php

@@ -15,7 +15,7 @@ use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Course as CourseRepo;
 use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\CourseTrait;
-use App\Services\Logic\Notice\DingTalk\ConsultCreate as ConsultCreateNotice;
+use App\Services\Logic\Notice\External\DingTalk\ConsultCreate as ConsultCreateNotice;
 use App\Services\Logic\Service as LogicService;
 use App\Traits\Client as ClientTrait;
 use App\Validators\Consult as ConsultValidator;

app/Services/Logic/Consult/ConsultLike.php

@@ -12,7 +12,7 @@ use App\Models\ConsultLike as ConsultLikeModel;
 use App\Models\User as UserModel;
 use App\Repos\ConsultLike as ConsultLikeRepo;
 use App\Services\Logic\ConsultTrait;
-use App\Services\Logic\Notice\System\ConsultLiked as ConsultLikedNotice;
+use App\Services\Logic\Notice\Internal\ConsultLiked as ConsultLikedNotice;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;
 

app/Services/Logic/Consult/ConsultReply.php

@@ -9,7 +9,7 @@ namespace App\Services\Logic\Consult;
 
 use App\Models\Consult as ConsultModel;
 use App\Services\Logic\ConsultTrait;
-use App\Services\Logic\Notice\ConsultReply as ConsultReplyNotice;
+use App\Services\Logic\Notice\External\ConsultReply as ConsultReplyNotice;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\Consult as ConsultValidator;
 

app/Services/Logic/Notice/DingTalk/CustomService.php

@@ -1,68 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Services\Logic\Notice\DingTalk;
-
-use App\Models\ImMessage as ImMessageModel;
-use App\Models\Task as TaskModel;
-use App\Repos\ImMessage as ImMessageRepo;
-use App\Repos\User as UserRepo;
-use App\Services\DingTalkNotice;
-
-class CustomService extends DingTalkNotice
-{
-
-    public function handleTask(TaskModel $task)
-    {
-        if (!$this->enabled) return;
-
-        $messageRepo = new ImMessageRepo();
-
-        $message = $messageRepo->findById($task->item_id);
-
-        $userRepo = new UserRepo();
-
-        $sender = $userRepo->findById($message->sender_id);
-
-        $content = kg_ph_replace("{user.name} 通过在线客服给你发送了消息：{message.content}", [
-            'user.name' => $sender->name,
-            'message.content' => $message->content,
-        ]);
-
-        $this->atCustomService($content);
-    }
-
-    public function createTask(ImMessageModel $message)
-    {
-        if (!$this->enabled) return;
-
-        $keyName = "dingtalk_custom_service_notice:{$message->sender_id}";
-
-        $cache = $this->getCache();
-
-        $content = $cache->get($keyName);
-
-        if ($content) return;
-
-        $cache->save($keyName, 1, 3600);
-
-        $task = new TaskModel();
-
-        $itemInfo = [
-            'im_message' => ['id' => $message->id],
-        ];
-
-        $task->item_id = $message->id;
-        $task->item_info = $itemInfo;
-        $task->item_type = TaskModel::TYPE_STAFF_NOTICE_CUSTOM_SERVICE;
-        $task->priority = TaskModel::PRIORITY_MIDDLE;
-        $task->status = TaskModel::STATUS_PENDING;
-
-        $task->create();
-    }
-
-}

app/Services/Logic/Notice/External/AccountLogin.php

@@ -5,12 +5,12 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice;
+namespace App\Services\Logic\Notice\External;
 
 use App\Models\Task as TaskModel;
 use App\Models\User as UserModel;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
-use App\Services\Logic\Notice\WeChat\AccountLogin as WeChatAccountLoginNotice;
+use App\Services\Logic\Notice\External\WeChat\AccountLogin as WeChatAccountLoginNotice;
 use App\Services\Logic\Service as LogicService;
 use App\Traits\Client as ClientTrait;
 

app/Services/Logic/Notice/External/ConsultReply.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice;
+namespace App\Services\Logic\Notice\External;
 
 use App\Models\Consult as ConsultModel;
 use App\Models\Task as TaskModel;
@@ -13,8 +13,8 @@ use App\Repos\Consult as ConsultRepo;
 use App\Repos\Course as CourseRepo;
 use App\Repos\User as UserRepo;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
-use App\Services\Logic\Notice\Sms\ConsultReply as SmsConsultReplyNotice;
-use App\Services\Logic\Notice\WeChat\ConsultReply as WeChatConsultReplyNotice;
+use App\Services\Logic\Notice\External\Sms\ConsultReply as SmsConsultReplyNotice;
+use App\Services\Logic\Notice\External\WeChat\ConsultReply as WeChatConsultReplyNotice;
 use App\Services\Logic\Service as LogicService;
 
 class ConsultReply extends LogicService

app/Services/Logic/Notice/External/DingTalk/ConsultCreate.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\DingTalk;
+namespace App\Services\Logic\Notice\External\DingTalk;
 
 use App\Models\Consult as ConsultModel;
 use App\Models\Task as TaskModel;

app/Services/Logic/Notice/External/DingTalk/PointGiftRedeem.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\DingTalk;
+namespace App\Services\Logic\Notice\External\DingTalk;
 
 use App\Models\PointGift as PointGiftModel;
 use App\Models\PointGiftRedeem as PointGiftRedeemModel;

app/Services/Logic/Notice/External/DingTalk/ServerMonitor.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\DingTalk;
+namespace App\Services\Logic\Notice\External\DingTalk;
 
 use App\Models\Task as TaskModel;
 use App\Services\DingTalkNotice;

app/Services/Logic/Notice/External/DingTalk/TeacherLive.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\DingTalk;
+namespace App\Services\Logic\Notice\External\DingTalk;
 
 use App\Models\ChapterLive as ChapterLiveModel;
 use App\Models\Task as TaskModel;

app/Services/Logic/Notice/External/LiveBegin.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice;
+namespace App\Services\Logic\Notice\External;
 
 use App\Models\Chapter as ChapterModel;
 use App\Models\CourseUser as CourseUserModel;
@@ -14,8 +14,8 @@ use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Course as CourseRepo;
 use App\Repos\User as UserRepo;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
-use App\Services\Logic\Notice\Sms\LiveBegin as SmsLiveBeginNotice;
-use App\Services\Logic\Notice\WeChat\LiveBegin as WeChatLiveBeginNotice;
+use App\Services\Logic\Notice\External\Sms\LiveBegin as SmsLiveBeginNotice;
+use App\Services\Logic\Notice\External\WeChat\LiveBegin as WeChatLiveBeginNotice;
 use App\Services\Logic\Service as LogicService;
 
 class LiveBegin extends LogicService

app/Services/Logic/Notice/External/Mail/Test.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Mail;
+namespace App\Services\Logic\Notice\External\Mail;
 
 use App\Services\Mailer;
 

app/Services/Logic/Notice/External/Mail/Verify.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Mail;
+namespace App\Services\Logic\Notice\External\Mail;
 
 use App\Services\Mailer as MailerService;
 use App\Services\Verify as VerifyService;

app/Services/Logic/Notice/External/OrderFinish.php

@@ -5,15 +5,15 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice;
+namespace App\Services\Logic\Notice\External;
 
 use App\Models\Order as OrderModel;
 use App\Models\Task as TaskModel;
 use App\Repos\Order as OrderRepo;
 use App\Repos\User as UserRepo;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
-use App\Services\Logic\Notice\Sms\OrderFinish as SmsOrderFinishNotice;
-use App\Services\Logic\Notice\WeChat\OrderFinish as WeChatOrderFinishNotice;
+use App\Services\Logic\Notice\External\Sms\OrderFinish as SmsOrderFinishNotice;
+use App\Services\Logic\Notice\External\WeChat\OrderFinish as WeChatOrderFinishNotice;
 use App\Services\Logic\Service as LogicService;
 
 class OrderFinish extends LogicService

app/Services/Logic/Notice/External/PointGoodsDeliver.php

@@ -5,15 +5,15 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice;
+namespace App\Services\Logic\Notice\External;
 
 use App\Models\PointGiftRedeem as PointGiftRedeemModel;
 use App\Models\Task as TaskModel;
 use App\Repos\PointGiftRedeem as PointGiftRedeemRepo;
 use App\Repos\User as UserRepo;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
-use App\Services\Logic\Notice\Sms\GoodsDeliver as SmsGoodsDeliverNotice;
-use App\Services\Logic\Notice\WeChat\GoodsDeliver as WeChatGoodsDeliverNotice;
+use App\Services\Logic\Notice\External\Sms\GoodsDeliver as SmsGoodsDeliverNotice;
+use App\Services\Logic\Notice\External\WeChat\GoodsDeliver as WeChatGoodsDeliverNotice;
 use App\Services\Logic\Service as LogicService;
 
 class PointGoodsDeliver extends LogicService

app/Services/Logic/Notice/External/RefundFinish.php

@@ -5,15 +5,15 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice;
+namespace App\Services\Logic\Notice\External;
 
 use App\Models\Refund as RefundModel;
 use App\Models\Task as TaskModel;
 use App\Repos\Refund as RefundRepo;
 use App\Repos\User as UserRepo;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
-use App\Services\Logic\Notice\Sms\RefundFinish as SmsRefundFinishNotice;
-use App\Services\Logic\Notice\WeChat\RefundFinish as WeChatRefundFinishNotice;
+use App\Services\Logic\Notice\External\Sms\RefundFinish as SmsRefundFinishNotice;
+use App\Services\Logic\Notice\External\WeChat\RefundFinish as WeChatRefundFinishNotice;
 use App\Services\Logic\Service as LogicService;
 
 class RefundFinish extends LogicService

app/Services/Logic/Notice/External/Sms/ConsultReply.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Models\User as UserModel;
 use App\Repos\Account as AccountRepo;

app/Services/Logic/Notice/External/Sms/GoodsDeliver.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Models\User as UserModel;
 use App\Repos\Account as AccountRepo;

app/Services/Logic/Notice/External/Sms/LiveBegin.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Models\User as UserModel;
 use App\Repos\Account as AccountRepo;

app/Services/Logic/Notice/External/Sms/OrderFinish.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Models\User as UserModel;
 use App\Repos\Account as AccountRepo;

app/Services/Logic/Notice/External/Sms/RefundFinish.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Models\User as UserModel;
 use App\Repos\Account as AccountRepo;

app/Services/Logic/Notice/External/Sms/Test.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Services\Smser;
 

app/Services/Logic/Notice/External/Sms/Verify.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\Sms;
+namespace App\Services\Logic\Notice\External\Sms;
 
 use App\Services\Smser as SmserService;
 use App\Services\Verify as VerifyService;

app/Services/Logic/Notice/External/WeChat/AccountLogin.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\WeChat;
+namespace App\Services\Logic\Notice\External\WeChat;
 
 use App\Models\WeChatSubscribe as WeChatSubscribeModel;
 use App\Services\WeChatNotice;

app/Services/Logic/Notice/External/WeChat/ConsultReply.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\WeChat;
+namespace App\Services\Logic\Notice\External\WeChat;
 
 use App\Models\WeChatSubscribe as WeChatSubscribeModel;
 use App\Services\WeChatNotice;

app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\WeChat;
+namespace App\Services\Logic\Notice\External\WeChat;
 
 use App\Models\WeChatSubscribe as WeChatSubscribeModel;
 use App\Services\WeChatNotice;

app/Services/Logic/Notice/External/WeChat/LiveBegin.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\WeChat;
+namespace App\Services\Logic\Notice\External\WeChat;
 
 use App\Models\WeChatSubscribe as WeChatSubscribeModel;
 use App\Services\WeChatNotice;

app/Services/Logic/Notice/External/WeChat/OrderFinish.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\WeChat;
+namespace App\Services\Logic\Notice\External\WeChat;
 
 use App\Models\WeChatSubscribe as WeChatSubscribeModel;
 use App\Services\WeChatNotice;

app/Services/Logic/Notice/External/WeChat/RefundFinish.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\WeChat;
+namespace App\Services\Logic\Notice\External\WeChat;
 
 use App\Models\WeChatSubscribe as WeChatSubscribeModel;
 use App\Services\WeChatNotice;

app/Services/Logic/Notice/Internal/AnswerAccepted.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/AnswerApproved.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/AnswerCommented.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Comment as CommentModel;

app/Services/Logic/Notice/Internal/AnswerLiked.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/AnswerRejected.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ArticleApproved.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Article as ArticleModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ArticleCommented.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Article as ArticleModel;
 use App\Models\Comment as CommentModel;

app/Services/Logic/Notice/Internal/ArticleDeleted.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Article as ArticleModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ArticleFavorited.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Article as ArticleModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ArticleLiked.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Article as ArticleModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ArticleRejected.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Article as ArticleModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ChapterCommented.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Comment as CommentModel;
 use App\Services\Logic\Service as LogicService;

app/Services/Logic/Notice/Internal/CommentLiked.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Comment as CommentModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/CommentReplied.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Comment as CommentModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/ConsultLiked.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Consult as ConsultModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/QuestionAnswered.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/QuestionApproved.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Notification as NotificationModel;
 use App\Models\Question as QuestionModel;

app/Services/Logic/Notice/Internal/QuestionCommented.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Comment as CommentModel;
 use App\Models\Notification as NotificationModel;

app/Services/Logic/Notice/Internal/QuestionFavorited.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Notification as NotificationModel;
 use App\Models\Question as QuestionModel;

app/Services/Logic/Notice/Internal/QuestionLiked.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Notification as NotificationModel;
 use App\Models\Question as QuestionModel;

app/Services/Logic/Notice/Internal/QuestionRejected.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Notification as NotificationModel;
 use App\Models\Question as QuestionModel;

app/Services/Logic/Notice/Internal/ReviewLiked.php

@@ -5,7 +5,7 @@
  * @link https://www.koogua.com
  */
 
-namespace App\Services\Logic\Notice\System;
+namespace App\Services\Logic\Notice\Internal;
 
 use App\Models\Notification as NotificationModel;
 use App\Models\Review as ReviewModel;

app/Services/Logic/Question/QuestionFavorite.php

@@ -11,7 +11,7 @@ use App\Models\Question as QuestionModel;
 use App\Models\QuestionFavorite as QuestionFavoriteModel;
 use App\Models\User as UserModel;
 use App\Repos\QuestionFavorite as QuestionFavoriteRepo;
-use App\Services\Logic\Notice\System\QuestionFavorited as QuestionFavoritedNotice;
+use App\Services\Logic\Notice\Internal\QuestionFavorited as QuestionFavoritedNotice;
 use App\Services\Logic\QuestionTrait;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;

app/Services/Logic/Question/QuestionLike.php

@@ -11,7 +11,7 @@ use App\Models\Question as QuestionModel;
 use App\Models\QuestionLike as QuestionLikeModel;
 use App\Models\User as UserModel;
 use App\Repos\QuestionLike as QuestionLikeRepo;
-use App\Services\Logic\Notice\System\QuestionLiked as QuestionLikedNotice;
+use App\Services\Logic\Notice\Internal\QuestionLiked as QuestionLikedNotice;
 use App\Services\Logic\Point\History\QuestionLiked as QuestionLikedPointHistory;
 use App\Services\Logic\QuestionTrait;
 use App\Services\Logic\Service as LogicService;

app/Services/Logic/Review/ReviewLike.php

@@ -11,7 +11,7 @@ use App\Models\Review as ReviewModel;
 use App\Models\ReviewLike as ReviewLikeModel;
 use App\Models\User as UserModel;
 use App\Repos\ReviewLike as ReviewLikeRepo;
-use App\Services\Logic\Notice\System\ReviewLiked as ReviewLikedNotice;
+use App\Services\Logic\Notice\Internal\ReviewLiked as ReviewLikedNotice;
 use App\Services\Logic\ReviewTrait;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\UserLimit as UserLimitValidator;

app/Services/Logic/Verify/MailCode.php

@@ -7,7 +7,7 @@
 
 namespace App\Services\Logic\Verify;
 
-use App\Services\Logic\Notice\Mail\Verify as MailVerifyService;
+use App\Services\Logic\Notice\External\Mail\Verify as MailVerifyService;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\Captcha as CaptchaValidator;
 use App\Validators\Verify as VerifyValidator;

app/Services/Logic/Verify/SmsCode.php

@@ -7,7 +7,7 @@
 
 namespace App\Services\Logic\Verify;
 
-use App\Services\Logic\Notice\Sms\Verify as SmsVerifyService;
+use App\Services\Logic\Notice\External\Sms\Verify as SmsVerifyService;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\Captcha as CaptchaValidator;
 use App\Validators\Verify as VerifyValidator;