From c23a9a10fcbbb915e6e3cf0e55bea1d01fff761a Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Thu, 22 Apr 2021 20:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Dockers=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deliverables/k8s/geluke.yaml | 2 +- .../controllers/DistrictController.java | 2 +- .../src/main/webapp/header/change_city.ftl | 65 +++++++++---------- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/deliverables/k8s/geluke.yaml b/deliverables/k8s/geluke.yaml index d43501cd6..93c1e1f10 100644 --- a/deliverables/k8s/geluke.yaml +++ b/deliverables/k8s/geluke.yaml @@ -42,7 +42,7 @@ spec: readinessProbe: tcpSocket: port: 8080 - initialDelaySeconds: 5 + initialDelaySeconds: 10 periodSeconds: 10 livenessProbe: tcpSocket: diff --git a/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java b/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java index 7f0f840b6..0a63502c3 100644 --- a/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java +++ b/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java @@ -27,7 +27,7 @@ public class DistrictController { List regions = districtService.getRegionByCity(model.getCityName()); Map> map = openSearchService.parseResult(content, regions, model.getKeywords()); if(map.size() == 0){ - List districts = districtService.findNewDistrict(model.getCityName(), model.getKeywords()); + List districts = districtService.findByKeyword(model.getCityName(), model.getKeywords()); map = openSearchService.createResult(districts); } JsonModel ret = new JsonModel(); diff --git a/projects/geluke/src/main/webapp/header/change_city.ftl b/projects/geluke/src/main/webapp/header/change_city.ftl index 565630c82..b2c9fc902 100644 --- a/projects/geluke/src/main/webapp/header/change_city.ftl +++ b/projects/geluke/src/main/webapp/header/change_city.ftl @@ -23,58 +23,55 @@ id="changecity">
  • 华东城市
  • 华北东北
  • 华南华中
  • 西部城市
  • - -
  • <#--地图城市切换 end--> \ No newline at end of file