Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
This commit is contained in:
@@ -68,11 +68,16 @@ def get_rent_calc_cmd_queue_name():
|
||||
|
||||
##########################################3
|
||||
#the code below is about square meter rent price
|
||||
<<<<<<< HEAD
|
||||
'''
|
||||
def get_65_host():
|
||||
return 'seawater65.mongo.com'
|
||||
|
||||
'''
|
||||
=======
|
||||
|
||||
|
||||
>>>>>>> 67c2f84e40589c303de5058584fc0e88563eab9e
|
||||
def get_sqm_rentprice_db():
|
||||
return "sqmetre_rent"
|
||||
|
||||
@@ -84,6 +89,7 @@ def get_lg_mongo():
|
||||
def get_rent_redis_db():
|
||||
return 1
|
||||
|
||||
|
||||
def get_save_db():
|
||||
return 'district_stat_all_0427'
|
||||
|
||||
|
||||
@@ -311,7 +311,7 @@ def find_seaweed(query, fields=None):
|
||||
# db1 = client1.fangjia
|
||||
# seaweed1 = db1.seaweed
|
||||
# s = time.time()
|
||||
seawater105 = get_collection("fangjia", "seaweed", 'mongo.db.fangjia.com', 27017)
|
||||
seawater105 = get_collection("fangjia", "seaweed", config.get_seaweed_host(), 27017)
|
||||
for err_count in range(0, 10):
|
||||
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user