Просмотр исходного кода

修改时区配置,测试创建数据DateTimeField自动生成的时间

locky 3 лет назад
Родитель
Сommit
90c3dfe818
3 измененных файлов с 30 добавлено и 7 удалено
  1. 3 3
      Ansjer/cn_config/test_settings.py
  2. 1 1
      Ansjer/local_config/local_settings.py
  3. 26 3
      Controller/TestApi.py

+ 3 - 3
Ansjer/cn_config/test_settings.py

@@ -134,11 +134,11 @@ AUTH_PASSWORD_VALIDATORS = [
 ]
 
 LANGUAGE_CODE = 'en-us'
-# TIME_ZONE = 'Asia/Shanghai'
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Asia/Shanghai'
+# TIME_ZONE = 'UTC'
 USE_I18N = True
 USE_L10N = True
-USE_TZ = True
+USE_TZ = False
 
 # 跨域增加忽略
 CORS_ALLOW_CREDENTIALS = True

+ 1 - 1
Ansjer/local_config/local_settings.py

@@ -172,7 +172,7 @@ TIME_ZONE = 'Asia/Shanghai'
 # TIME_ZONE = 'UTC'
 USE_I18N = True
 USE_L10N = True
-USE_TZ = True
+USE_TZ = False
 
 # 跨域增加忽略
 CORS_ALLOW_CREDENTIALS = True

+ 26 - 3
Controller/TestApi.py

@@ -16,6 +16,8 @@ from django.db import transaction
 from django.views.generic.base import View
 import os
 
+from Controller.DeviceConfirmRegion import Device_Region
+
 '''
 http://192.168.136.40:8077/Test
 '''
@@ -44,9 +46,9 @@ from django.views.generic.base import View
 from Object.RedisObject import RedisObject
 from django.contrib.auth.hashers import make_password, check_password  # 对密码加密模块
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD, \
-    SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
+    SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, SERVER_TYPE
 from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket, CompanySerialModel, \
-    SerialNumberModel, CompanyModel, VPGModel, Unused_Uid_Meal, StsCrdModel, ExperienceContextModel
+    SerialNumberModel, CompanyModel, VPGModel, Unused_Uid_Meal, StsCrdModel, ExperienceContextModel, DeviceLogModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
@@ -132,6 +134,12 @@ class testView(View):
             return self.testRekognition(request,request_dict)
         elif operation == 'deleteDevice':
             return self.delete_device(response)
+        elif operation == 'ip':
+            return self.ip(response)
+        elif operation == 'configType':
+            return self.configType(response)
+        elif operation == 'createData':
+            return self.createData(request_dict, response)
         else:
             return 123
 
@@ -714,7 +722,7 @@ class testView(View):
         # UserIdToken
         tko = TokenObject()
         res = tko.generate(
-            data={'userID': 158943594633713800138000, 'lang': 'cn', 'user': '597471180@qq.com', 'm_code': '123413243214'})
+            data={'userID': 160879593527813800138000, 'lang': 'cn', 'user': '597471180@qq.com', 'm_code': '123413243214'})
         #uidToken
         # utko = UidTokenObject()
         # res = utko.generate(data={'uid': '4UZSEDP93MJ3X7YB111A','channel': 1})
@@ -803,4 +811,19 @@ class testView(View):
         except Exception as e:
             return response.json(500, repr(e))
 
+    def ip(self, response):
+        ip = '67.220.90.13'
+        country_id = Device_Region().get_device_region(ip)
+        print(country_id)
+        return response.json(0)
+
+    def configType(self, response):
+        print(SERVER_TYPE)
+        return response.json(0)
 
+    def createData(self, request_dict, response):
+        uid = request_dict.get('uid', None)
+        # filter_date = datetime.datetime.now()-datetime.timedelta(days=4)
+        # qs = DeviceLogModel.objects.filter(add_time__lt=filter_date)
+        DeviceLogModel.objects.create(uid=uid)
+        return response.json(0)