house tool f

app/controller/house/tool.js

@@ -189,19 +189,20 @@ class ToolController extends Controller {
             direction_str: { type: 'string', required: true },
             floor: { type: 'string', required: true },
             total_floor: { type: 'string', required: true },
-            area_code: { type: 'string', required: true },
+            city_py: { type: 'string', required: true },
         };
         ctx.validate(rule, input_params);
-        const city = await ctx.blockModel.City.one({ where: { code: input_params.area_code } });
-        if (!city || !city.pinyin || Object.keys(city).length === 0) {
-            ctx.failed('暂不支持城市');
-        }
-        const city_pinyin_array = city.pinyin.split(' ');
-        let city_pinyin = '';
-        for (let i=0; i < city_pinyin_array.length - 1; i++) {
-            const pinyin = city_pinyin_array[i];
-            city_pinyin += pinyin;
-        };
+        // const city = await ctx.blockModel.City.one({ where: { code: input_params.area_code } });
+        // if (!city || !city.pinyin || Object.keys(city).length === 0) {
+        //     ctx.failed('暂不支持城市');
+        // }
+        // const city_pinyin_array = city.pinyin.split(' ');
+        // let city_pinyin = '';
+        // for (let i = 0; i < city_pinyin_array.length - 1; i++) {
+        //     const pinyin = city_pinyin_array[i];
+        //     city_pinyin += pinyin;
+        // };
+        const city_pinyin = input_params.city_py;
         const residential_id = input_params.residential_id;
         const residential_name = input_params.residential_name;
         const area = input_params.area;
@@ -231,10 +232,13 @@ class ToolController extends Controller {
 
         // await this.httprequest(qfang_url_chaxun, data);
         // return;
-        const ret1 = await ctx.curl(qfang_url_area, { method: 'POST' });
-        if(ret1.status !== 200){
+        let ret1;
+        try {
+            ret1 = await ctx.curl(qfang_url_area, { method: 'POST' });
+        } catch (error) {
             ctx.failed('暂不支持该城市');
         }
+
         // ctx.success(ret1); return;
         const headers = ret1.headers;
         const cookies = headers['set-cookie'];
@@ -350,24 +354,31 @@ class ToolController extends Controller {
         const input_parmas = ctx.query;
         const rule = {
             keyword: { type: 'string', required: true },
-            area_code: { type: 'string', required: true },
+            city_py: { type: 'string', required: true },
         }
         ctx.validate(rule, input_parmas);
-        const city = await ctx.blockModel.City.one({ where: { code: input_parmas.area_code } });
-        if (!city || !city.pinyin || Object.keys(city).length === 0) {
-            ctx.failed('暂不支持城市');
-        }
-        const city_pinyin_array = city.pinyin.split(' ');
-        let city_pinyin = '';
-        for (let i=0; i < city_pinyin_array.length - 1; i++) {
-            const pinyin = city_pinyin_array[i];
-            city_pinyin += pinyin;
-        };
+        // const city = await ctx.blockModel.City.one({ where: { code: input_parmas.area_code } });
+        // if (!city || !city.pinyin || Object.keys(city).length === 0) {
+        //     ctx.failed('暂不支持城市');
+        // }
+        // const city_pinyin_array = city.pinyin.split(' ');
+        // let city_pinyin = '';
+        // for (let i = 0; i < city_pinyin_array.length - 1; i++) {
+        //     const pinyin = city_pinyin_array[i];
+        //     city_pinyin += pinyin;
+        // };
+        const city_pinyin = input_parmas.city_py;
         const qfang_url = `https://${city_pinyin}.qfang.com/fangjia/getGarden`;
         const keyword = encodeURIComponent(input_parmas.keyword);
-        const result = await ctx.helper.send_request(qfang_url + '?keyword=' + keyword, {}, { dataType: 'json' });
+        let result;
+        try {
+            result = await ctx.helper.send_request(qfang_url + '?keyword=' + keyword, {}, { dataType: 'json' });
+        } catch (error) {
+            ctx.failed('暂不支持该城市');
+        }
+
         let ret = [];
-        if(result.status !== 200){
+        if (result.status !== 200) {
             ctx.failed('暂不支持该城市');
         }
         if (result.status === 200 && result.data && result.data.items) {