修改天气城市赋值逻辑

Controller/DeviceConfirmRegion.py

@@ -41,7 +41,7 @@ class ConfirmRegion(TemplateView):
                     if not device_domain_qs.exists():
                         DeviceDomainModel.objects.create(ip=ip, country_name=country_code, api=api)
 
-                    return response.json(0, {'request_api_url': api, 'push_api': push_api})
+                    return response.json(0, {'request_api_url': api, 'push_api_url': push_api})
 
             # 不存在则返回美洲域名
             region_qs = RegionModel.objects.filter(continent_code='NA').values('api', 'push_api')
@@ -51,10 +51,11 @@ class ConfirmRegion(TemplateView):
             if not device_domain_qs.exists():
                 DeviceDomainModel.objects.create(ip=ip, country_name='NA', api=api)
 
-            return response.json(0, {'request_api_url': api, 'push_api': push_api})
+            return response.json(0, {'request_api_url': api, 'push_api_url': push_api})
         except Exception as e:
             print(e)
-            return response.json(0, {'request_api_url': 'https://www.dvema.com', 'push_api': 'https://push.dvema.com'})
+            return response.json(0, {'request_api_url': 'https://www.dvema.com',
+                                     'push_api_url': 'https://push.dvema.com'})
 
 
 # 根据设备的ip返回域名和地区id

Object/IPWeatherObject.py

@@ -33,14 +33,24 @@ class IPQuery:
             res_data = eval(res.content.decode('utf-8'))
             if res_data['ret'] == 200:
                 district = res_data['data']['district']
-                city = res_data['data']['city'] + '市'
+
+                # 城市数据不为空字符,拼上'市'字
+                city = res_data['data']['city']
+                if city != '':
+                    city += '市'
+
                 region = res_data['data']['region']
                 country_id = res_data['data']['country_id']
 
                 # ip地址信息存表
                 IPAddr.objects.create(ip=ip, district=district, city=city, region=region, country_code=country_id)
 
-                self.district = district if district else city
+                # 确定天气城市
+                if district != '':
+                    self.district = district
+                elif city != '':
+                    self.district = city
+
                 self.country_id = country_id