diff --git a/app/Caches/HelpList.php b/app/Caches/HelpList.php index 2b4c8ce2..0d0b31e6 100644 --- a/app/Caches/HelpList.php +++ b/app/Caches/HelpList.php @@ -42,13 +42,13 @@ class HelpList extends Cache 'name' => $category->name, ]; - $item['list'] = []; + $item['helps'] = []; $helps = $this->findHelps($category->id); if ($helps->count() > 0) { foreach ($helps as $help) { - $item['list'][] = [ + $item['helps'][] = [ 'id' => $help->id, 'title' => $help->title, ]; diff --git a/app/Caches/IndexFreeCourseList.php b/app/Caches/IndexFreeCourseList.php index 0f4dcc47..b6c69d67 100644 --- a/app/Caches/IndexFreeCourseList.php +++ b/app/Caches/IndexFreeCourseList.php @@ -28,8 +28,6 @@ class IndexFreeCourseList extends Cache public function getContent($id = null) { - $result = []; - $categoryLimit = 5; $courseLimit = 10; @@ -40,13 +38,19 @@ class IndexFreeCourseList extends Cache return []; } + $result = []; + foreach ($categories as $category) { - $categoryItem = [ + $item = []; + + $item['category'] = [ 'id' => $category->id, 'name' => $category->name, ]; + $item['courses'] = []; + $courses = $this->findCategoryCourses($category->id, $courseLimit); if ($courses->count() == 0) { @@ -69,9 +73,9 @@ class IndexFreeCourseList extends Cache ]; } - $categoryItem['courses'] = $categoryCourses; + $item['courses'] = $categoryCourses; - $result[] = $categoryItem; + $result[] = $item; } return $result; diff --git a/app/Caches/IndexNewCourseList.php b/app/Caches/IndexNewCourseList.php index 76582509..7cb627cf 100644 --- a/app/Caches/IndexNewCourseList.php +++ b/app/Caches/IndexNewCourseList.php @@ -28,8 +28,6 @@ class IndexNewCourseList extends Cache public function getContent($id = null) { - $result = []; - $categoryLimit = 5; $courseLimit = 10; @@ -40,13 +38,19 @@ class IndexNewCourseList extends Cache return []; } + $result = []; + foreach ($categories as $category) { - $categoryItem = [ + $item = []; + + $item['category'] = [ 'id' => $category->id, 'name' => $category->name, ]; + $item['courses'] = []; + $courses = $this->findCategoryCourses($category->id, $courseLimit); if ($courses->count() == 0) { @@ -69,9 +73,9 @@ class IndexNewCourseList extends Cache ]; } - $categoryItem['courses'] = $categoryCourses; + $item['courses'] = $categoryCourses; - $result[] = $categoryItem; + $result[] = $item; } return $result; diff --git a/app/Caches/IndexVipCourseList.php b/app/Caches/IndexVipCourseList.php index e97d1879..ab869db0 100644 --- a/app/Caches/IndexVipCourseList.php +++ b/app/Caches/IndexVipCourseList.php @@ -28,8 +28,6 @@ class IndexVipCourseList extends Cache public function getContent($id = null) { - $result = []; - $categoryLimit = 5; $courseLimit = 10; @@ -40,13 +38,19 @@ class IndexVipCourseList extends Cache return []; } + $result = []; + foreach ($categories as $category) { - $categoryItem = [ + $item = []; + + $item['category'] = [ 'id' => $category->id, 'name' => $category->name, ]; + $item['courses'] = []; + $courses = $this->findCategoryCourses($category->id, $courseLimit); if ($courses->count() == 0) { @@ -69,9 +73,9 @@ class IndexVipCourseList extends Cache ]; } - $categoryItem['courses'] = $categoryCourses; + $item['courses'] = $categoryCourses; - $result[] = $categoryItem; + $result[] = $item; } return $result; diff --git a/app/Console/Tasks/GroupIndexTask.php b/app/Console/Tasks/GroupIndexTask.php new file mode 100644 index 00000000..2cd79419 --- /dev/null +++ b/app/Console/Tasks/GroupIndexTask.php @@ -0,0 +1,128 @@ +searchGroups($query); + + var_export($result); + } + + /** + * 清空索引 + * + * @command: php console.php group_index clean + */ + public function cleanAction() + { + $this->cleanGroupIndex(); + } + + /** + * 重建索引 + * + * @command: php console.php group_index rebuild + */ + public function rebuildAction() + { + $this->rebuildGroupIndex(); + } + + /** + * 清空索引 + */ + protected function cleanGroupIndex() + { + $handler = new GroupSearcher(); + + $index = $handler->getXS()->getIndex(); + + echo "start clean index" . PHP_EOL; + + $index->clean(); + + echo "end clean index" . PHP_EOL; + } + + /** + * 重建索引 + */ + protected function rebuildGroupIndex() + { + $groups = $this->findGroups(); + + if ($groups->count() == 0) { + return; + } + + $handler = new GroupSearcher(); + + $documenter = new GroupDocument(); + + $index = $handler->getXS()->getIndex(); + + echo "start rebuild index" . PHP_EOL; + + $index->beginRebuild(); + + foreach ($groups as $group) { + $document = $documenter->setDocument($group); + $index->add($document); + } + + $index->endRebuild(); + + echo "end rebuild index" . PHP_EOL; + } + + /** + * 搜索课程 + * + * @param string $query + * @return array + * @throws \XSException + */ + protected function searchGroups($query) + { + $handler = new GroupSearcher(); + + return $handler->search($query); + } + + /** + * 查找课程 + * + * @return ResultsetInterface|Resultset|GroupModel[] + */ + protected function findGroups() + { + return GroupModel::query() + ->where('published = 1') + ->execute(); + } + +} diff --git a/app/Console/Tasks/UserIndexTask.php b/app/Console/Tasks/UserIndexTask.php new file mode 100644 index 00000000..3ec4ce51 --- /dev/null +++ b/app/Console/Tasks/UserIndexTask.php @@ -0,0 +1,128 @@ +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 index" . PHP_EOL; + + $index->clean(); + + echo "end clean index" . PHP_EOL; + } + + /** + * 重建索引 + */ + protected function rebuildUserIndex() + { + $users = $this->findUsers(); + + if ($users->count() == 0) { + return; + } + + $handler = new UserSearcher(); + + $documenter = new UserDocument(); + + $index = $handler->getXS()->getIndex(); + + echo "start rebuild index" . PHP_EOL; + + $index->beginRebuild(); + + foreach ($users as $user) { + $document = $documenter->setDocument($user); + $index->add($document); + } + + $index->endRebuild(); + + echo "end rebuild index" . PHP_EOL; + } + + /** + * 搜索课程 + * + * @param string $query + * @return array + * @throws \XSException + */ + protected function searchUsers($query) + { + $handler = new UserSearcher(); + + return $handler->search($query); + } + + /** + * 查找课程 + * + * @return ResultsetInterface|Resultset|UserModel[] + */ + protected function findUsers() + { + return UserModel::query() + ->where('deleted = 0') + ->execute(); + } + +} diff --git a/app/Http/Web/Controllers/HelpController.php b/app/Http/Web/Controllers/HelpController.php index 8f833609..cc3e300f 100644 --- a/app/Http/Web/Controllers/HelpController.php +++ b/app/Http/Web/Controllers/HelpController.php @@ -18,11 +18,11 @@ class HelpController extends Controller { $service = new HelpListService(); - $helps = $service->handle(); + $items = $service->handle(); $this->seo->prependTitle('帮助'); - $this->view->setVar('helps', $helps); + $this->view->setVar('items', $items); } /** diff --git a/app/Http/Web/Controllers/SearchController.php b/app/Http/Web/Controllers/SearchController.php index 5900ae20..6891a2b4 100644 --- a/app/Http/Web/Controllers/SearchController.php +++ b/app/Http/Web/Controllers/SearchController.php @@ -2,9 +2,9 @@ namespace App\Http\Web\Controllers; -use App\Services\Frontend\Search\CourseHotQuery as CourseHotQueryService; -use App\Services\Frontend\Search\CourseList as CourseListService; -use App\Services\Frontend\Search\CourseRelatedQuery as CourseRelatedQueryService; +use App\Services\Frontend\Search\Course as CourseSearchService; +use App\Services\Frontend\Search\Group as GroupSearchService; +use App\Services\Frontend\Search\User as UserSearchService; use App\Traits\Response as ResponseTrait; /** @@ -20,7 +20,8 @@ class SearchController extends Controller */ public function indexAction() { - $query = $this->request->get('query', ['trim']); + $query = $this->request->get('query', ['trim', 'string']); + $type = $this->request->get('type', ['trim'], 'course'); if (empty($query)) { return $this->response->redirect(['for' => 'web.course.list']); @@ -28,21 +29,38 @@ class SearchController extends Controller $this->seo->prependTitle(['搜索', $query]); - $service = new CourseHotQueryService(); + $service = $this->getSearchService($type); - $hotQueries = $service->handle(); + $hotQueries = $service->hotQuery(); - $service = new CourseRelatedQueryService(); + $relatedQueries = $service->relatedQuery($query); - $relatedQueries = $service->handle($query); - - $service = new CourseListService(); - - $pager = $service->handle(); + $pager = $service->search(); $this->view->setVar('hot_queries', $hotQueries); $this->view->setVar('related_queries', $relatedQueries); $this->view->setVar('pager', $pager); } + /** + * @param string $type + * @return CourseSearchService|GroupSearchService|UserSearchService + */ + protected function getSearchService($type) + { + switch ($type) { + case 'group': + $service = new GroupSearchService; + break; + case 'user': + $service = new UserSearchService(); + break; + default: + $service = new CourseSearchService(); + break; + } + + return $service; + } + } diff --git a/app/Http/Web/Views/help/index.volt b/app/Http/Web/Views/help/index.volt index 97cae244..32bb00a8 100644 --- a/app/Http/Web/Views/help/index.volt +++ b/app/Http/Web/Views/help/index.volt @@ -13,12 +13,12 @@
- {% for item in helps %} + {% for item in items %}

{{ item.category.name }}

    - {% for help in item.list %} + {% for help in item.helps %}
  • {{ help.title }}
    • {% endfor %}
diff --git a/app/Http/Web/Views/index/index.volt b/app/Http/Web/Views/index/index.volt index d9eeb68c..294af308 100644 --- a/app/Http/Web/Views/index/index.volt +++ b/app/Http/Web/Views/index/index.volt @@ -4,21 +4,21 @@ {{ partial('macros/course') }} - {%- macro category_courses(courses) %} + {%- macro category_courses(items) %}
    - {% for category in courses %} + {% for item in items %} {% set class = loop.first ? 'layui-this' : 'none' %} -
  • {{ category.name }}
    • +
  • {{ item.category.name }}
    • {% endfor %}
- {% for category in courses %} + {% for item in items %} {% set class = loop.first ? 'layui-tab-item layui-show' : 'layui-tab-item' %}
- {% for course in category.courses %} + {% for course in item.courses %}
{{ course_card(course) }}
diff --git a/app/Http/Web/Views/partials/header.volt b/app/Http/Web/Views/partials/header.volt index 990cf5cf..47a0ef05 100644 --- a/app/Http/Web/Views/partials/header.volt +++ b/app/Http/Web/Views/partials/header.volt @@ -17,20 +17,18 @@
-{% set query = request.get('query','striptags','') %} - -
-
- -
-
+{% set query = request.get('query',['trim','striptags'],'') %} +{% set type = request.get('type',['trim','string'],'course') %}
- {% if auth_user.id > 0 %} -
+ {% endif %} + +
\ No newline at end of file diff --git a/app/Http/Web/Views/search/group.volt b/app/Http/Web/Views/search/group.volt new file mode 100644 index 00000000..ceb4706a --- /dev/null +++ b/app/Http/Web/Views/search/group.volt @@ -0,0 +1,23 @@ +
+ {% for item in pager.items %} + {% set group_url = url({'for':'web.im_group.show','id':item.id}) %} + {% set item.about = item.about ? item.about : '这个家伙真懒，什么也没有留下！' %} +
+
+ + {{ item.name }} + +
+
+
+ {{ item.name }} +
+
{{ item.about }}
+
+ 组长：{{ item.owner.name }} + 组员：{{ item.user_count }} +
+
+
+ {% endfor %} +
diff --git a/app/Http/Web/Views/search/index.volt b/app/Http/Web/Views/search/index.volt index a0a21d09..d7821e65 100644 --- a/app/Http/Web/Views/search/index.volt +++ b/app/Http/Web/Views/search/index.volt @@ -2,11 +2,12 @@ {% block content %} + {{ partial('macros/course') }} + + {% set types = {'course':'课程','group':'群组','user':'用户'} %} {% set type = request.get('type','trim','course') %} {% set query = request.get('query','striptags','') %} - {{ partial('macros/course') }} -
首页 搜索 @@ -15,12 +16,21 @@
+
+ {% for key,value in types %} + {% set class = (type == key) ? 'layui-btn layui-btn-xs' : 'none' %} + {% set url = url({'for':'web.search.index'},{'type':key,'query':query}) %} + {{ value }} + {% endfor %} +
{% if pager.total_pages > 0 %}
{% if type == 'course' %} {{ partial('search/course') }} - {% elseif type == 'other' %} - {{ partial('search/other') }} + {% elseif type == 'group' %} + {{ partial('search/group') }} + {% elseif type == 'user' %} + {{ partial('search/user') }} {% endif %}
{{ partial('partials/pager') }} diff --git a/app/Http/Web/Views/search/user.volt b/app/Http/Web/Views/search/user.volt new file mode 100644 index 00000000..a7075613 --- /dev/null +++ b/app/Http/Web/Views/search/user.volt @@ -0,0 +1,33 @@ +{%- macro gender_info(gender) %} + {% if gender == 1 %} + 男 + {% elseif gender == 2 %} + 女 + {% else %} + 保密 + {% endif %} +{%- endmacro %} + +
+ {% for item in pager.items %} + {% set user_url = url({'for':'web.user.show','id':item.id}) %} + {% set item.about = item.about ? item.about : '这个家伙真懒，什么也没有留下！' %} +
+
+ + {{ item.name }} + +
+
+
+ {{ item.name }} +
+
{{ item.about }}
+
+ 性别：{{ gender_info(item.gender) }} + 地区：{{ item.location }} +
+
+
+ {% endfor %} +
diff --git a/app/Services/Frontend/Search/Course.php b/app/Services/Frontend/Search/Course.php new file mode 100644 index 00000000..4784b38c --- /dev/null +++ b/app/Services/Frontend/Search/Course.php @@ -0,0 +1,82 @@ +getParams(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $searcher = new CourseSearcherService(); + + $paginator = new XunSearchPaginator([ + 'xs' => $searcher->getXS(), + 'highlight' => $searcher->getHighlightFields(), + 'query' => $params['query'], + 'page' => $page, + 'limit' => $limit, + ]); + + $pager = $paginator->getPaginate(); + + return $this->handleCourses($pager); + } + + public function hotQuery($limit = 10, $type = 'total') + { + $searcher = new CourseSearcherService(); + + return $searcher->getHotQuery($limit, $type); + } + + public function relatedQuery($query, $limit = 10) + { + $searcher = new CourseSearcherService(); + + return $searcher->getRelatedQuery($query, $limit); + } + + protected function handleCourses($pager) + { + if ($pager->total_items == 0) { + return $pager; + } + + $items = []; + + foreach ($pager->items as $item) { + $items[] = [ + 'id' => (int)$item['id'], + 'title' => $item['title'], + 'cover' => $item['cover'], + 'summary' => $item['summary'], + 'model' => $item['model'], + 'level' => $item['level'], + 'market_price' => (float)$item['market_price'], + 'vip_price' => (float)$item['vip_price'], + 'user_count' => (int)$item['user_count'], + 'lesson_count' => (int)$item['lesson_count'], + 'review_count' => (int)$item['review_count'], + 'favorite_count' => (int)$item['favorite_count'], + 'teacher' => json_decode($item['teacher'], true), + 'category' => json_decode($item['category'], true), + ]; + } + + $pager->items = $items; + + return $pager; + } + +} diff --git a/app/Services/Frontend/Search/Group.php b/app/Services/Frontend/Search/Group.php new file mode 100644 index 00000000..f8e00272 --- /dev/null +++ b/app/Services/Frontend/Search/Group.php @@ -0,0 +1,75 @@ +getParams(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $searcher = new GroupSearcherService(); + + $paginator = new XunSearchPaginator([ + 'xs' => $searcher->getXS(), + 'highlight' => $searcher->getHighlightFields(), + 'query' => $params['query'], + 'page' => $page, + 'limit' => $limit, + ]); + + $pager = $paginator->getPaginate(); + + return $this->handleGroups($pager); + } + + public function hotQuery($limit = 10, $type = 'total') + { + $searcher = new GroupSearcherService(); + + return $searcher->getHotQuery($limit, $type); + } + + public function relatedQuery($query, $limit = 10) + { + $searcher = new GroupSearcherService(); + + return $searcher->getRelatedQuery($query, $limit); + } + + protected function handleGroups($pager) + { + if ($pager->total_items == 0) { + return $pager; + } + + $items = []; + + foreach ($pager->items as $item) { + $items[] = [ + 'id' => (int)$item['id'], + 'type' => $item['type'], + 'name' => $item['name'], + 'avatar' => $item['avatar'], + 'about' => $item['about'], + 'user_count' => (int)$item['user_count'], + 'owner' => json_decode($item['owner'], true), + ]; + } + + $pager->items = $items; + + return $pager; + } + +} diff --git a/app/Services/Frontend/Search/User.php b/app/Services/Frontend/Search/User.php new file mode 100644 index 00000000..17475cfc --- /dev/null +++ b/app/Services/Frontend/Search/User.php @@ -0,0 +1,76 @@ +getParams(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $searcher = new UserSearcherService(); + + $paginator = new XunSearchPaginator([ + 'xs' => $searcher->getXS(), + 'highlight' => $searcher->getHighlightFields(), + 'query' => $params['query'], + 'page' => $page, + 'limit' => $limit, + ]); + + $pager = $paginator->getPaginate(); + + return $this->handleUsers($pager); + } + + public function hotQuery($limit = 10, $type = 'total') + { + $searcher = new UserSearcherService(); + + return $searcher->getHotQuery($limit, $type); + } + + public function relatedQuery($query, $limit = 10) + { + $searcher = new UserSearcherService(); + + return $searcher->getRelatedQuery($query, $limit); + } + + protected function handleUsers($pager) + { + if ($pager->total_items == 0) { + return $pager; + } + + $items = []; + + foreach ($pager->items as $item) { + $items[] = [ + 'id' => (int)$item['id'], + 'name' => $item['name'], + 'avatar' => $item['avatar'], + 'title' => $item['title'], + 'about' => $item['about'], + 'vip' => (int)$item['vip'], + 'gender' => (int)$item['gender'], + 'location' => $item['location'], + ]; + } + + $pager->items = $items; + + return $pager; + } + +} diff --git a/app/Services/Search/CourseSearcher.php b/app/Services/Search/CourseSearcher.php index eaa6e5e0..5a85aa6a 100644 --- a/app/Services/Search/CourseSearcher.php +++ b/app/Services/Search/CourseSearcher.php @@ -2,112 +2,24 @@ namespace App\Services\Search; -use Phalcon\Mvc\User\Component; - -class CourseSearcher extends Component +class CourseSearcher extends Searcher { - /** - * @var \XS - */ - protected $xs; - public function __construct() { - $filename = config_path('xs.course.ini'); - - $this->xs = new \XS($filename); + $this->xs = $this->getXS(); } - /** - * 获取XS - * - * @return \XS - */ public function getXS() { - return $this->xs; + $filename = config_path('xs.course.ini'); + + return new \XS($filename); } - /** - * 获取高亮字段 - * - * @return array - */ public function getHighlightFields() { return ['title', 'summary']; } - /** - * 搜索课程 - * - * @param string $query - * @param int $limit - * @param int $offset - * @return array - * @throws \XSException - */ - public function search($query, $limit = 15, $offset = 0) - { - $search = $this->xs->getSearch(); - - $docs = $search->setQuery($query)->setLimit($limit, $offset)->search(); - - $total = $search->getLastCount(); - - $fields = array_keys($this->xs->getAllFields()); - - $items = []; - - foreach ($docs as $doc) { - $item = []; - foreach ($fields as $field) { - if (in_array($field, $this->getHighlightFields())) { - $item[$field] = $search->highlight($doc->{$field}); - } else { - $item[$field] = $doc->{$field}; - } - } - $items[] = $item; - } - - return [ - 'total' => $total, - 'items' => $items, - ]; - } - - /** - * 获取相关搜索 - * - * @param string $query - * @param int $limit - * @return array - * @throws \XSException - */ - public function getRelatedQuery($query, $limit = 10) - { - $search = $this->xs->getSearch(); - - $search->setQuery($query); - - return $search->getRelatedQuery($query, $limit); - } - - /** - * @param int $limit - * @param string $type [total => 总量, lastnum => 上周, currnum => 本周] - * @return array - * @throws \XSException - */ - public function getHotQuery($limit = 10, $type = 'total') - { - $search = $this->xs->getSearch(); - - $hotQuery = $search->getHotQuery($limit, $type); - - return array_keys($hotQuery); - } - } diff --git a/app/Services/Search/GroupDocument.php b/app/Services/Search/GroupDocument.php new file mode 100644 index 00000000..0135836e --- /dev/null +++ b/app/Services/Search/GroupDocument.php @@ -0,0 +1,60 @@ +formatDocument($group); + + $doc->setFields($data); + + return $doc; + } + + /** + * 格式化文档 + * + * @param GroupModel $group + * @return array + */ + public function formatDocument(GroupModel $group) + { + $owner = ''; + + if ($group->owner_id > 0) { + + $record = UserModel::findFirst($group->owner_id); + + $owner = kg_json_encode([ + 'id' => $record->id, + 'name' => $record->name, + ]); + } + + return [ + 'id' => $group->id, + 'type' => $group->type, + 'name' => $group->name, + 'avatar' => $group->avatar, + 'about' => $group->about, + 'user_count' => $group->user_count, + 'owner' => $owner, + ]; + } + +} diff --git a/app/Services/Search/GroupSearcher.php b/app/Services/Search/GroupSearcher.php new file mode 100644 index 00000000..c8aacf2b --- /dev/null +++ b/app/Services/Search/GroupSearcher.php @@ -0,0 +1,25 @@ +xs = $this->getXS(); + } + + public function getXS() + { + $filename = config_path('xs.group.ini'); + + return new \XS($filename); + } + + public function getHighlightFields() + { + return ['name', 'about']; + } + +} diff --git a/app/Services/Search/Searcher.php b/app/Services/Search/Searcher.php new file mode 100644 index 00000000..3ce4f453 --- /dev/null +++ b/app/Services/Search/Searcher.php @@ -0,0 +1,100 @@ +xs->getSearch(); + + $docs = $search->setQuery($query)->setLimit($limit, $offset)->search(); + + $total = $search->getLastCount(); + + $fields = array_keys($this->xs->getAllFields()); + + $items = []; + + foreach ($docs as $doc) { + $item = []; + foreach ($fields as $field) { + if (in_array($field, $this->getHighlightFields())) { + $item[$field] = $search->highlight($doc->{$field}); + } else { + $item[$field] = $doc->{$field}; + } + } + $items[] = $item; + } + + return [ + 'total' => $total, + 'items' => $items, + ]; + } + + /** + * 获取相关搜索 + * + * @param string $query + * @param int $limit + * @return array + * @throws \XSException + */ + public function getRelatedQuery($query, $limit = 10) + { + $search = $this->xs->getSearch(); + + $search->setQuery($query); + + return $search->getRelatedQuery($query, $limit); + } + + /** + * @param int $limit + * @param string $type [total => 总量, lastnum => 上周, currnum => 本周] + * @return array + * @throws \XSException + */ + public function getHotQuery($limit = 10, $type = 'total') + { + $search = $this->xs->getSearch(); + + $hotQuery = $search->getHotQuery($limit, $type); + + return array_keys($hotQuery); + } + +} diff --git a/app/Services/Search/UserDocument.php b/app/Services/Search/UserDocument.php new file mode 100644 index 00000000..5c9a8a4f --- /dev/null +++ b/app/Services/Search/UserDocument.php @@ -0,0 +1,48 @@ +formatDocument($user); + + $doc->setFields($data); + + return $doc; + } + + /** + * 格式化文档 + * + * @param UserModel $user + * @return array + */ + public function formatDocument(UserModel $user) + { + return [ + 'id' => $user->id, + 'name' => $user->name, + 'title' => $user->title, + 'avatar' => $user->avatar, + 'about' => $user->about, + 'gender' => $user->gender, + 'location' => $user->location, + 'vip' => $user->vip, + ]; + } + +} diff --git a/app/Services/Search/UserSearcher.php b/app/Services/Search/UserSearcher.php new file mode 100644 index 00000000..ccb5cda0 --- /dev/null +++ b/app/Services/Search/UserSearcher.php @@ -0,0 +1,25 @@ +xs = $this->getXS(); + } + + public function getXS() + { + $filename = config_path('xs.user.ini'); + + return new \XS($filename); + } + + public function getHighlightFields() + { + return ['name', 'about']; + } + +} diff --git a/app/Services/Syncer/GroupIndex.php b/app/Services/Syncer/GroupIndex.php new file mode 100644 index 00000000..36a407fe --- /dev/null +++ b/app/Services/Syncer/GroupIndex.php @@ -0,0 +1,47 @@ +cache = $this->getDI()->get('cache'); + + $this->redis = $this->cache->getRedis(); + } + + public function addItem($groupId) + { + $key = $this->getSyncKey(); + + $this->redis->sAdd($key, $groupId); + + $this->redis->expire($key, $this->lifetime); + } + + public function getSyncKey() + { + return 'group_index_sync'; + } + +} diff --git a/app/Services/Syncer/UserIndex.php b/app/Services/Syncer/UserIndex.php new file mode 100644 index 00000000..54fd7cb4 --- /dev/null +++ b/app/Services/Syncer/UserIndex.php @@ -0,0 +1,47 @@ +cache = $this->getDI()->get('cache'); + + $this->redis = $this->cache->getRedis(); + } + + public function addItem($userId) + { + $key = $this->getSyncKey(); + + $this->redis->sAdd($key, $userId); + + $this->redis->expire($key, $this->lifetime); + } + + public function getSyncKey() + { + return 'user_index_sync'; + } + +} diff --git a/config/xs.group.default.ini b/config/xs.group.default.ini new file mode 100644 index 00000000..97b2bf02 --- /dev/null +++ b/config/xs.group.default.ini @@ -0,0 +1,28 @@ +project.name = group +project.default_charset = UTF-8 + +server.index = xunsearch:8383 +server.search = xunsearch:8384 + +[id] +type = id + +[type] +type = string +index = self +tokenizer = full + +[name] +type = title + +[avatar] +type = string + +[about] +type = body + +[owner] +type = string + +[user_count] +type = string diff --git a/config/xs.group.ini b/config/xs.group.ini new file mode 100644 index 00000000..1b746974 --- /dev/null +++ b/config/xs.group.ini @@ -0,0 +1,28 @@ +project.name = group +project.default_charset = UTF-8 + +server.index = 8383 +server.search = 8384 + +[id] +type = id + +[type] +type = string +index = self +tokenizer = full + +[name] +type = title + +[avatar] +type = string + +[about] +type = body + +[owner] +type = string + +[user_count] +type = string diff --git a/config/xs.user.default.ini b/config/xs.user.default.ini new file mode 100644 index 00000000..a10d1a3d --- /dev/null +++ b/config/xs.user.default.ini @@ -0,0 +1,33 @@ +project.name = user +project.default_charset = UTF-8 + +server.index = xunsearch:8383 +server.search = xunsearch:8384 + +[id] +type = id + +[name] +type = title + +[avatar] +type = string + +[title] +type = string + +[about] +type = body + +[location] +type = string +index = self +tokenizer = full + +[gender] +type = string +index = self +tokenizer = full + +[vip] +type = string \ No newline at end of file diff --git a/config/xs.user.ini b/config/xs.user.ini new file mode 100644 index 00000000..2b592ab8 --- /dev/null +++ b/config/xs.user.ini @@ -0,0 +1,33 @@ +project.name = user +project.default_charset = UTF-8 + +server.index = 8383 +server.search = 8384 + +[id] +type = id + +[name] +type = title + +[avatar] +type = string + +[title] +type = string + +[about] +type = body + +[location] +type = string +index = self +tokenizer = full + +[gender] +type = string +index = self +tokenizer = full + +[vip] +type = string \ No newline at end of file diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index e26ea8b0..daa9c97b 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -245,6 +245,15 @@ body { max-height: 270px; } +.search-tab { + padding: 10px 20px; +} + +.search-tab a { + min-width: 50px; + margin-right: 30px; +} + .search-empty { padding: 50px 0; text-align: center; @@ -269,13 +278,13 @@ body { padding: 0 5px; } -.search-course-card { +.search-course-card, .search-group-card { padding-bottom: 15px; margin-bottom: 15px; border-bottom: 1px dashed #ccc; } -.search-course-card:last-child { +.search-course-card:last-child, .search-group-card:last-child { padding-bottom: 0; margin-bottom: 0; border: none; @@ -288,17 +297,17 @@ body { margin-right: 15px; } -.search-course-card .cover img { +.search-course-card .cover img, .search-group-card .avatar img { width: 100%; height: 100%; } -.search-course-card .info { +.search-course-card .info, .search-group-card .info { float: left; width: 500px; } -.search-course-card .title { +.search-course-card .title, .search-group-card .name { margin-bottom: 10px; white-space: nowrap; } @@ -313,19 +322,36 @@ body { overflow-wrap: break-word; } -.search-course-card .meta { +.search-course-card .meta, .search-group-card .meta { color: #666; } -.search-course-card .meta span { +.search-course-card .meta span, .search-group-card .meta span { margin-right: 10px; } -.search-course-card em { +.search-course-card em, .search-group-card em { color: red; font-style: normal; } +.search-group-card .avatar { + float: left; + width: 90px; + height: 90px; + margin-right: 15px; +} + +.search-group-card .avatar img { + border-radius: 100%; +} + +.search-group-card .about { + margin-bottom: 10px; + line-height: 1.5em; + color: #666; +} + .query-badge { padding: 2px 5px; margin-right: 5px; @@ -421,7 +447,6 @@ body { .course-sort { padding: 10px 20px; - margin-bottom: 20px; } .course-sort a {