From 0dad507b637a8501f744506464ea4f9d4a452690 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 26 May 2022 17:21:52 +0800 Subject: [PATCH 01/56] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=88=90=E4=BA=A4?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BB=B7=E6=A0=BC=E4=B8=A2=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AuctionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index 13e59faa4..b58a1097b 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -29,7 +29,7 @@ public class AuctionController { private PaiMaiService paiMaiService; private DistrictNewPriceService districtNewPriceService; - private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType"}; + private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType", "tradeAvgPrice", "evaluationPrice"}; public Object housesAction(AuctionModel model){ RestfulModelAndView mav = new RestfulModelAndView(); From a39f90338c99626c1d3301e021e3f558279aeae1 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Thu, 26 May 2022 17:31:27 +0800 Subject: [PATCH 02/56] =?UTF-8?q?=E8=BF=98=E5=8E=9F=EF=BC=8Cmaster?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AuctionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java index b58a1097b..13e59faa4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AuctionController.java @@ -29,7 +29,7 @@ public class AuctionController { private PaiMaiService paiMaiService; private DistrictNewPriceService districtNewPriceService; - private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType", "tradeAvgPrice", "evaluationPrice"}; + private static final String[] SEARCH_FIELDS = new String[]{"marketAvgPrice", "startDate", "curPrice", "imgUrls", "id", "matchCity", "matchRegion", "matchName", "address", "marketTotalPrice", "startPrice", "curPrice", "predictPrice", "depositPrice", "area", "status", "url", "matchEstateType"}; public Object housesAction(AuctionModel model){ RestfulModelAndView mav = new RestfulModelAndView(); From eeb9f2c924acd2c5ef70fa94fd9c728ed4402535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 13 Jul 2022 13:34:39 +0800 Subject: [PATCH 03/56] =?UTF-8?q?=E4=BC=98=E5=8C=96k8s=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deliverables/k8s/fangjia-bkoff.yaml | 5 +++++ .../java/com/fangjia/datastore/solr/SolrServerImpl.java | 8 ++++---- .../main/groovy/com/fangjia/script/wenyan/Test4.groovy | 7 ++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deliverables/k8s/fangjia-bkoff.yaml b/deliverables/k8s/fangjia-bkoff.yaml index 768fd80cd..d092bc974 100644 --- a/deliverables/k8s/fangjia-bkoff.yaml +++ b/deliverables/k8s/fangjia-bkoff.yaml @@ -21,6 +21,11 @@ spec: project: fangjia-bkoff app: fangjia spec: + hostAliases: + - ip: 192.168.0.38 + hostnames: + - seaweed.db.fangjia.com + - foo.local imagePullSecrets: - name: nexus-registry-secret nodeSelector: diff --git a/projects/fangjia-datastore/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java b/projects/fangjia-datastore/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java index b9da9e2f8..9f4931e8f 100644 --- a/projects/fangjia-datastore/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java +++ b/projects/fangjia-datastore/src/main/java/com/fangjia/datastore/solr/SolrServerImpl.java @@ -131,7 +131,7 @@ public class SolrServerImpl implements SolrServer private void addToSolr0(final HttpSolrServer solrServer, final List documents, int errorCount) { try { if (null != documents && !documents.isEmpty()) { - solrServer.add((Collection)documents); + solrServer.add(documents); solrServer.commit(); } } @@ -226,7 +226,7 @@ public class SolrServerImpl implements SolrServer if (doc.get("$boosts") != null && doc.get("$boosts") instanceof Map) { boostsMap = (Map)doc.get("$boosts"); if (boostsMap.containsKey("$doc_boost")) { - document.setDocumentBoost(boostsMap.get("$doc_boost").floatValue()); + document.setDocumentBoost(((Number) boostsMap.get("$doc_boost")).floatValue()); } } for (final Index index : indexes) { @@ -235,10 +235,10 @@ public class SolrServerImpl implements SolrServer final Object value = doc.get(key); final SolrInputField field = new SolrInputField(key); if (value instanceof ObjectId) { - field.setValue((Object)value.toString(), 1.0f); + field.setValue(value.toString(), 1.0f); } else if (boostsMap != null && boostsMap.containsKey(key)) { - field.setValue(value, boostsMap.get(key).floatValue()); + field.setValue(value, ((Number) boostsMap.get(key)).floatValue()); } else { field.setValue(value, 1.0f); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy index 51a920e7e..26144779f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy @@ -149,8 +149,5 @@ import org.apache.commons.lang.StringUtils // item["B"] = RegionData.formatRegion(item["A"], item["B"]) // println(item) //}) -int count = 0 -DbUtils.seaweed.find(DbUtils.buildSeaweedQuery("¶«Ý¸")).each {def a-> - count += 1 -} -println(count) \ No newline at end of file +DbUtils.seaweed.save(DbUtils.seaweed.findById("62ce26483705890001dfa166")) +//DbUtils.seaweed.remove(new BasicDBObject("_id", "62ce3eda3705890001dfa16a")) From 9af8c2a30ea9372f428103346ae65ef5bbbde511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 13 Jul 2022 13:41:18 +0800 Subject: [PATCH 04/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9k8s=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deliverables/k8s/fangjia-bkoff.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deliverables/k8s/fangjia-bkoff.yaml b/deliverables/k8s/fangjia-bkoff.yaml index d092bc974..ded65e3c4 100644 --- a/deliverables/k8s/fangjia-bkoff.yaml +++ b/deliverables/k8s/fangjia-bkoff.yaml @@ -21,11 +21,10 @@ spec: project: fangjia-bkoff app: fangjia spec: - hostAliases: - - ip: 192.168.0.38 - hostnames: - - seaweed.db.fangjia.com - - foo.local + hostAliases: + - ip: "192.168.0.38" + hostnames: + - "seaweed.db.fangjia.com" imagePullSecrets: - name: nexus-registry-secret nodeSelector: From fcb3ae86cf0a1f2afbdeeae694ff8ea074c93f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 13 Jul 2022 13:50:48 +0800 Subject: [PATCH 05/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9k8s=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deliverables/k8s/fangjia-bkoff.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deliverables/k8s/fangjia-bkoff.yaml b/deliverables/k8s/fangjia-bkoff.yaml index ded65e3c4..a577d40bd 100644 --- a/deliverables/k8s/fangjia-bkoff.yaml +++ b/deliverables/k8s/fangjia-bkoff.yaml @@ -21,10 +21,10 @@ spec: project: fangjia-bkoff app: fangjia spec: - hostAliases: - - ip: "192.168.0.38" - hostnames: - - "seaweed.db.fangjia.com" + hostAliases: + - ip: "192.168.0.38" + hostnames: + - "seaweed.db.fangjia.com" imagePullSecrets: - name: nexus-registry-secret nodeSelector: From 0357194d37906f7ae5b4ad2cf5ab2b929496a9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 13 Jul 2022 17:30:56 +0800 Subject: [PATCH 06/56] =?UTF-8?q?=E5=8D=87=E7=BA=A7tomcat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-coresite/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-coresite/Dockerfile b/projects/fangjia-coresite/Dockerfile index d0b8e61a1..18a266b75 100644 --- a/projects/fangjia-coresite/Dockerfile +++ b/projects/fangjia-coresite/Dockerfile @@ -1,2 +1,2 @@ -FROM 192.168.0.19:9012/tomcat6:latest +FROM 192.168.0.19:9012/tomcat6:220713 COPY target/*.war /home/goojia/webapps/ROOT.war \ No newline at end of file From 8bc257ec8003a13bf0111f5ddb810f9ca2cb995c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 13 Jul 2022 18:03:26 +0800 Subject: [PATCH 07/56] =?UTF-8?q?=E5=8D=87=E7=BA=A7tomcat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl index cfea9915a..37a1f6a1b 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl @@ -18,7 +18,7 @@ -
  • 最新资讯
  • +
  • 最新资讯