Merge branch 'master' of 192.168.0.27:dev0/PriceSystem

This commit is contained in:
2018-04-02 14:43:26 +08:00
3 changed files with 14 additions and 65 deletions
+5 -1
View File
@@ -243,7 +243,7 @@ def find_disanganf_price(query, fields=None):
# db1 = client1.fangjia
# dsf = db1.average_statistics
# s = time.time()
seawater105 = get_collection("fangjia", "average_statistics", "192.168.0.136", 27017)
seawater105 = get_collection("fangjia", "average_statistics", config.get_mongodb_host(), 27017)
for err_count in range(0, 10):
try:
@@ -273,7 +273,11 @@ def dis_feature(query, fields=None):
# db1 = client1.fangjia
# dsf = db1.average_statistics
# s = time.time()
<<<<<<< HEAD
seawater105 = get_collection("fangjia_stat", "district_feature",config.get_mongodb_host(), 27017)
=======
seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port())
>>>>>>> 09017dda8ec82bf1b4eea67648f8c33417df32f7
for err_count in range(0, 10):
try: