Merge remote-tracking branch 'origin/master' into prod_test

src/main/resources/application-testNetIn.yml

@@ -67,4 +67,8 @@ PCSUrl: http://localhost:8880
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8880
 FMSUrl: http://localhost:8885
-FileSource: 3
+FileSource: 3
+ES:
+  patentVector: patent_vector
+  patent: wxpatent
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com