diff --git a/.gitignore b/.gitignore
index 5870809d..4a25f9b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
/config/xs.course.ini
/config/xs.article.ini
/config/xs.question.ini
-/config/xs.user.ini
/config/alipay/*.crt
/config/wxpay/*.pem
/db/migrations/schema.php
diff --git a/README.md b/README.md
index 5fada448..f5664db8 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展框架Phalcon开发，GPL-2.0开源协议，致力开源网课系统，开源网校系统，开源知识付费系统，开源在线教育系统。
-
-
-
-
+
+
+
+
### 系统功能
@@ -69,12 +69,12 @@ Tips: 请用手机注册一个新账号，用户中心 -> 关注订阅，扫码
### 项目文档
-- [运行环境搭建](https://koogua.com/page/wiki)
-- [系统服务配置](https://koogua.com/page/wiki)
-- [客户终端配置](https://koogua.com/page/wiki)
+- [运行环境搭建](https://www.koogua.com/page/wiki)
+- [系统服务配置](https://www.koogua.com/page/wiki)
+- [客户终端配置](https://www.koogua.com/page/wiki)
### 意见反馈
- [码云平台](https://gitee.com/koogua/course-tencent-cloud/issues)
-- [官方社区](https://koogua.com/community)
+- [官方社区](https://www.koogua.com/community)
- QQ交流群: 787363898
diff --git a/app/Console/Tasks/CleanDemoDataTask.php b/app/Console/Tasks/CleanDemoDataTask.php
index b53f97a1..b6de241d 100644
--- a/app/Console/Tasks/CleanDemoDataTask.php
+++ b/app/Console/Tasks/CleanDemoDataTask.php
@@ -104,14 +104,8 @@ class CleanDemoDataTask extends Task
$courseIndexTask = new CourseIndexTask();
$courseIndexTask->cleanAction();
- $groupIndexTask = new GroupIndexTask();
- $groupIndexTask->cleanAction();
-
$questionIndexTask = new QuestionIndexTask();
$questionIndexTask->cleanAction();
-
- $userIndexTask = new UserIndexTask();
- $userIndexTask->cleanAction();
}
protected function isDemoEnv()
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/SyncUserIndexTask.php b/app/Console/Tasks/SyncUserIndexTask.php
deleted file mode 100644
index 554e7e70..00000000
--- a/app/Console/Tasks/SyncUserIndexTask.php
+++ /dev/null
@@ -1,65 +0,0 @@
-getRedis();
-
- $key = $this->getSyncKey();
-
- $userIds = $redis->sRandMember($key, 1000);
-
- if (!$userIds) return;
-
- $userRepo = new UserRepo();
-
- $users = $userRepo->findByIds($userIds);
-
- if ($users->count() == 0) return;
-
- $document = new UserDocument();
-
- $handler = new UserSearcher();
-
- $index = $handler->getXS()->getIndex();
-
- $index->openBuffer();
-
- foreach ($users as $user) {
-
- $doc = $document->setDocument($user);
-
- if ($user->deleted == 0) {
- $index->update($doc);
- } else {
- $index->del($user->id);
- }
- }
-
- $index->closeBuffer();
-
- $redis->sRem($key, ...$userIds);
- }
-
- protected function getSyncKey()
- {
- $sync = new UserIndexSync();
-
- return $sync->getSyncKey();
- }
-
-}
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/Console/Tasks/UserIndexTask.php b/app/Console/Tasks/UserIndexTask.php
deleted file mode 100644
index 77b0db5d..00000000
--- a/app/Console/Tasks/UserIndexTask.php
+++ /dev/null
@@ -1,154 +0,0 @@
-searchUsers($query);
-
- var_export($result);
- }
-
- /**
- * 清空索引
- *
- * @command: php console.php user_index clean
- */
- public function cleanAction()
- {
- $this->cleanUserIndex();
- }
-
- /**
- * 重建索引
- *
- * @command: php console.php user_index rebuild
- */
- public function rebuildAction()
- {
- $this->rebuildUserIndex();
- }
-
- /**
- * 清空索引
- */
- protected function cleanUserIndex()
- {
- $handler = new UserSearcher();
-
- $index = $handler->getXS()->getIndex();
-
- echo '------ start clean user index ------' . PHP_EOL;
-
- $index->clean();
-
- echo '------ end clean user index ------' . PHP_EOL;
- }
-
- /**
- * 重建索引
- */
- protected function rebuildUserIndex()
- {
- $limit = 1000;
-
- $totalCount = $this->countUsers();
-
- if ($totalCount == 0) return;
-
- $page = ceil($totalCount / $limit);
-
- $handler = new UserSearcher();
-
- $documenter = new UserDocument();
-
- $index = $handler->getXS()->getIndex();
-
- echo '------ start rebuild user index ------' . PHP_EOL;
-
- $index->beginRebuild();
-
- for ($i = 0; $i < $page; $i++) {
-
- $offset = $i * $limit;
-
- $users = $this->findUsers($limit, $offset);
-
- if ($users->count() == 0) break;
-
- foreach ($users as $user) {
- $document = $documenter->setDocument($user);
- $index->add($document);
- }
-
- echo "------ fetch users: {$limit},{$offset} ------" . PHP_EOL;
- }
-
- $index->endRebuild();
-
- echo '------ end rebuild user index ------' . PHP_EOL;
- }
-
- /**
- * 搜索课程
- *
- * @param string $query
- * @return array
- * @throws \XSException
- */
- protected function searchUsers($query)
- {
- $handler = new UserSearcher();
-
- return $handler->search($query);
- }
-
- /**
- * @param int $limit
- * @param int $offset
- * @return ResultsetInterface|Resultset|UserModel[]
- */
- protected function findUsers($limit, $offset)
- {
- return UserModel::query()
- ->where('deleted = 0')
- ->limit($limit, $offset)
- ->execute();
- }
-
- protected function countUsers()
- {
- $userRepo = new UserRepo();
-
- return $userRepo->countUsers();
- }
-
-}
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/Index.php b/app/Http/Admin/Services/Index.php
index 42f06887..b363b6bb 100644
--- a/app/Http/Admin/Services/Index.php
+++ b/app/Http/Admin/Services/Index.php
@@ -115,7 +115,7 @@ class Index extends Service
public function getReleases()
{
- $url = 'https://koogua.com/api/releases';
+ $url = 'https://www.koogua.com/api/releases';
$client = new Client();
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/Admin/Views/macros/group.volt b/app/Http/Admin/Views/macros/group.volt
deleted file mode 100644
index 98f9ea44..00000000
--- a/app/Http/Admin/Views/macros/group.volt
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- macro type_info(value) %}
- {% if value == 1 %}
- 课程
- {% elseif value == 2 %}
- 水吧
- {% elseif value == 3 %}
- 职工
- {% else %}
- 未知
- {% endif %}
-{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Api/Controllers/SearchController.php b/app/Http/Api/Controllers/SearchController.php
index 4b1cd272..9bd10ee2 100644
--- a/app/Http/Api/Controllers/SearchController.php
+++ b/app/Http/Api/Controllers/SearchController.php
@@ -9,9 +9,7 @@ namespace App\Http\Api\Controllers;
use App\Services\Logic\Search\Article as ArticleSearch;
use App\Services\Logic\Search\Course as CourseSearch;
-use App\Services\Logic\Search\Group as GroupSearch;
use App\Services\Logic\Search\Question as QuestionSearch;
-use App\Services\Logic\Search\User as UserSearch;
/**
* @RoutePrefix("/api/search")
@@ -46,7 +44,7 @@ class SearchController extends Controller
/**
* @param string $type
- * @return ArticleSearch|QuestionSearch|CourseSearch|GroupSearch|UserSearch
+ * @return ArticleSearch|QuestionSearch|CourseSearch
*/
protected function getSearchService($type)
{
@@ -57,12 +55,6 @@ class SearchController extends Controller
case 'question':
$service = new QuestionSearch();
break;
- case 'group':
- $service = new GroupSearch();
- break;
- case 'user':
- $service = new UserSearch();
- break;
default:
$service = new CourseSearch();
break;
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/Controllers/SearchController.php b/app/Http/Home/Controllers/SearchController.php
index 7d8a2571..c8498354 100644
--- a/app/Http/Home/Controllers/SearchController.php
+++ b/app/Http/Home/Controllers/SearchController.php
@@ -9,9 +9,7 @@ namespace App\Http\Home\Controllers;
use App\Services\Logic\Search\Article as ArticleSearchService;
use App\Services\Logic\Search\Course as CourseSearchService;
-use App\Services\Logic\Search\Group as GroupSearchService;
use App\Services\Logic\Search\Question as QuestionSearchService;
-use App\Services\Logic\Search\User as UserSearchService;
/**
* @RoutePrefix("/search")
@@ -48,7 +46,7 @@ class SearchController extends Controller
/**
* @param string $type
- * @return ArticleSearchService|QuestionSearchService|CourseSearchService|GroupSearchService|UserSearchService
+ * @return ArticleSearchService|QuestionSearchService|CourseSearchService
*/
protected function getSearchService($type)
{
@@ -59,12 +57,6 @@ class SearchController extends Controller
case 'question':
$service = new QuestionSearchService();
break;
- case 'group':
- $service = new GroupSearchService();
- break;
- case 'user':
- $service = new UserSearchService();
- break;
default:
$service = new CourseSearchService();
break;
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/Http/Home/Views/macros/group.volt b/app/Http/Home/Views/macros/group.volt
deleted file mode 100644
index 4a63a95a..00000000
--- a/app/Http/Home/Views/macros/group.volt
+++ /dev/null
@@ -1,9 +0,0 @@
-{%- macro type_info(value) %}
- {% if value == 1 %}
- 课程
- {% elseif value == 2 %}
- 水吧
- {% elseif value == 3 %}
- 职工
- {% endif %}
-{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/search/index.volt b/app/Http/Home/Views/search/index.volt
index e890f85f..9ca3d0e9 100644
--- a/app/Http/Home/Views/search/index.volt
+++ b/app/Http/Home/Views/search/index.volt
@@ -4,7 +4,7 @@
{{ partial('macros/course') }}
- {% set types = {'course':'课程','article':'专栏','question':'问答','user':'用户'} %}
+ {% set types = {'course':'课程','article':'专栏','question':'问答'} %}
{% set type = request.get('type','trim','course') %}
{% set query = request.get('query','striptags','') %}
@@ -39,10 +39,6 @@
{{ partial('search/question') }}
- {% elseif type == 'user' %}
-
- {{ partial('search/user') }}
-
{% endif %}
diff --git a/app/Http/Home/Views/search/user.volt b/app/Http/Home/Views/search/user.volt
deleted file mode 100644
index 0f7a07f1..00000000
--- a/app/Http/Home/Views/search/user.volt
+++ /dev/null
@@ -1,29 +0,0 @@
-{{ partial('macros/user') }}
-
-{% if pager.total_pages > 0 %}
-
- {% for item in pager.items %}
- {% set user_url = url({'for':'home.user.show','id':item.id}) %}
- {% set item.about = item.about|default('这个家伙真懒，什么也没有留下！') %}
-
-
-
-
-
{{ item.about }}
-
- 性别：{{ gender_info(item.gender) }}
- 地区：{{ item.area }}
-
-
-
- {% endfor %}
-
-
-