diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index adae809..e69b12f 100644 --- a/PriceSystem/config/__init__.py +++ b/PriceSystem/config/__init__.py @@ -51,7 +51,7 @@ def get_seawater_host(): def get_seaweed_host(): - return "192.168.10.182" + return "192.168.0.136" def get_seaweed_port(): diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 8f9fd16..4decb82 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -152,10 +152,15 @@ def findHouse(query, fields=None): seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777) for err_count in range(0, 10): try: +<<<<<<< HEAD lt = 100 # seawater.find(query,{"p_date":-1}).sort([("p_date",-1)]) pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt)) #pos = list(seawater105.find(query, fields).limit(lt)) +======= + lt = 1000 + pos = list(seawater105.find(query, fields).limit(lt)) +>>>>>>> 9b39a072aff955aeed773a2c859e1d355ec52231 data = pandas.DataFrame(pos) del pos # print("==================>", time.time() - s) diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 58eaf6a..643ac0a 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -41,10 +41,16 @@ rl='涧西' 常州新北中央花园天宁新天地花苑钟楼项家花园常 lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村上海长宁绿地海怡公寓新北 典雅花园 南区亨纳斯花园杨浦上海嘉定浏翔花苑北京 昌平 回龙观三期'东华苑'上海', '普陀', "['科普院' """ +<<<<<<< HEAD ct='常州' rl='天宁' lk='青山湾' +======= +ct='上海' +rl='长宁' +lk='绿地海怡公寓' +>>>>>>> 9b39a072aff955aeed773a2c859e1d355ec52231 #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #洛阳涧西奥阳康城