Merge branch 'dev' into ysx-quote-20200628

pkg/config/config.go

@@ -11,7 +11,7 @@ var (
 
 
 func SetUp(path string) (err error) {
 func SetUp(path string) (err error) {
 	//引入多个文件
 	//引入多个文件
-	Cfg, err = ini.LooseLoad(path+"/config.ini", path+"/search.ini")
+	Cfg, err = ini.LooseLoad(path+"/config.ini", path+"/search.ini", path+"/redis_key.ini", path+"/rabmq_key.ini")
 	return
 	return
 }
 }