diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d94325a5b..df3e9c96e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -623,4 +623,13 @@ class ApplicationController < ActionController::Base
 		end
 		user
 	end
+
+	# 记录热门搜索关键字
+	def record_search_keyword
+		keyword = params[:keyword].to_s.strip
+		return if keyword.blank? || keyword.size <= 1
+		return unless HotSearchKeyword.available?
+
+		HotSearchKeyword.add(keyword)
+	end
 end
diff --git a/app/controllers/searchs_controller.rb b/app/controllers/searchs_controller.rb
index 1ea1c5d05..130e8a5cd 100644
--- a/app/controllers/searchs_controller.rb
+++ b/app/controllers/searchs_controller.rb
@@ -1,9 +1,12 @@
 class SearchsController < ApplicationController
+  after_action :record_search_keyword, only: [:index]
+
   def index
     @results = SearchService.call(search_params)
   end
 
   private
+
   def search_params
     params.permit(:keyword, :type, :page, :per_page)
   end
diff --git a/app/controllers/weapps/hot_keywords_controller.rb b/app/controllers/weapps/hot_keywords_controller.rb
new file mode 100644
index 000000000..f915d9c47
--- /dev/null
+++ b/app/controllers/weapps/hot_keywords_controller.rb
@@ -0,0 +1,7 @@
+class Weapps::HotKeywordsController < Weapps::BaseController
+  def index
+    keywords = []
+    keywords = HotSearchKeyword.hot(8) if HotSearchKeyword.available?
+    render_ok(keywords: keywords)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/weapps/searchs_controller.rb b/app/controllers/weapps/searchs_controller.rb
new file mode 100644
index 000000000..b4960e7b1
--- /dev/null
+++ b/app/controllers/weapps/searchs_controller.rb
@@ -0,0 +1,13 @@
+class Weapps::SearchsController < Weapps::BaseController
+  after_action :record_search_keyword, only: [:index]
+  
+  def index
+    @results = Weapps::SearchQuery.call(search_params)
+  end
+
+  private
+
+  def search_params
+    params.permit(:keyword, :type, :page, :per_page)
+  end
+end
\ No newline at end of file
diff --git a/app/libs/hot_search_keyword.rb b/app/libs/hot_search_keyword.rb
index f026142cb..f79d1641e 100644
--- a/app/libs/hot_search_keyword.rb
+++ b/app/libs/hot_search_keyword.rb
@@ -3,6 +3,7 @@ class HotSearchKeyword
   class << self
     def add(keyword)
       return if keyword.blank?
+      Rails.logger.info("[Hot Keyword] #{keyword} score increment ~")
       Rails.cache.data.zincrby(redis_key, 1, keyword)
     end
 
diff --git a/app/queries/weapps/search_query.rb b/app/queries/weapps/search_query.rb
new file mode 100644
index 000000000..665480073
--- /dev/null
+++ b/app/queries/weapps/search_query.rb
@@ -0,0 +1,37 @@
+class Weapps::SearchQuery < ApplicationQuery
+  include ElasticsearchAble
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    modal_name.search(keyword, search_options)
+  end
+
+  private
+
+  def search_options
+    hash = {
+      fields: [:name],
+      page: page,
+      per_page: per_page
+    }
+    hash.merge(where: { status: 2 }) if modal_name == Shixun
+
+    hash
+  end
+
+  def modal_name
+    @_modal_name ||= begin
+      case params[:type].to_s
+      when 'subject' then Subject
+      when 'shixun'  then Shixun
+      when 'course'  then Course
+      else Subject
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/views/weapps/searchs/index.json.jbuilder b/app/views/weapps/searchs/index.json.jbuilder
new file mode 100644
index 000000000..25a1a6a34
--- /dev/null
+++ b/app/views/weapps/searchs/index.json.jbuilder
@@ -0,0 +1,9 @@
+json.count @results.total_count
+json.results do
+  json.array! @results.with_highlights(multiple: true) do |obj, highlights|
+    json.merge! obj.to_searchable_json
+    json.type obj.class.name.downcase
+
+    json.title highlights.delete(:name)&.join('...') || obj.searchable_title
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 1acaac57e..17fb5dde3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -852,6 +852,9 @@ Rails.application.routes.draw do
       resource :register, only: [:create]
       resource :code_session, only: [:create]
       resource :verify, only: [:create]
+
+      resources :searchs, only: [:index]
+      resources :hot_keywords, only: [:index]
     end
   end