From 8d64969040c9852bcc94bd3371e3a3f4ae194ebc Mon Sep 17 00:00:00 2001 From: koogua Date: Thu, 8 Sep 2022 20:01:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Notice=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Tasks/DeliverTask.php | 2 +- app/Console/Tasks/NoticeTask.php | 30 +++----- app/Console/Tasks/PointGiftDeliverTask.php | 2 +- app/Console/Tasks/RefundTask.php | 2 +- app/Console/Tasks/ServerMonitorTask.php | 2 +- app/Console/Tasks/TeacherLiveNoticeTask.php | 2 +- app/Http/Admin/Controllers/TestController.php | 4 +- app/Http/Admin/Services/Answer.php | 6 +- app/Http/Admin/Services/Article.php | 4 +- app/Http/Admin/Services/Consult.php | 2 +- app/Http/Admin/Services/PointGiftRedeem.php | 2 +- app/Http/Admin/Services/Question.php | 4 +- app/Http/Api/Services/Connect.php | 2 +- app/Http/Home/Services/Connect.php | 2 +- app/Listeners/Account.php | 2 +- app/Models/Task.php | 2 +- app/Services/LiveNotify.php | 2 +- app/Services/Logic/Answer/AnswerAccept.php | 2 +- app/Services/Logic/Answer/AnswerCreate.php | 2 +- app/Services/Logic/Answer/AnswerLike.php | 2 +- .../Logic/Article/ArticleFavorite.php | 2 +- app/Services/Logic/Article/ArticleLike.php | 2 +- .../Logic/Comment/AfterCreateTrait.php | 8 +-- app/Services/Logic/Comment/CommentLike.php | 2 +- app/Services/Logic/Consult/ConsultCreate.php | 2 +- app/Services/Logic/Consult/ConsultLike.php | 2 +- app/Services/Logic/Consult/ConsultReply.php | 2 +- .../Logic/Notice/DingTalk/CustomService.php | 68 ------------------- .../Notice/{ => External}/AccountLogin.php | 4 +- .../Notice/{ => External}/ConsultReply.php | 6 +- .../{ => External}/DingTalk/ConsultCreate.php | 2 +- .../DingTalk/PointGiftRedeem.php | 2 +- .../{ => External}/DingTalk/ServerMonitor.php | 2 +- .../{ => External}/DingTalk/TeacherLive.php | 2 +- .../Logic/Notice/{ => External}/LiveBegin.php | 6 +- .../Logic/Notice/{ => External}/Mail/Test.php | 2 +- .../Notice/{ => External}/Mail/Verify.php | 2 +- .../Notice/{ => External}/OrderFinish.php | 6 +- .../{ => External}/PointGoodsDeliver.php | 6 +- .../Notice/{ => External}/RefundFinish.php | 6 +- .../{ => External}/Sms/ConsultReply.php | 2 +- .../{ => External}/Sms/GoodsDeliver.php | 2 +- .../Notice/{ => External}/Sms/LiveBegin.php | 2 +- .../Notice/{ => External}/Sms/OrderFinish.php | 2 +- .../{ => External}/Sms/RefundFinish.php | 2 +- .../Logic/Notice/{ => External}/Sms/Test.php | 2 +- .../Notice/{ => External}/Sms/Verify.php | 2 +- .../{ => External}/WeChat/AccountLogin.php | 2 +- .../{ => External}/WeChat/ConsultReply.php | 2 +- .../{ => External}/WeChat/GoodsDeliver.php | 2 +- .../{ => External}/WeChat/LiveBegin.php | 2 +- .../{ => External}/WeChat/OrderFinish.php | 2 +- .../{ => External}/WeChat/RefundFinish.php | 2 +- .../{System => Internal}/AnswerAccepted.php | 2 +- .../{System => Internal}/AnswerApproved.php | 2 +- .../{System => Internal}/AnswerCommented.php | 2 +- .../{System => Internal}/AnswerLiked.php | 2 +- .../{System => Internal}/AnswerRejected.php | 2 +- .../{System => Internal}/ArticleApproved.php | 2 +- .../{System => Internal}/ArticleCommented.php | 2 +- .../{System => Internal}/ArticleDeleted.php | 2 +- .../{System => Internal}/ArticleFavorited.php | 2 +- .../{System => Internal}/ArticleLiked.php | 2 +- .../{System => Internal}/ArticleRejected.php | 2 +- .../{System => Internal}/ChapterCommented.php | 2 +- .../{System => Internal}/CommentLiked.php | 2 +- .../{System => Internal}/CommentReplied.php | 2 +- .../{System => Internal}/ConsultLiked.php | 2 +- .../{System => Internal}/QuestionAnswered.php | 2 +- .../{System => Internal}/QuestionApproved.php | 2 +- .../QuestionCommented.php | 2 +- .../QuestionFavorited.php | 2 +- .../{System => Internal}/QuestionLiked.php | 2 +- .../{System => Internal}/QuestionRejected.php | 2 +- .../{System => Internal}/ReviewLiked.php | 2 +- .../Logic/Question/QuestionFavorite.php | 2 +- app/Services/Logic/Question/QuestionLike.php | 2 +- app/Services/Logic/Review/ReviewLike.php | 2 +- app/Services/Logic/Verify/MailCode.php | 2 +- app/Services/Logic/Verify/SmsCode.php | 2 +- 80 files changed, 106 insertions(+), 186 deletions(-) delete mode 100644 app/Services/Logic/Notice/DingTalk/CustomService.php rename app/Services/Logic/Notice/{ => External}/AccountLogin.php (93%) rename app/Services/Logic/Notice/{ => External}/ConsultReply.php (94%) rename app/Services/Logic/Notice/{ => External}/DingTalk/ConsultCreate.php (97%) rename app/Services/Logic/Notice/{ => External}/DingTalk/PointGiftRedeem.php (96%) rename app/Services/Logic/Notice/{ => External}/DingTalk/ServerMonitor.php (94%) rename app/Services/Logic/Notice/{ => External}/DingTalk/TeacherLive.php (96%) rename app/Services/Logic/Notice/{ => External}/LiveBegin.php (94%) rename app/Services/Logic/Notice/{ => External}/Mail/Test.php (94%) rename app/Services/Logic/Notice/{ => External}/Mail/Verify.php (96%) rename app/Services/Logic/Notice/{ => External}/OrderFinish.php (93%) rename app/Services/Logic/Notice/{ => External}/PointGoodsDeliver.php (93%) rename app/Services/Logic/Notice/{ => External}/RefundFinish.php (93%) rename app/Services/Logic/Notice/{ => External}/Sms/ConsultReply.php (94%) rename app/Services/Logic/Notice/{ => External}/Sms/GoodsDeliver.php (95%) rename app/Services/Logic/Notice/{ => External}/Sms/LiveBegin.php (95%) rename app/Services/Logic/Notice/{ => External}/Sms/OrderFinish.php (94%) rename app/Services/Logic/Notice/{ => External}/Sms/RefundFinish.php (94%) rename app/Services/Logic/Notice/{ => External}/Sms/Test.php (89%) rename app/Services/Logic/Notice/{ => External}/Sms/Verify.php (93%) rename app/Services/Logic/Notice/{ => External}/WeChat/AccountLogin.php (96%) rename app/Services/Logic/Notice/{ => External}/WeChat/ConsultReply.php (95%) rename app/Services/Logic/Notice/{ => External}/WeChat/GoodsDeliver.php (95%) rename app/Services/Logic/Notice/{ => External}/WeChat/LiveBegin.php (95%) rename app/Services/Logic/Notice/{ => External}/WeChat/OrderFinish.php (95%) rename app/Services/Logic/Notice/{ => External}/WeChat/RefundFinish.php (95%) rename app/Services/Logic/Notice/{System => Internal}/AnswerAccepted.php (96%) rename app/Services/Logic/Notice/{System => Internal}/AnswerApproved.php (96%) rename app/Services/Logic/Notice/{System => Internal}/AnswerCommented.php (96%) rename app/Services/Logic/Notice/{System => Internal}/AnswerLiked.php (96%) rename app/Services/Logic/Notice/{System => Internal}/AnswerRejected.php (96%) rename app/Services/Logic/Notice/{System => Internal}/ArticleApproved.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ArticleCommented.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ArticleDeleted.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ArticleFavorited.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ArticleLiked.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ArticleRejected.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ChapterCommented.php (88%) rename app/Services/Logic/Notice/{System => Internal}/CommentLiked.php (95%) rename app/Services/Logic/Notice/{System => Internal}/CommentReplied.php (96%) rename app/Services/Logic/Notice/{System => Internal}/ConsultLiked.php (96%) rename app/Services/Logic/Notice/{System => Internal}/QuestionAnswered.php (96%) rename app/Services/Logic/Notice/{System => Internal}/QuestionApproved.php (95%) rename app/Services/Logic/Notice/{System => Internal}/QuestionCommented.php (95%) rename app/Services/Logic/Notice/{System => Internal}/QuestionFavorited.php (95%) rename app/Services/Logic/Notice/{System => Internal}/QuestionLiked.php (95%) rename app/Services/Logic/Notice/{System => Internal}/QuestionRejected.php (95%) rename app/Services/Logic/Notice/{System => Internal}/ReviewLiked.php (96%) diff --git a/app/Console/Tasks/DeliverTask.php b/app/Console/Tasks/DeliverTask.php index de42c7ea..41608ae9 100644 --- a/app/Console/Tasks/DeliverTask.php +++ b/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; diff --git a/app/Console/Tasks/NoticeTask.php b/app/Console/Tasks/NoticeTask.php index d8ec1d8b..dddf3a96 100644 --- a/app/Console/Tasks/NoticeTask.php +++ b/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; diff --git a/app/Console/Tasks/PointGiftDeliverTask.php b/app/Console/Tasks/PointGiftDeliverTask.php index b1553501..f5437a63 100644 --- a/app/Console/Tasks/PointGiftDeliverTask.php +++ b/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; diff --git a/app/Console/Tasks/RefundTask.php b/app/Console/Tasks/RefundTask.php index 4ad651df..108cc60e 100644 --- a/app/Console/Tasks/RefundTask.php +++ b/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; diff --git a/app/Console/Tasks/ServerMonitorTask.php b/app/Console/Tasks/ServerMonitorTask.php index 44ff4f3e..897d5999 100644 --- a/app/Console/Tasks/ServerMonitorTask.php +++ b/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; diff --git a/app/Console/Tasks/TeacherLiveNoticeTask.php b/app/Console/Tasks/TeacherLiveNoticeTask.php index e8e982f6..6b3ddb0d 100644 --- a/app/Console/Tasks/TeacherLiveNoticeTask.php +++ b/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; diff --git a/app/Http/Admin/Controllers/TestController.php b/app/Http/Admin/Controllers/TestController.php index e72d30a8..e7c4a5c5 100644 --- a/app/Http/Admin/Controllers/TestController.php +++ b/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; diff --git a/app/Http/Admin/Services/Answer.php b/app/Http/Admin/Services/Answer.php index 7a1cf0aa..1b2f527a 100644 --- a/app/Http/Admin/Services/Answer.php +++ b/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; diff --git a/app/Http/Admin/Services/Article.php b/app/Http/Admin/Services/Article.php index e796ee74..3ba1443e 100644 --- a/app/Http/Admin/Services/Article.php +++ b/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; diff --git a/app/Http/Admin/Services/Consult.php b/app/Http/Admin/Services/Consult.php index e0c416b8..4934ff69 100644 --- a/app/Http/Admin/Services/Consult.php +++ b/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 diff --git a/app/Http/Admin/Services/PointGiftRedeem.php b/app/Http/Admin/Services/PointGiftRedeem.php index da0705f4..e6ba897c 100644 --- a/app/Http/Admin/Services/PointGiftRedeem.php +++ b/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 diff --git a/app/Http/Admin/Services/Question.php b/app/Http/Admin/Services/Question.php index 71caa2b8..d882b35d 100644 --- a/app/Http/Admin/Services/Question.php +++ b/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; diff --git a/app/Http/Api/Services/Connect.php b/app/Http/Api/Services/Connect.php index fde7af49..5d334be4 100644 --- a/app/Http/Api/Services/Connect.php +++ b/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; diff --git a/app/Http/Home/Services/Connect.php b/app/Http/Home/Services/Connect.php index df7b7c9f..f2c1eabf 100644 --- a/app/Http/Home/Services/Connect.php +++ b/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; diff --git a/app/Listeners/Account.php b/app/Listeners/Account.php index de016130..ee2ffda9 100644 --- a/app/Listeners/Account.php +++ b/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; diff --git a/app/Models/Task.php b/app/Models/Task.php index 70ba6e03..2a0851dd 100644 --- a/app/Models/Task.php +++ b/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; // 抽奖兑换通知 diff --git a/app/Services/LiveNotify.php b/app/Services/LiveNotify.php index bb1b5d46..5ae0554c 100644 --- a/app/Services/LiveNotify.php +++ b/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 diff --git a/app/Services/Logic/Answer/AnswerAccept.php b/app/Services/Logic/Answer/AnswerAccept.php index 61c7dcde..c005e43e 100644 --- a/app/Services/Logic/Answer/AnswerAccept.php +++ b/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; diff --git a/app/Services/Logic/Answer/AnswerCreate.php b/app/Services/Logic/Answer/AnswerCreate.php index 1d8579ad..bee9d861 100644 --- a/app/Services/Logic/Answer/AnswerCreate.php +++ b/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; diff --git a/app/Services/Logic/Answer/AnswerLike.php b/app/Services/Logic/Answer/AnswerLike.php index f0ff5e9b..f27fc3f4 100644 --- a/app/Services/Logic/Answer/AnswerLike.php +++ b/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; diff --git a/app/Services/Logic/Article/ArticleFavorite.php b/app/Services/Logic/Article/ArticleFavorite.php index 143b3f37..abebf979 100644 --- a/app/Services/Logic/Article/ArticleFavorite.php +++ b/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; diff --git a/app/Services/Logic/Article/ArticleLike.php b/app/Services/Logic/Article/ArticleLike.php index f4786206..76ee55b3 100644 --- a/app/Services/Logic/Article/ArticleLike.php +++ b/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; diff --git a/app/Services/Logic/Comment/AfterCreateTrait.php b/app/Services/Logic/Comment/AfterCreateTrait.php index 7da45c12..9dc674cc 100644 --- a/app/Services/Logic/Comment/AfterCreateTrait.php +++ b/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 diff --git a/app/Services/Logic/Comment/CommentLike.php b/app/Services/Logic/Comment/CommentLike.php index 481ae526..33d77a83 100644 --- a/app/Services/Logic/Comment/CommentLike.php +++ b/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; diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php index 0cfe85fd..28f52634 100644 --- a/app/Services/Logic/Consult/ConsultCreate.php +++ b/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; diff --git a/app/Services/Logic/Consult/ConsultLike.php b/app/Services/Logic/Consult/ConsultLike.php index ffb68d73..c062d22c 100644 --- a/app/Services/Logic/Consult/ConsultLike.php +++ b/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; diff --git a/app/Services/Logic/Consult/ConsultReply.php b/app/Services/Logic/Consult/ConsultReply.php index 9ee6f491..91ab3fc5 100644 --- a/app/Services/Logic/Consult/ConsultReply.php +++ b/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; diff --git a/app/Services/Logic/Notice/DingTalk/CustomService.php b/app/Services/Logic/Notice/DingTalk/CustomService.php deleted file mode 100644 index aa04eda8..00000000 --- a/app/Services/Logic/Notice/DingTalk/CustomService.php +++ /dev/null @@ -1,68 +0,0 @@ -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(); - } - -} \ No newline at end of file diff --git a/app/Services/Logic/Notice/AccountLogin.php b/app/Services/Logic/Notice/External/AccountLogin.php similarity index 93% rename from app/Services/Logic/Notice/AccountLogin.php rename to app/Services/Logic/Notice/External/AccountLogin.php index 34f866f9..a98aa06d 100644 --- a/app/Services/Logic/Notice/AccountLogin.php +++ b/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; diff --git a/app/Services/Logic/Notice/ConsultReply.php b/app/Services/Logic/Notice/External/ConsultReply.php similarity index 94% rename from app/Services/Logic/Notice/ConsultReply.php rename to app/Services/Logic/Notice/External/ConsultReply.php index 75fe438f..a5d7a35a 100644 --- a/app/Services/Logic/Notice/ConsultReply.php +++ b/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 diff --git a/app/Services/Logic/Notice/DingTalk/ConsultCreate.php b/app/Services/Logic/Notice/External/DingTalk/ConsultCreate.php similarity index 97% rename from app/Services/Logic/Notice/DingTalk/ConsultCreate.php rename to app/Services/Logic/Notice/External/DingTalk/ConsultCreate.php index f0f348e7..6ffd9c00 100644 --- a/app/Services/Logic/Notice/DingTalk/ConsultCreate.php +++ b/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; diff --git a/app/Services/Logic/Notice/DingTalk/PointGiftRedeem.php b/app/Services/Logic/Notice/External/DingTalk/PointGiftRedeem.php similarity index 96% rename from app/Services/Logic/Notice/DingTalk/PointGiftRedeem.php rename to app/Services/Logic/Notice/External/DingTalk/PointGiftRedeem.php index 8da60655..7ca2f9a1 100644 --- a/app/Services/Logic/Notice/DingTalk/PointGiftRedeem.php +++ b/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; diff --git a/app/Services/Logic/Notice/DingTalk/ServerMonitor.php b/app/Services/Logic/Notice/External/DingTalk/ServerMonitor.php similarity index 94% rename from app/Services/Logic/Notice/DingTalk/ServerMonitor.php rename to app/Services/Logic/Notice/External/DingTalk/ServerMonitor.php index c64d1e69..01045ab5 100644 --- a/app/Services/Logic/Notice/DingTalk/ServerMonitor.php +++ b/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; diff --git a/app/Services/Logic/Notice/DingTalk/TeacherLive.php b/app/Services/Logic/Notice/External/DingTalk/TeacherLive.php similarity index 96% rename from app/Services/Logic/Notice/DingTalk/TeacherLive.php rename to app/Services/Logic/Notice/External/DingTalk/TeacherLive.php index df9e62f9..5f3ac152 100644 --- a/app/Services/Logic/Notice/DingTalk/TeacherLive.php +++ b/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; diff --git a/app/Services/Logic/Notice/LiveBegin.php b/app/Services/Logic/Notice/External/LiveBegin.php similarity index 94% rename from app/Services/Logic/Notice/LiveBegin.php rename to app/Services/Logic/Notice/External/LiveBegin.php index b61bd0fb..84633e69 100644 --- a/app/Services/Logic/Notice/LiveBegin.php +++ b/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 diff --git a/app/Services/Logic/Notice/Mail/Test.php b/app/Services/Logic/Notice/External/Mail/Test.php similarity index 94% rename from app/Services/Logic/Notice/Mail/Test.php rename to app/Services/Logic/Notice/External/Mail/Test.php index c4a245c7..313a5e55 100644 --- a/app/Services/Logic/Notice/Mail/Test.php +++ b/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; diff --git a/app/Services/Logic/Notice/Mail/Verify.php b/app/Services/Logic/Notice/External/Mail/Verify.php similarity index 96% rename from app/Services/Logic/Notice/Mail/Verify.php rename to app/Services/Logic/Notice/External/Mail/Verify.php index 12365c09..b760afaa 100644 --- a/app/Services/Logic/Notice/Mail/Verify.php +++ b/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; diff --git a/app/Services/Logic/Notice/OrderFinish.php b/app/Services/Logic/Notice/External/OrderFinish.php similarity index 93% rename from app/Services/Logic/Notice/OrderFinish.php rename to app/Services/Logic/Notice/External/OrderFinish.php index 449b4cd2..05ffd272 100644 --- a/app/Services/Logic/Notice/OrderFinish.php +++ b/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 diff --git a/app/Services/Logic/Notice/PointGoodsDeliver.php b/app/Services/Logic/Notice/External/PointGoodsDeliver.php similarity index 93% rename from app/Services/Logic/Notice/PointGoodsDeliver.php rename to app/Services/Logic/Notice/External/PointGoodsDeliver.php index b5946db7..ab886944 100644 --- a/app/Services/Logic/Notice/PointGoodsDeliver.php +++ b/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 diff --git a/app/Services/Logic/Notice/RefundFinish.php b/app/Services/Logic/Notice/External/RefundFinish.php similarity index 93% rename from app/Services/Logic/Notice/RefundFinish.php rename to app/Services/Logic/Notice/External/RefundFinish.php index 8c8d83ef..baaefe5f 100644 --- a/app/Services/Logic/Notice/RefundFinish.php +++ b/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 diff --git a/app/Services/Logic/Notice/Sms/ConsultReply.php b/app/Services/Logic/Notice/External/Sms/ConsultReply.php similarity index 94% rename from app/Services/Logic/Notice/Sms/ConsultReply.php rename to app/Services/Logic/Notice/External/Sms/ConsultReply.php index e58f9ef9..74ee6a63 100644 --- a/app/Services/Logic/Notice/Sms/ConsultReply.php +++ b/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; diff --git a/app/Services/Logic/Notice/Sms/GoodsDeliver.php b/app/Services/Logic/Notice/External/Sms/GoodsDeliver.php similarity index 95% rename from app/Services/Logic/Notice/Sms/GoodsDeliver.php rename to app/Services/Logic/Notice/External/Sms/GoodsDeliver.php index 958f6ade..69324c56 100644 --- a/app/Services/Logic/Notice/Sms/GoodsDeliver.php +++ b/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; diff --git a/app/Services/Logic/Notice/Sms/LiveBegin.php b/app/Services/Logic/Notice/External/Sms/LiveBegin.php similarity index 95% rename from app/Services/Logic/Notice/Sms/LiveBegin.php rename to app/Services/Logic/Notice/External/Sms/LiveBegin.php index 7b2f4620..0ee9bf9f 100644 --- a/app/Services/Logic/Notice/Sms/LiveBegin.php +++ b/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; diff --git a/app/Services/Logic/Notice/Sms/OrderFinish.php b/app/Services/Logic/Notice/External/Sms/OrderFinish.php similarity index 94% rename from app/Services/Logic/Notice/Sms/OrderFinish.php rename to app/Services/Logic/Notice/External/Sms/OrderFinish.php index 851ebabb..8ae436f6 100644 --- a/app/Services/Logic/Notice/Sms/OrderFinish.php +++ b/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; diff --git a/app/Services/Logic/Notice/Sms/RefundFinish.php b/app/Services/Logic/Notice/External/Sms/RefundFinish.php similarity index 94% rename from app/Services/Logic/Notice/Sms/RefundFinish.php rename to app/Services/Logic/Notice/External/Sms/RefundFinish.php index fd577b81..2d7c59b3 100644 --- a/app/Services/Logic/Notice/Sms/RefundFinish.php +++ b/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; diff --git a/app/Services/Logic/Notice/Sms/Test.php b/app/Services/Logic/Notice/External/Sms/Test.php similarity index 89% rename from app/Services/Logic/Notice/Sms/Test.php rename to app/Services/Logic/Notice/External/Sms/Test.php index 9b06aa4b..99660fbd 100644 --- a/app/Services/Logic/Notice/Sms/Test.php +++ b/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; diff --git a/app/Services/Logic/Notice/Sms/Verify.php b/app/Services/Logic/Notice/External/Sms/Verify.php similarity index 93% rename from app/Services/Logic/Notice/Sms/Verify.php rename to app/Services/Logic/Notice/External/Sms/Verify.php index e43eb4ee..a4c983ef 100644 --- a/app/Services/Logic/Notice/Sms/Verify.php +++ b/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; diff --git a/app/Services/Logic/Notice/WeChat/AccountLogin.php b/app/Services/Logic/Notice/External/WeChat/AccountLogin.php similarity index 96% rename from app/Services/Logic/Notice/WeChat/AccountLogin.php rename to app/Services/Logic/Notice/External/WeChat/AccountLogin.php index 7ae8e998..09410124 100644 --- a/app/Services/Logic/Notice/WeChat/AccountLogin.php +++ b/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; diff --git a/app/Services/Logic/Notice/WeChat/ConsultReply.php b/app/Services/Logic/Notice/External/WeChat/ConsultReply.php similarity index 95% rename from app/Services/Logic/Notice/WeChat/ConsultReply.php rename to app/Services/Logic/Notice/External/WeChat/ConsultReply.php index 548fba29..ad13f2c3 100644 --- a/app/Services/Logic/Notice/WeChat/ConsultReply.php +++ b/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; diff --git a/app/Services/Logic/Notice/WeChat/GoodsDeliver.php b/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php similarity index 95% rename from app/Services/Logic/Notice/WeChat/GoodsDeliver.php rename to app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php index 75f33c53..7d61787d 100644 --- a/app/Services/Logic/Notice/WeChat/GoodsDeliver.php +++ b/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; diff --git a/app/Services/Logic/Notice/WeChat/LiveBegin.php b/app/Services/Logic/Notice/External/WeChat/LiveBegin.php similarity index 95% rename from app/Services/Logic/Notice/WeChat/LiveBegin.php rename to app/Services/Logic/Notice/External/WeChat/LiveBegin.php index cd987666..228e9d2d 100644 --- a/app/Services/Logic/Notice/WeChat/LiveBegin.php +++ b/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; diff --git a/app/Services/Logic/Notice/WeChat/OrderFinish.php b/app/Services/Logic/Notice/External/WeChat/OrderFinish.php similarity index 95% rename from app/Services/Logic/Notice/WeChat/OrderFinish.php rename to app/Services/Logic/Notice/External/WeChat/OrderFinish.php index 6a4b509c..a8927dcc 100644 --- a/app/Services/Logic/Notice/WeChat/OrderFinish.php +++ b/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; diff --git a/app/Services/Logic/Notice/WeChat/RefundFinish.php b/app/Services/Logic/Notice/External/WeChat/RefundFinish.php similarity index 95% rename from app/Services/Logic/Notice/WeChat/RefundFinish.php rename to app/Services/Logic/Notice/External/WeChat/RefundFinish.php index 35387dc8..11d4e91c 100644 --- a/app/Services/Logic/Notice/WeChat/RefundFinish.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/AnswerAccepted.php b/app/Services/Logic/Notice/Internal/AnswerAccepted.php similarity index 96% rename from app/Services/Logic/Notice/System/AnswerAccepted.php rename to app/Services/Logic/Notice/Internal/AnswerAccepted.php index 6f8ffb15..4e13b1ff 100644 --- a/app/Services/Logic/Notice/System/AnswerAccepted.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/AnswerApproved.php b/app/Services/Logic/Notice/Internal/AnswerApproved.php similarity index 96% rename from app/Services/Logic/Notice/System/AnswerApproved.php rename to app/Services/Logic/Notice/Internal/AnswerApproved.php index 6a0a8e37..1f834b91 100644 --- a/app/Services/Logic/Notice/System/AnswerApproved.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/AnswerCommented.php b/app/Services/Logic/Notice/Internal/AnswerCommented.php similarity index 96% rename from app/Services/Logic/Notice/System/AnswerCommented.php rename to app/Services/Logic/Notice/Internal/AnswerCommented.php index 4d19f15c..bfd4aa62 100644 --- a/app/Services/Logic/Notice/System/AnswerCommented.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/AnswerLiked.php b/app/Services/Logic/Notice/Internal/AnswerLiked.php similarity index 96% rename from app/Services/Logic/Notice/System/AnswerLiked.php rename to app/Services/Logic/Notice/Internal/AnswerLiked.php index 761b5b80..45795352 100644 --- a/app/Services/Logic/Notice/System/AnswerLiked.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/AnswerRejected.php b/app/Services/Logic/Notice/Internal/AnswerRejected.php similarity index 96% rename from app/Services/Logic/Notice/System/AnswerRejected.php rename to app/Services/Logic/Notice/Internal/AnswerRejected.php index 9c19ee78..23d6c2ad 100644 --- a/app/Services/Logic/Notice/System/AnswerRejected.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ArticleApproved.php b/app/Services/Logic/Notice/Internal/ArticleApproved.php similarity index 95% rename from app/Services/Logic/Notice/System/ArticleApproved.php rename to app/Services/Logic/Notice/Internal/ArticleApproved.php index 1ac5d67f..ea841823 100644 --- a/app/Services/Logic/Notice/System/ArticleApproved.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ArticleCommented.php b/app/Services/Logic/Notice/Internal/ArticleCommented.php similarity index 95% rename from app/Services/Logic/Notice/System/ArticleCommented.php rename to app/Services/Logic/Notice/Internal/ArticleCommented.php index 35e5e800..f8ceb1f7 100644 --- a/app/Services/Logic/Notice/System/ArticleCommented.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ArticleDeleted.php b/app/Services/Logic/Notice/Internal/ArticleDeleted.php similarity index 95% rename from app/Services/Logic/Notice/System/ArticleDeleted.php rename to app/Services/Logic/Notice/Internal/ArticleDeleted.php index 5274dd0b..fc96da72 100644 --- a/app/Services/Logic/Notice/System/ArticleDeleted.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ArticleFavorited.php b/app/Services/Logic/Notice/Internal/ArticleFavorited.php similarity index 95% rename from app/Services/Logic/Notice/System/ArticleFavorited.php rename to app/Services/Logic/Notice/Internal/ArticleFavorited.php index 1da199f5..d3272302 100644 --- a/app/Services/Logic/Notice/System/ArticleFavorited.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ArticleLiked.php b/app/Services/Logic/Notice/Internal/ArticleLiked.php similarity index 95% rename from app/Services/Logic/Notice/System/ArticleLiked.php rename to app/Services/Logic/Notice/Internal/ArticleLiked.php index 9c817675..220ec0e5 100644 --- a/app/Services/Logic/Notice/System/ArticleLiked.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ArticleRejected.php b/app/Services/Logic/Notice/Internal/ArticleRejected.php similarity index 95% rename from app/Services/Logic/Notice/System/ArticleRejected.php rename to app/Services/Logic/Notice/Internal/ArticleRejected.php index 33c5c975..6d94e887 100644 --- a/app/Services/Logic/Notice/System/ArticleRejected.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ChapterCommented.php b/app/Services/Logic/Notice/Internal/ChapterCommented.php similarity index 88% rename from app/Services/Logic/Notice/System/ChapterCommented.php rename to app/Services/Logic/Notice/Internal/ChapterCommented.php index 23094b65..dc9f6018 100644 --- a/app/Services/Logic/Notice/System/ChapterCommented.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/CommentLiked.php b/app/Services/Logic/Notice/Internal/CommentLiked.php similarity index 95% rename from app/Services/Logic/Notice/System/CommentLiked.php rename to app/Services/Logic/Notice/Internal/CommentLiked.php index 7a33edf5..6c250b6b 100644 --- a/app/Services/Logic/Notice/System/CommentLiked.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/CommentReplied.php b/app/Services/Logic/Notice/Internal/CommentReplied.php similarity index 96% rename from app/Services/Logic/Notice/System/CommentReplied.php rename to app/Services/Logic/Notice/Internal/CommentReplied.php index 1608daf0..c7cace7f 100644 --- a/app/Services/Logic/Notice/System/CommentReplied.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ConsultLiked.php b/app/Services/Logic/Notice/Internal/ConsultLiked.php similarity index 96% rename from app/Services/Logic/Notice/System/ConsultLiked.php rename to app/Services/Logic/Notice/Internal/ConsultLiked.php index 98459fb4..bb40c7c2 100644 --- a/app/Services/Logic/Notice/System/ConsultLiked.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/QuestionAnswered.php b/app/Services/Logic/Notice/Internal/QuestionAnswered.php similarity index 96% rename from app/Services/Logic/Notice/System/QuestionAnswered.php rename to app/Services/Logic/Notice/Internal/QuestionAnswered.php index 6b5e8518..0ab81dd6 100644 --- a/app/Services/Logic/Notice/System/QuestionAnswered.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/QuestionApproved.php b/app/Services/Logic/Notice/Internal/QuestionApproved.php similarity index 95% rename from app/Services/Logic/Notice/System/QuestionApproved.php rename to app/Services/Logic/Notice/Internal/QuestionApproved.php index 51501f06..1e498da4 100644 --- a/app/Services/Logic/Notice/System/QuestionApproved.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/QuestionCommented.php b/app/Services/Logic/Notice/Internal/QuestionCommented.php similarity index 95% rename from app/Services/Logic/Notice/System/QuestionCommented.php rename to app/Services/Logic/Notice/Internal/QuestionCommented.php index 19f51028..9e8b5771 100644 --- a/app/Services/Logic/Notice/System/QuestionCommented.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/QuestionFavorited.php b/app/Services/Logic/Notice/Internal/QuestionFavorited.php similarity index 95% rename from app/Services/Logic/Notice/System/QuestionFavorited.php rename to app/Services/Logic/Notice/Internal/QuestionFavorited.php index 2b43edba..9238652a 100644 --- a/app/Services/Logic/Notice/System/QuestionFavorited.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/QuestionLiked.php b/app/Services/Logic/Notice/Internal/QuestionLiked.php similarity index 95% rename from app/Services/Logic/Notice/System/QuestionLiked.php rename to app/Services/Logic/Notice/Internal/QuestionLiked.php index 4ee98640..574720b9 100644 --- a/app/Services/Logic/Notice/System/QuestionLiked.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/QuestionRejected.php b/app/Services/Logic/Notice/Internal/QuestionRejected.php similarity index 95% rename from app/Services/Logic/Notice/System/QuestionRejected.php rename to app/Services/Logic/Notice/Internal/QuestionRejected.php index 9627ffd5..6aed9e36 100644 --- a/app/Services/Logic/Notice/System/QuestionRejected.php +++ b/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; diff --git a/app/Services/Logic/Notice/System/ReviewLiked.php b/app/Services/Logic/Notice/Internal/ReviewLiked.php similarity index 96% rename from app/Services/Logic/Notice/System/ReviewLiked.php rename to app/Services/Logic/Notice/Internal/ReviewLiked.php index 69371a7a..05b39573 100644 --- a/app/Services/Logic/Notice/System/ReviewLiked.php +++ b/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; diff --git a/app/Services/Logic/Question/QuestionFavorite.php b/app/Services/Logic/Question/QuestionFavorite.php index 3280d5ef..a2495b0f 100644 --- a/app/Services/Logic/Question/QuestionFavorite.php +++ b/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; diff --git a/app/Services/Logic/Question/QuestionLike.php b/app/Services/Logic/Question/QuestionLike.php index d8ecb9bf..0f01de50 100644 --- a/app/Services/Logic/Question/QuestionLike.php +++ b/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; diff --git a/app/Services/Logic/Review/ReviewLike.php b/app/Services/Logic/Review/ReviewLike.php index c0351269..8efd4000 100644 --- a/app/Services/Logic/Review/ReviewLike.php +++ b/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; diff --git a/app/Services/Logic/Verify/MailCode.php b/app/Services/Logic/Verify/MailCode.php index 20bc4567..48b317b7 100644 --- a/app/Services/Logic/Verify/MailCode.php +++ b/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; diff --git a/app/Services/Logic/Verify/SmsCode.php b/app/Services/Logic/Verify/SmsCode.php index 5e54575b..b7ad8c71 100644 --- a/app/Services/Logic/Verify/SmsCode.php +++ b/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;