Forráskód Böngészése

初始化用户地区相关2

chenshibin 4 éve
szülő
commit
7c517ed1c8
2 módosított fájl, 6 hozzáadás és 4 törlés
  1. 5 3
      Controller/RegionCountryController.py
  2. 1 1
      Model/models.py

+ 5 - 3
Controller/RegionCountryController.py

@@ -34,7 +34,7 @@ class RegionCountryView(View):
         if operation == 'initUserRegion':
             return self.do_initUserRegion(token.userID, request_dict, response)
         elif operation == 'initRegionDate':
-            return self.do_initRegionDate(token.userID, request_dict, response)
+            return self.do_initRegionDate(request_dict, response)
         else:
             return response.json(404)
 
@@ -47,9 +47,11 @@ class RegionCountryView(View):
 
     def do_initRegionDate(self, request_dict, response):
         filepath = request_dict.get('filepath')
-        fobj = open(filepath)
-        region_list = json.loads(fobj)
 
+        with open(filepath, 'r', encoding='UTF-8') as f:
+            region_list = json.load(f)
+
+        #region_list = json.loads(fobj)
         now_time = int(time.time())
 
         for region in region_list:

+ 1 - 1
Model/models.py

@@ -121,7 +121,7 @@ class Role(models.Model):
 
 class RegionCountryModel(models.Model):
     number = models.IntegerField(primary_key=True, verbose_name='唯一标识')
-    region_id = models.IntegerField(unique=True, verbose_name='大洲编号')
+    region_id = models.IntegerField(verbose_name='大洲编号')
     name = models.CharField(unique=True, max_length=50, verbose_name=u'名称')
     cn = models.CharField(blank=True, max_length=64, verbose_name=u'中文名称')
     en = models.CharField(blank=True, max_length=64, verbose_name=u'英文名称')