update ip data

Controller/EquipmentStatus.py

@@ -98,6 +98,7 @@ def getTZ(request):
     c = request_dict.get('etk', None)
     ip = request_dict.get('ip', None)
     lang = request_dict.get('lang', None)
+    update = request_dict.get('update',None)
     if not ip:
         ip = CommonService.get_ip_address(request)
     if c:
@@ -108,7 +109,10 @@ def getTZ(request):
         uid = c.decode('utf-8')
         if len(uid) == 20:
             print(uid)
-            info = CommonService.getIpIpInfo(ip=ip, lang=lang)
+            if update:
+                info = CommonService.getIpIpInfo(ip=ip, lang=lang,update=True)
+            else:
+                info = CommonService.getIpIpInfo(ip=ip, lang=lang,update=False)
             try:
                 tz = info['utc_offset']
                 # 增加GMT,且补:00

Controller/UserBrandController.py

@@ -126,7 +126,7 @@ class UserBrandInfo(View):
         else:
             status = 0
             print(self.clientIP)
-            jsonData = CommonService.getIpIpInfo(ip=self.clientIP, lang='CN')
+            jsonData = CommonService.getIpIpInfo(ip=self.clientIP, lang='CN', update=False)
             country = jsonData['country_name']
             province = jsonData['region_name']
             city = jsonData['city_name']

Service/CommonService.py

@@ -98,8 +98,11 @@ class CommonService:
 
     # 通过ip检索ipip指定信息 lang为CN或EN
     @staticmethod
-    def getIpIpInfo(ip,lang):
-        db = ipdb.City(BASE_DIR + "/DB/mydata4vipday2.ipdb")
+    def getIpIpInfo(ip,lang,update=False):
+        ipbd_dir = BASE_DIR + "/DB/mydata4vipday2.ipdb"
+        db = ipdb.City(ipbd_dir)
+        if update:
+            db.reload(ipbd_dir)
         info = db.find_map(ip, lang)
         return info