Merge commit 'c6150d00b0ad6e3ad579396514746c2a18a3c641'

* commit 'c6150d00b0ad6e3ad579396514746c2a18a3c641':
  es7
  更新es7 bidding mapping
  更新mapping，针对es7 测试环境，更新了bidding_v2,projectset_v2,winner_v2,buyer_v2,project-forecase2,supplyinfo_v2

mapping/biddingmapping.txt

@@ -1,4 +1,4 @@
-curl -XPUT http://127.0.0.1:19800/bidding_v1 -d '{
+curl -XPUT http://127.0.0.1:19800/bidding_v2 -d '{
   "settings": {
     "index": {
       "search": {
@@ -125,6 +125,9 @@ curl -XPUT http://127.0.0.1:19800/bidding_v1 -d '{
           "index": "not_analyzed",
           "type": "string"
         },
+        "isValidFile": {
+        "type": "boolean"
+        },
         "agency": {
           "index": "not_analyzed",
           "type": "string",
@@ -474,11 +477,11 @@ curl -XPUT http://127.0.0.1:19800/bidding_v1 -d '{
         },
          "bidopen_shape":{
           "type":"string",
-          "index": "not_analyzed",
+          "index": "not_analyzed"
         },
          "quote_mode":{
           "type":"string",
-          "index": "not_analyzed",
+          "index": "not_analyzed"
         },
          "is_acquire_tender":{
           "type":"boolean"
@@ -488,6 +491,9 @@ curl -XPUT http://127.0.0.1:19800/bidding_v1 -d '{
         },
          "is_joint_bidding":{
           "type":"boolean"
+        },
+        "object_type":{
+          "type":"string"
         }
       }
     }

mapping/biddingmapping2.txt

@@ -0,0 +1,434 @@
+curl -H 'Content-Type: application/json' -u es_all:TopJkO2E_d1x -XPUT http://127.0.0.1:19805/bidding_v2 -d '{
+  "settings": {
+    "index": {
+      "analysis": {
+        "analyzer": {
+          "my_ngram_title": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram_title"
+          },
+          "douhao": {
+            "type": "pattern",
+            "pattern": ","
+          },
+          "my_ngram": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram"
+          }
+        },
+        "tokenizer": {
+          "my_ngram_title": {
+            "token_chars": [
+              "letter",
+              "digit",
+              "punctuation",
+              "symbol"
+            ],
+            "min_gram": "1",
+            "type": "nGram",
+            "max_gram": "1"
+          },
+          "my_ngram": {
+            "token_chars": [
+              "letter",
+              "digit",
+              "punctuation",
+              "symbol"
+            ],
+            "min_gram": "2",
+            "type": "nGram",
+            "max_gram": "2"
+          }
+        }
+      },
+      "number_of_shards": "12",
+      "number_of_replicas": "1"
+    }
+  },
+  "mappings": {
+    
+    "dynamic":false,
+      "properties": {
+        "buyerzipcode": {
+          "type": "keyword"
+        },
+        "winnertel": {
+          "type": "keyword"
+        },
+        "winnerperson": {
+          "type": "keyword"
+        },
+        "contractcode": {
+          "type": "keyword"
+        },
+        "winneraddr": {
+          "type": "keyword"
+        },
+        "agencyaddr": {
+          "type": "keyword"
+        },
+        "buyeraddr": {
+          "type": "keyword"
+        },
+        "signaturedate": {
+          "type": "long"
+        },
+        "projectperiod": {
+          "type": "keyword"
+        },
+        "projectaddr": {
+          "type": "keyword"
+        },
+        "agencytel": {
+          "type": "keyword"
+        },
+        "agencyperson": {
+          "type": "keyword"
+        },
+        "buyerperson": {
+          "type": "keyword"
+        },
+        "isValidFile": {
+          "type": "boolean"
+        },
+        "dataweight": {
+          "type": "long"
+        },
+        "agency": {
+          "type": "keyword",
+          "fields": {
+            "magency": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            }
+          }
+        },
+        "projectscope": {
+          "type": "keyword"
+        },
+        "projectcode": {
+          "type": "keyword"
+        },
+        "bidopentime": {
+          "type": "long"
+        },
+        "supervisorrate": {
+          "type": "double"
+        },
+        "buyertel": {
+          "type": "keyword"
+        },
+        "bidamount": {
+          "type": "double"
+        },
+        "winner": {
+          "type": "keyword"
+        },
+        "buyer": {
+          "type": "keyword",
+          "fields": {
+            "mbuyer": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            }
+          }
+        },
+        "budget": {
+          "type": "double"
+        },
+        "projectname": {
+          "type": "keyword",
+          "fields": {
+            "pname": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            }
+          }
+        },
+        "bidstatus": {
+          "type": "keyword"
+        },
+        "buyerclass": {
+          "type": "keyword"
+        },
+        "topscopeclass": {
+          "type": "keyword"
+        },
+        "s_subscopeclass": {
+          "analyzer": "douhao",
+          "type": "text"
+        },
+        "area": {
+          "type": "keyword"
+        },
+        "city": {
+          "type": "keyword"
+        },
+        "district": {
+          "type": "keyword"
+        },
+        "s_winner": {
+          "analyzer": "douhao",
+          "type": "text",
+          "fields": {
+            "mwinner": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            }
+          }
+        },
+        "id": {
+          "type": "keyword"
+        },
+        "title": {
+          "analyzer": "my_ngram_title",
+          "type": "text",
+          "fields": {
+            "mtitle": {
+              "type": "keyword"
+            }
+          }
+        },
+        "detail": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "site": {
+          "type": "keyword"
+        },
+        "comeintime": {
+          "type": "long"
+        },
+        "href": {
+          "type": "keyword"
+        },
+        "infoformat": {
+          "type": "long"
+        },
+        "publishtime": {
+          "type": "long"
+        },
+        "spidercode": {
+          "type": "keyword"
+        },
+        "toptype": {
+          "type": "keyword"
+        },
+        "subtype": {
+          "type": "keyword"
+        },
+        "filetext": {
+          "type": "text",
+          "analyzer": "my_ngram"
+        },
+        "purchasing": {
+          "type": "text",
+          "analyzer": "my_ngram"
+        },
+        "purchasinglist": {
+          "properties": {
+            "itemname": {
+              "type": "keyword"
+            },
+            "model": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            },
+            "unitname": {
+              "type": "keyword"
+            },
+            "number": {
+              "type": "double"
+            },
+            "brandname": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            },
+            "unitprice": {
+              "type": "double"
+            },
+            "totalprice": {
+              "type": "double"
+            },
+            "item": {
+              "type": "keyword"
+            }
+          }
+        },
+        "procurementlist": {
+          "properties": {
+            "projectname": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            },
+            "buyer": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            },
+            "item": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            },
+            "projectscope": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            },
+            "totalprice": {
+              "type": "double"
+            },
+            "expurasingtime": {
+              "type": "long"
+            }
+          }
+        },
+        "tagname": {
+          "analyzer": "douhao",
+          "type": "text"
+        },
+        "s_topscopeclass": {
+          "analyzer": "douhao",
+          "type": "text"
+        },
+        "channel": {
+          "type": "keyword"
+        },
+        "winnerorder": {
+          "properties": {
+            "sort": {
+              "type": "long"
+            },
+            "sortstr": {
+              "type": "keyword"
+            },
+            "entname": {
+              "type": "keyword"
+            }
+          }
+        },
+        "project_scale": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "project_duration": {
+          "type": "long"
+        },
+        "project_timeunit": {
+          "type": "keyword"
+        },
+        "project_startdate": {
+          "type": "long"
+        },
+        "project_completedate": {
+          "type": "long"
+        },
+        "payway": {
+          "type": "keyword"
+        },
+        "contract_guarantee": {
+          "type": "boolean"
+        },
+        "bid_guarantee": {
+          "type": "boolean"
+        },
+        "qualifies": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "entidlist": {
+          "type": "keyword"
+        },
+        "funds": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "review_experts": {
+          "type": "keyword"
+        },
+        "bidmethod": {
+          "type": "keyword"
+        },
+        "bidendtime": {
+          "type": "long"
+        },
+        "bidopenaddress": {
+          "type": "keyword"
+        },
+        "docamount": {
+          "type": "double"
+        },
+        "agencyrate": {
+          "type": "double"
+        },
+        "agencyfee": {
+          "type": "double"
+        },
+        "getdocmethod": {
+          "type": "keyword"
+        },
+        "bidway": {
+          "type": "keyword"
+        },
+        "china_bidding": {
+          "type": "keyword"
+        },
+        "yuceendtime": {
+          "type": "long"
+        },
+        "createtime": {
+          "type": "long"
+        },
+        "purchasing_tag": {
+          "analyzer": "douhao",
+          "type": "text"
+        },
+        "multipackage": {
+          "type": "long"
+        },
+        "bid_field": {
+          "analyzer": "douhao",
+          "type": "text"
+        },
+        "bidstarttime": {
+          "type": "long"
+        },
+        "docendtime": {
+          "type": "long"
+        },
+        "docstarttime": {
+          "type": "long"
+        },
+        "signendtime": {
+          "type": "long"
+        },
+        "signstarttime": {
+          "type": "long"
+        },
+        "issue_quota":{
+          "type":"double"
+        },
+         "bidopen_shape":{
+          "type":"keyword"
+        },
+         "quote_mode":{
+          "type":"keyword"
+        },
+         "is_acquire_tender":{
+          "type":"boolean"
+        },
+         "is_payment_deposit":{
+          "type":"boolean"
+        },
+         "is_joint_bidding":{
+          "type":"boolean"
+        },
+        "object_type":{
+          "type":"keyword"
+        }
+      }
+    }
+  
+}'

mapping/buyer2.txt

@@ -0,0 +1,58 @@
+curl -H 'Content-Type: application/json' -XPUT http://192.168.3.149:9200/buyer_v2 -d  '{
+  "settings": {
+    "index": {
+      "analysis": {
+        "analyzer": {
+          "my_ngram": {
+            "tokenizer": "my_ngram"
+          }
+        },
+        "tokenizer": {
+          "my_ngram": {
+            "min_gram": "2",
+            "type": "nGram",
+            "max_gram": "2"
+          }
+        }
+      },
+      "number_of_shards": "2",
+      "number_of_replicas": "0"
+    }
+  },
+  "mappings": {
+      "dynamic":false,
+      "properties": {
+        "name": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "buyer_name": {
+          "type": "keyword"
+        },
+        "institute_type": {
+          "type": "keyword"
+        },
+        "buyerclass": {
+          "type": "keyword"
+        },
+        "fixedphone": {
+          "type": "keyword"
+        },
+        "mobilephone": {
+          "type": "keyword"
+        },
+        "latestfixedphone": {
+          "type": "keyword"
+        },
+        "latestmobilephone": {
+          "type": "keyword"
+        },
+        "province": {
+          "type": "keyword"
+        },
+        "city": {
+          "type": "keyword"
+        }
+      }
+  }
+}'

mapping/project-forecast2.txt

@@ -0,0 +1,154 @@
+curl -H 'Content-Type: application/json' -XPUT http://192.168.3.149:9200/forecast_v2 -d '{
+  "settings": {
+    "index": {
+      "analysis": {
+        "analyzer": {
+          "douhao": {
+            "type": "pattern",
+            "pattern": ","
+          },
+          "my_ngram_title": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram_title"
+          },
+          "my_ngram": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram"
+          }
+        },
+        "tokenizer": {
+          "my_ngram_title": {
+            "token_chars": [
+              "letter",
+              "digit",
+              "punctuation",
+              "symbol"
+            ],
+            "min_gram": "1",
+            "type": "nGram",
+            "max_gram": "1"
+          },
+          "my_ngram": {
+            "token_chars": [
+              "letter",
+              "digit"
+            ],
+            "min_gram": "2",
+            "type": "nGram",
+            "max_gram": "2"
+          }
+        }
+      },
+      "number_of_shards": "2",
+      "number_of_replicas": "0"
+    }
+  },
+  "mappings": {
+      "dynamic":false,
+      "properties": {
+        "area": {
+          "type": "keyword"
+        },
+        "city": {
+          "type": "keyword"
+        },
+        "nature": {
+          "type": "keyword"
+        },
+        "buyer": {
+          "type": "keyword"
+        },
+        "buyerclass": {
+          "type": "keyword"
+        },
+        "title": {
+          "analyzer": "my_ngram_title",
+          "type": "text"
+        },
+        "projectname": {
+          "type": "keyword",
+          "fields": {
+            "pname": {
+              "type": "keyword"
+            }
+          }
+        },
+        "projectcode": {
+          "type": "keyword"
+        },
+        "spidercode": {
+          "type": "keyword"
+        },
+        "stage": {
+          "type": "keyword"
+        },
+        "main_project": {
+          "type": "keyword"
+        },
+        "top_category": {
+          "type": "keyword"
+        },
+        "sub_category": {
+          "type": "keyword"
+        },
+        "approvestatus": {
+          "type": "keyword"
+        },
+        "href": {
+          "type": "keyword"
+        },
+        "jyhref": {
+          "type": "keyword"
+        },
+        "publishtime": {
+          "type": "long"
+        },
+        "yucetime": {
+          "type": "long"
+        },
+        "yucestarttime": {
+          "type": "long"
+        },
+        "yuceendtime": {
+          "type": "long"
+        },
+        "results": {
+          "properties": {
+            "purchasing": {
+              "analyzer": "douhao",
+              "type": "text",
+              "fields": {
+                "mypurchasing": {
+                  "analyzer": "my_ngram_title",
+                  "type": "text"
+                }
+              }
+            },
+            "p_projects": {
+              "properties": {
+                "p_purchasing": {
+                  "type": "keyword"
+                },
+                "p_id": {
+                  "type": "keyword"
+                },
+                "p_orther": {
+                  "type": "keyword"
+                },
+                "p_phone": {
+                  "type": "keyword"
+                },
+                "p_person": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+}'

mapping/projectset.txt

@@ -55,7 +55,7 @@ curl -XPUT http://127.0.0.1:19800/projectset_v1 -d '{
           }
         }
       },
-      "number_of_shards": "15",
+      "number_of_shards": "20",
       "number_of_replicas": "0"
     }
   },

mapping/projectset2.txt

@@ -0,0 +1,398 @@
+curl -H 'Content-Type: application/json' -u es_all:TopJkO2E_d1x -XPUT http://127.0.0.1:19805/projectset_v1 -d '{
+  "settings": {
+    "index": {
+      "analysis": {
+        "analyzer": {
+          "my_ngram_title": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram_title"
+          },
+          "douhao": {
+            "type": "pattern",
+            "pattern": ","
+          },
+          "my_ngram": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram"
+          }
+        },
+        "tokenizer": {
+          "my_ngram_title": {
+            "token_chars": [
+              "letter",
+              "digit",
+              "punctuation",
+              "symbol"
+            ],
+            "min_gram": "1",
+            "type": "nGram",
+            "max_gram": "1"
+          },
+          "my_ngram": {
+            "token_chars": [
+              "letter",
+              "digit"
+            ],
+            "min_gram": "2",
+            "type": "nGram",
+            "max_gram": "2"
+          }
+        }
+      },
+      "number_of_shards": "12",
+      "number_of_replicas": "0"
+    }
+  },
+  "mappings": {
+      "dynamic":false,
+      "properties": {
+        "exception": {
+          "type": "integer"
+        },
+        "projecthref": {
+          "type": "keyword"
+        },
+        "firsttime": {
+          "type": "long"
+        },
+        "city": {
+          "type": "keyword"
+        },
+        "projectcode": {
+          "type": "keyword"
+        },
+        "jgtime": {
+          "type": "long"
+        },
+        "projectscope": {
+          "type": "keyword"
+        },
+        "multipackage": {
+          "type": "integer"
+        },
+        "subscopeclass": {
+          "type": "keyword"
+        },
+        "contractcode": {
+          "type": "keyword"
+        },
+        "sortprice": {
+          "type": "double"
+        },
+        "s_projectname": {
+          "type": "keyword"
+        },
+        "sourceinfourl": {
+          "type": "keyword"
+        },
+        "id": {
+          "type": "keyword"
+        },
+        "budget": {
+          "type": "double"
+        },
+        "s_subscopeclass": {
+          "type": "keyword"
+        },
+        "area": {
+          "type": "keyword"
+        },
+        "budgettag": {
+          "type": "long"
+        },
+        "mpc": {
+          "type": "keyword"
+        },
+        "bidamount": {
+          "type": "double"
+        },
+        "createtime": {
+          "type": "long"
+        },
+        "projectname": {
+          "type": "keyword",
+          "fields": {
+            "pname": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            },
+            "sname": {
+              "analyzer": "my_ngram_title",
+              "type": "text"
+            }
+          }
+        },
+        "buyertel": {
+          "type": "keyword"
+        },
+        "listtag": {
+          "type": "integer"
+        },
+        "bidstatus": {
+          "type": "keyword"
+        },
+        "s_winner": {
+          "analyzer": "douhao",
+          "type": "text",
+          "fields": {
+            "mwinner": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            }
+          }
+        },
+        "agency": {
+          "type": "keyword",
+          "fields": {
+            "magency": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            }
+          }
+        },
+        "buyer": {
+          "type": "keyword",
+          "fields": {
+            "mbuyer": {
+              "analyzer": "my_ngram",
+              "type": "text"
+            }
+          }
+        },
+        "bidamounttag": {
+          "type": "long"
+        },
+        "mpn": {
+          "type": "keyword"
+        },
+        "package1": {
+          "properties": {
+            "bidamount": {
+              "type": "long"
+            },
+            "winner": {
+              "type": "keyword"
+            }
+          }
+        },
+        "pici": {
+          "type": "long"
+        },
+        "list": {
+          "properties": {
+            "city": {
+              "type": "keyword"
+            },
+            "projectcode": {
+              "type": "keyword"
+            },
+            "multipackage": {
+              "type": "long"
+            },
+            "title": {
+              "type": "keyword"
+            },
+            "subscopeclass": {
+              "type": "keyword"
+            },
+            "comeintime": {
+              "type": "long"
+            },
+            "contractcode": {
+              "type": "keyword"
+            },
+            "toptype": {
+              "type": "keyword"
+            },
+            "spidercode": {
+              "type": "keyword"
+            },
+            "subtype": {
+              "type": "keyword"
+            },
+            "infoformat": {
+              "type": "long"
+            },
+            "href": {
+              "type": "keyword"
+            },
+            "pjVal": {
+              "type": "long"
+            },
+            "budget": {
+              "type": "long"
+            },
+            "area": {
+              "type": "keyword"
+            },
+            "bidamount": {
+              "type": "long"
+            },
+            "projectname": {
+              "type": "keyword"
+            },
+            "buyertel": {
+              "type": "keyword"
+            },
+            "infoid": {
+              "type": "keyword"
+            },
+            "agency": {
+              "type": "keyword"
+            },
+            "compareStr": {
+              "type": "keyword"
+            },
+            "s_winner": {
+              "type": "keyword"
+            },
+            "resVal": {
+              "type": "long"
+            },
+            "buyer": {
+              "type": "keyword"
+            },
+            "buyerclass": {
+              "type": "keyword"
+            },
+            "site": {
+              "type": "keyword"
+            },
+            "winner": {
+              "type": "keyword"
+            },
+            "winnertel": {
+              "type": "keyword"
+            },
+            "winnerperson": {
+              "type": "keyword"
+            },
+            "bidopentime": {
+              "type": "long"
+            },
+            "district": {
+              "type": "keyword"
+            },
+            "publishtime": {
+              "type": "long"
+            },
+            "topscopeclass": {
+              "type": "keyword"
+            },
+            "buyerperson": {
+              "type": "keyword"
+            },
+            "project_startdate": {
+              "type": "long"
+            },
+            "project_completedate": {
+              "type": "long"
+            }
+          }
+        },
+        "bidtype": {
+          "type": "keyword"
+        },
+        "buyerclass": {
+          "type": "keyword"
+        },
+        "sourceinfoid": {
+          "type": "keyword"
+        },
+        "lasttime": {
+          "type": "long"
+        },
+        "winner": {
+          "type": "keyword"
+        },
+        "winnertel": {
+          "type": "keyword"
+        },
+        "winnerperson": {
+          "type": "keyword"
+        },
+        "bidopentime": {
+          "type": "long"
+        },
+        "district": {
+          "type": "keyword"
+        },
+        "ids": {
+          "type": "keyword"
+        },
+        "project_rate": {
+          "type": "double"
+        },
+        "topscopeclass": {
+          "type": "keyword"
+        },
+        "buyerperson": {
+          "type": "keyword"
+        },
+        "zbtime": {
+          "type": "long"
+        },
+        "purchasing": {
+          "type": "text",
+          "analyzer": "my_ngram"
+        },
+        "review_experts": {
+          "type": "text"
+        },
+        "winnerorder": {
+          "type": "keyword"
+        },
+        "prate_flag": {
+          "type": "integer"
+        },
+        "bidcycle": {
+          "type": "integer"
+        },
+        "project_startdate": {
+          "type": "long"
+        },
+        "project_completedate": {
+          "type": "long"
+        },
+        "project_scale": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "project_duration": {
+          "type": "long"
+        },
+        "project_timeunit": {
+          "type": "keyword"
+        },
+        "payway": {
+          "type": "keyword"
+        },
+        "contract_guarantee": {
+          "type": "boolean"
+        },
+        "bid_guarantee": {
+          "type": "boolean"
+        },
+        "qualifies": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "entidlist": {
+          "type": "keyword"
+        },
+        "first_cooperation": {
+          "type": "keyword"
+        },
+        "bid_field": {
+          "analyzer": "douhao",
+          "type": "text"
+        }
+      }
+    
+  }
+}'
+

mapping/qyxy2.txt

@@ -0,0 +1,252 @@
+curl -H 'Content-Type: application/json' -u es_all:TopJkO2E_d1x -XPUT http://127.0.0.1:19805/qyxy_v1 -d '{
+"settings": {
+  "index": {
+    "analysis": {
+      "analyzer": {
+        "my_ngram_title": {
+          "filter": [
+            "lowercase"
+          ],
+          "tokenizer": "my_ngram_title"
+        },
+        "my_ngram": {
+          "filter": [
+            "lowercase"
+          ],
+          "tokenizer": "my_ngram"
+        },
+        "douhao": {
+          "type": "pattern",
+          "pattern": ","
+        },
+        "p_ngram": {
+          "filter": [
+            "lowercase"
+          ],
+          "tokenizer": "p_ngram"
+        }
+      },
+      "tokenizer": {
+        "my_ngram_title": {
+          "token_chars": [
+            "letter",
+            "digit",
+            "punctuation",
+            "symbol"
+          ],
+          "min_gram": "1",
+          "type": "nGram",
+          "max_gram": "1"
+        },
+        "my_ngram": {
+          "type": "nGram",
+          "min_gram": "2",
+          "max_gram": "2"
+        },
+        "p_ngram": {
+          "token_chars": [
+            "letter",
+            "digit",
+            "symbol"
+          ],
+          "min_gram": "2",
+          "type": "nGram",
+          "max_gram": "2"
+        }
+      }
+    },
+    "number_of_shards": "12",
+    "number_of_replicas": "0"
+  }
+},
+"mappings": {
+    "dynamic":false,
+    "properties": {
+      "name": {
+        "analyzer": "my_ngram",
+        "type": "text",
+        "fields": {
+          "ent_name": {
+            "type": "keyword"
+          },
+          "ent_ikname": {
+            "analyzer": "ik_smart",
+            "type": "text"
+          }
+        }
+      },
+      "company_name": {
+        "type": "keyword"
+      },
+      "history_name": {
+        "analyzer": "my_ngram",
+        "type": "text",
+        "fields": {
+          "hname": {
+            "type": "keyword"
+          }
+        }
+      },
+      "company_code": {
+        "type": "keyword"
+      },
+      "tax_code": {
+        "type": "keyword"
+      },
+      "credit_no": {
+        "type": "keyword"
+      },
+      "org_code": {
+        "type": "keyword"
+      },
+      "company_area": {
+        "type": "keyword"
+      },
+      "company_city": {
+        "type": "keyword"
+      },
+      "company_district": {
+        "type": "keyword"
+      },
+      "company_type_old": {
+        "type": "keyword"
+      },
+      "company_type": {
+        "type": "keyword"
+      },
+      "company_type_int": {
+        "type": "integer"
+      },
+      "legal_person": {
+        "type": "keyword"
+      },
+      "establish_date": {
+        "type": "long"
+      },
+      "lastupdatetime": {
+        "type": "keyword"
+      },
+      "capital": {
+        "type": "double"
+      },
+      "currency": {
+        "type": "keyword"
+      },
+      "operation_startdate": {
+        "type": "keyword"
+      },
+      "operation_enddate": {
+        "type": "keyword"
+      },
+      "authority": {
+        "type": "keyword"
+      },
+      "issue_date": {
+        "type": "keyword"
+      },
+      "company_status": {
+        "type": "keyword"
+      },
+      "company_address": {
+        "type": "keyword"
+      },
+      "business_scope": {
+        "type": "keyword"
+      },
+      "cancel_date": {
+        "type": "keyword"
+      },
+      "revoke_date": {
+        "type": "keyword"
+      },
+      "company_phone": {
+        "type": "keyword"
+      },
+      "company_email": {
+        "type": "keyword"
+      },
+      "stock_name": {
+        "analyzer": "douhao",
+        "type": "text"
+      },
+     "id": {
+          "type": "keyword"
+      },
+      "partners": {
+        "properties": {
+          "identify_no": {
+            "type": "keyword"
+          },
+          "stock_type": {
+            "type": "keyword"
+          },
+          "stock_name": {
+            "type": "keyword"
+          },
+          "identify_type": {
+            "type": "keyword"
+          },
+          "stock_capital": {
+            "type": "double"
+          },
+          "stock_realcapital": {
+            "type": "double"
+          }
+        }
+      },
+      "updatetime": {
+        "type": "long"
+      },
+      "bid_projectname": {
+        "analyzer": "p_ngram",
+        "type": "text"
+      },
+      "bid_purchasing": {
+        "analyzer": "p_ngram",
+        "type": "text"
+      },
+      "search_type": {
+        "type": "keyword"
+      },
+      "employees": {
+        "properties": {
+          "employee_name": {
+            "type": "keyword"
+          },
+          "position": {
+            "type": "keyword"
+          }
+        }
+      },
+      "employee_name": {
+        "analyzer": "douhao",
+        "type": "text"
+      },
+      "bid_area": {
+        "analyzer": "p_ngram",
+        "type": "text"
+      },
+      "bid_unittype": {
+        "analyzer": "douhao",
+        "type": "text"
+      },
+      "bid_contracttype": {
+        "analyzer": "douhao",
+        "type": "text"
+      },
+      "company_shortname": {
+        "type": "keyword"
+      },
+      "tag_business": {
+        "type": "keyword"
+      },
+      "cancel_date_unix": {
+        "type": "long"
+      },
+      "employee_num": {
+        "type": "integer"
+      }
+    } 
+}
+}'
+  

mapping/supplyinfo2.txt

@@ -0,0 +1,94 @@
+curl -H 'Content-Type: application/json' -XPUT http://192.168.3.149:9200/supplyinfo_v2 -d '
+{
+  "settings": {
+    "index": {
+      "analysis": {
+        "analyzer": {
+          "my_ngram_title": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram_title"
+          },
+          "my_ngram": {
+            "filter": [
+              "lowercase"
+            ],
+            "tokenizer": "my_ngram"
+          }
+        },
+        "tokenizer": {
+          "my_ngram_title": {
+            "token_chars": [
+              "letter",
+              "digit",
+              "punctuation",
+              "symbol"
+            ],
+            "min_gram": "1",
+            "type": "nGram",
+            "max_gram": "1"
+          },
+          "my_ngram": {
+            "token_chars": [
+              "letter",
+              "digit",
+              "punctuation",
+              "symbol"
+            ],
+            "min_gram": "2",
+            "type": "nGram",
+            "max_gram": "2"
+          }
+        }
+      },
+      "number_of_shards": "2",
+      "number_of_replicas": "0"
+    }
+  },
+  "mappings": {
+      "properties": {
+        "msg_type": {
+          "type": "keyword"
+        },
+        "title": {
+          "analyzer": "my_ngram_title",
+          "type": "text",
+          "fields": {
+            "mtitle": {
+              "type": "keyword"
+            }
+          }
+        },
+        "id": {
+          "type": "keyword"
+        },
+        "detail": {
+          "analyzer": "my_ngram",
+          "type": "text"
+        },
+        "validity_time": {
+          "type": "long"
+        },
+        "create_time": {
+          "type": "long"
+        },
+        "publish_time": {
+          "type": "long"
+        },
+        "province": {
+          "type": "keyword"
+        },
+        "city": {
+          "type": "keyword"
+        },
+        "ent_name": {
+          "analyzer": "my_ngram_title",
+          "type": "text"
+        },
+        "ent_id": {
+          "type": "keyword"
+        }
+      }
+  }
+}'

mapping/tool.txt

@@ -1,5 +1,5 @@
 // 新增某字段mapping
-curl -XPUT http://127.0.0.1:19800/bidding_v1/bidding/_mapping -d '
+curl -XPUT http://127.0.0.1:19800/bidding_v2/bidding/_mapping -d '
 {
   "properties": {
     "bidstarttime": {
@@ -46,6 +46,19 @@ curl -XPUT http://192.168.3.206:9800/_cluster/settings -d'{
     "cluster.routing.allocation.enable" : "none"
   }
 }'
+//开启节点平衡,es7 环境，需要传递header参数
+curl -H 'Content-Type: application/json' -XPUT http://192.168.3.149:9200/_cluster/settings -d'{
+  "transient" : {
+    "cluster.routing.allocation.enable" : "all"
+  }
+}'
+//关闭节点平衡
+curl -H 'Content-Type: application/json' -XPUT http://192.168.3.149:9200/_cluster/settings -d'{
+  "transient" : {
+    "cluster.routing.allocation.enable" : "none"
+  }
+}'
+
 //手动移动节点
 curl -XPOST 'http://127.0.0.1:9800/_cluster/reroute' -d '{
     "commands" : [ {
@@ -86,7 +99,16 @@ curl -XPUT http://127.0.0.1:9800/bidding_v1/bidding/_mapping -d '
     }
 	}
 }'
-
+//新增某字段mapping，es7 版本
+curl -XPUT "http://192.168.3.149:9200/bidding_v2/_mapping" -H 'Content-Type: application/json' -d'
+{
+  "properties": {
+    "dataweight": {
+      "type": "long"
+    }
+  }
+}
+'
 curl -XPUT http://127.0.0.1:9800/bidding_v1/bidding/_mapping -d '
 {
 	"properties": {

mapping/winner2.txt

@@ -0,0 +1,55 @@
+curl  -H 'Content-Type: application/json'  -XPUT http://192.168.3.149:9200/winner_v2 -d '{
+"settings": {
+  "index": {
+    "analysis": {
+      "analyzer": {
+        "my_ngram": {
+          "tokenizer": "my_ngram"
+        }
+      },
+      "tokenizer": {
+        "my_ngram": {
+          "min_gram": "2",
+          "type": "nGram",
+          "max_gram": "2"
+        }
+      }
+    },
+    "number_of_shards": "2",
+    "number_of_replicas": "0"
+  }
+},
+"mappings": {
+  "dynamic":false,
+    "properties": {
+      "winnersign": {
+        "type": "long"
+      },
+      "l_createtime": {
+        "type": "long"
+      },
+      "name": {
+        "analyzer": "my_ngram",
+        "type": "text"
+      },
+      "id": {
+        "type": "keyword"
+      },
+      "pici": {
+        "type": "long"
+      },
+      "province": {
+        "type": "keyword"
+      },
+      "city": {
+        "type": "keyword"
+      },
+      "winner_name": {
+        "type": "keyword"
+      },
+      "tag_business": {
+        "type": "keyword"
+      }
+    }
+  }
+}'