From 835744df0cd64f0924f49a102eb58e8373b68484 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期二, 10 十月 2023 19:47:50 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java index 1a57cd7..b3475fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java @@ -4,12 +4,10 @@ import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.service.EsService; import org.springframework.data.elasticsearch.core.SearchHits; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.websocket.server.PathParam; import java.util.List; /** @@ -26,7 +24,7 @@ EsService esService; @GetMapping() - public AjaxResult search(String keyword){ + public AjaxResult search(@PathParam("keyword") String keyword){ List<EsModel> byCondition = esService.findByCondition(keyword); return AjaxResult.success(byCondition); } -- Gitblit v1.9.1