feat:合并冲突

rpc/stdlib/etc/stdlib.yaml

@@ -13,11 +13,7 @@ EsConfig:
   Password: elastic
 Etcd:
   Hosts:
-<<<<<<< HEAD
-    - 127.0.0.1:2379
-=======
     - 192.168.3.206:2379
->>>>>>> master
   Key: jydocs.stdlib.rpc
 FileSystemConf:
   Hosts:
@@ -25,9 +21,6 @@ FileSystemConf:
   Key: moapp.filesystem.rpc
 DocBucketName: "jydoc-stdlib"
 PreviewBucketName: "jydoc-preview"
-<<<<<<< HEAD
 Timeout: 4000
-=======
 SearchSource: # 文库搜索范围 1-剑鱼 2-豆丁 不配置则无限制
   - 1 # 1-剑鱼
->>>>>>> master

services/stdlib/docService.go

@@ -36,12 +36,8 @@ func FindDocumentById(id int) {
 	log.Println(jyDocsRpcUtil.GetJyDocsDB().Exec("select * from ").Error)
 }
 
-<<<<<<< HEAD
-func DocQuery(in *stdlib.DocQueryRequest) *stdlib.DocQueryResponse {
-	startNow := time.Now()
-=======
 func DocQuery(in *stdlib.DocQueryRequest, searchSource []string) *stdlib.DocQueryResponse {
->>>>>>> master
+	startNow := time.Now()
 	defer common.Catch()
 	in.KeyWord = strings.TrimSpace(in.KeyWord)
 	musts := []string{}