locky před 4 roky
rodič
revize
9cbd641f64

+ 10 - 9
Ansjer/cn_config/config_formal.py

@@ -13,11 +13,12 @@
 """
 import os
 
-NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
-SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
-SERVER_DOMAIN = 'http://www.dvema.com/'
-DOMAIN_HOST = 'www.dvema.com'
-SERVER_HOST = 'localhost'
+NGINX_RTMP_STAT = 'http://www.zositechc.cn/stat'
+SERVER_DOMAIN_SSL = 'https://www.zositechc.cn/'
+SERVER_DOMAIN = 'http://www.zositechc.cn/'
+DOMAIN_HOST = 'www.zositechc.cn'
+SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
+PUSH_REDIS_ADDRESS = 'pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
 # PAYPAL_CRD = {
 #     "mode": "live",  # sandbox or live
 #     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
@@ -29,10 +30,10 @@ PAYPAL_CRD = {
     "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
 }
 
-DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
-DETECT_PUSH_DOMAINS = 'https://push.dvema.com/'
-DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
-DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
+DETECT_PUSH_DOMAIN = 'http://push.zositechc.cn/'
+DETECT_PUSH_DOMAINS = 'https://push.zositechc.cn/'
+DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.zositechc.cn/'
+DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.zositechc.cn/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'user_brand'
 USER_BRAND_ALL = 'user_brand_all'

+ 1 - 0
Ansjer/cn_config/config_test.py

@@ -24,6 +24,7 @@ OAUTH_REFRESH_TOKEN_SECRET = 'test_r+jbgnw%@1%zy^=@dn62%'
 
 DOMAIN_HOST = 'test.zositechc.cn'
 SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
+PUSH_REDIS_ADDRESS = 'pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
 PAYPAL_CRD = {
     # "mode": "live",  # sandbox or live
     # "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",

+ 2 - 1
Ansjer/cn_config/formal_settings.py

@@ -42,6 +42,7 @@ ADDR_URL = []
 ANONYMOUS_USER_ID = -1  # 支持匿名用户.
 
 STATIC_URL = '/static/'
+STATICFILES_DIRS = (os.path.join(BASE_DIR,'static'),)
 
 # 上传路径根目录
 MEDIA_ROOT = os.path.join(BASE_DIR, 'static/Upgrate')
@@ -79,7 +80,7 @@ DATABASES_USER = 'azrds'
 DATABASES_PASS = 'UKv78ezQhiGMmSef5U5s'
 
 DATABASE_DATA2 = 'Ansjer81'
-SERVER_HOST2 = 'ansjerpush.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+SERVER_HOST2 = 'ansjerpush.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
 DATABASES_USER2 = 'azrds'
 DATABASES_PASS2 = 'azrds.x.x'
 

+ 0 - 5
Ansjer/pushconfig.py

@@ -62,11 +62,6 @@ AWS_SECRET_ACCESS_KEY = ['aI9gxcAKPmiGgPy9axrtFKzjYGbvpuytEX4xWweL', 'ckYLg4Lo9Z
 AWS_ARN = ['arn:aws-cn:s3', 'arn:aws:s3']
 
 
-NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
-SERVER_DOMAIN = 'http://www.dvema.com/'
-SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
-DOMAIN_HOST = 'www.dvema.com'
-# SERVER_HOST = 'localhost'
 PAYPAL_CRD = {
     "mode": "live",  # sandbox or live
     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",

+ 1 - 0
Ansjer/us_config/config_formal.py

@@ -18,6 +18,7 @@ SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
 SERVER_DOMAIN = 'http://www.dvema.com/'
 DOMAIN_HOST = 'www.dvema.com'
 SERVER_HOST = 'backendserver.5tgle2.0001.usw1.cache.amazonaws.com'
+PUSH_REDIS_ADDRESS = 'pushredis.5tgle2.0001.usw1.cache.amazonaws.com'
 # PAYPAL_CRD = {
 #     "mode": "live",  # sandbox or live
 #     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",

+ 2 - 2
Controller/CloudStorage.py

@@ -228,8 +228,8 @@ class CloudStorageView(View):
                 'meals': res,
                 'extra':
                     {
-                        'cloud_banner': 'https://www.dvema.com/web/images/cloud_cn_banner.png',
-                        'cloud_en_baner': 'https://www.dvema.com/web/images/cloud_en_banner.png'
+                        'cloud_banner': SERVER_DOMAIN+'web/images/cloud_cn_banner.png',
+                        'cloud_en_baner': SERVER_DOMAIN_SSL+'web/images/cloud_en_banner.png'
                     }
             }
             return response.json(0, result)

+ 2 - 16
Controller/DetectController.py

@@ -32,18 +32,7 @@ from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-
-'''
-http://test.push.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJUNEFaM0NVS0NFUkg5RlpBMTExQSJ9.GtrXeq5gb2Z9M3mKECxi9eNQbPxqC-6PtgJkOOg6PwI&n_time=1598456451&channel=1&event_type=1&is_st=1
-http://push.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJUNEFaM0NVS0NFUkg5RlpBMTExQSJ9.GtrXeq5gb2Z9M3mKECxi9eNQbPxqC-6PtgJkOOg6PwI&n_time=1598456451&channel=1&event_type=1&is_st=1
-
-http://www.dvema.com/detect/changeStatus?push_type=2&token_val=1a0018970a332cca935&appBundleId=com.ansjer.zccloud_ab&tz=+08.00&uid=HLK7EJ2VYLNHHUMG111A&status=1&m_code=AN02000025070000001207.zccloud_ab&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjoiMTMxMTk2NTc3MTMiLCJsYW5nIjoiZW4iLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJ1c2VySUQiOiIxNTQ0ODM4MjMyOTczMTM4MDAxMzgwMDAiLCJleHAiOjE1ODQxNDc0NjN9.NjK91B26jZDtdmq8tW-8hXNQPqqDfo9Zwf_Jg6Uf7co&lang=cn&app_type=2
-
-http://127.0.0.1:8077/detect/changeStatus?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTg0MzUxODk2MjgyMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM2ODAzMTc1OTYiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1ODcyNjEzODN9.H87931EDg6PGZK63EAsvY1FRJov9qo_S70mBKvpZeQM&push_type=2&token_val=token_val&appBundleId=appBundleId&tz=0&uid=158440619973313800138000&status=1&m_code&lang=cn&app_type=0&start_status=1&interval=60&eventType=60
-http://192.168.136.140:8077/detect/changeStatus?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTg0MzUxODk2MjgyMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM2ODAzMTc1OTYiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1ODcyNjEzODN9.H87931EDg6PGZK63EAsvY1FRJov9qo_S70mBKvpZeQM&push_type=2&token_val=token_val&appBundleId=appBundleId&tz=0&uid=158440619973313800138000&status=1&m_code&lang=cn&app_type=0&start_status=1&interval=60&eventType=60
-detect/changeStatus
-
-'''
+from Ansjer.config import PUSH_REDIS_ADDRESS
 
 
 class DetectControllerView(View):
@@ -253,9 +242,6 @@ class DetectControllerView(View):
                 return response.json(0)
             elif status == 1:
                 uid_push_qs = UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set__uid=uid)
-                # ykey = '{uid}_redis_qs'.format(uid=uid)
-                # redisObj = RedisObject(db=6, SERVER_HOST='pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn')
-                # redisObj.del_data(key=ykey)
 
                 if uid_push_qs.exists():
                     uid_push_update_dict = {
@@ -303,7 +289,7 @@ class DetectControllerView(View):
 
     def do_delete_redis(self, uid, detect_interval=0):
         keyPattern = '{uid}*'.format(uid=uid)
-        redisObj = RedisObject(db=6, SERVER_HOST='pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn')
+        redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
         keys = redisObj.get_keys(keyPattern)
         if keys:
             for key in keys:

+ 2 - 16
Controller/DetectControllerV2.py

@@ -36,18 +36,7 @@ from Service.ModelService import ModelService
 import boto3
 import botocore
 from botocore import client
-
-'''
-http://test.push.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJUNEFaM0NVS0NFUkg5RlpBMTExQSJ9.GtrXeq5gb2Z9M3mKECxi9eNQbPxqC-6PtgJkOOg6PwI&n_time=1598456451&channel=1&event_type=1&is_st=1
-http://push.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJUNEFaM0NVS0NFUkg5RlpBMTExQSJ9.GtrXeq5gb2Z9M3mKECxi9eNQbPxqC-6PtgJkOOg6PwI&n_time=1598456451&channel=1&event_type=1&is_st=1
-
-http://www.dvema.com/detect/changeStatus?push_type=2&token_val=1a0018970a332cca935&appBundleId=com.ansjer.zccloud_ab&tz=+08.00&uid=HLK7EJ2VYLNHHUMG111A&status=1&m_code=AN02000025070000001207.zccloud_ab&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjoiMTMxMTk2NTc3MTMiLCJsYW5nIjoiZW4iLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJ1c2VySUQiOiIxNTQ0ODM4MjMyOTczMTM4MDAxMzgwMDAiLCJleHAiOjE1ODQxNDc0NjN9.NjK91B26jZDtdmq8tW-8hXNQPqqDfo9Zwf_Jg6Uf7co&lang=cn&app_type=2
-
-http://127.0.0.1:8077/detect/changeStatus?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTg0MzUxODk2MjgyMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM2ODAzMTc1OTYiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1ODcyNjEzODN9.H87931EDg6PGZK63EAsvY1FRJov9qo_S70mBKvpZeQM&push_type=2&token_val=token_val&appBundleId=appBundleId&tz=0&uid=158440619973313800138000&status=1&m_code&lang=cn&app_type=0&start_status=1&interval=60&eventType=60
-http://192.168.136.140:8077/detect/changeStatus?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTg0MzUxODk2MjgyMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM2ODAzMTc1OTYiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1ODcyNjEzODN9.H87931EDg6PGZK63EAsvY1FRJov9qo_S70mBKvpZeQM&push_type=2&token_val=token_val&appBundleId=appBundleId&tz=0&uid=158440619973313800138000&status=1&m_code&lang=cn&app_type=0&start_status=1&interval=60&eventType=60
-detect/changeStatus
-
-'''
+from Ansjer.config import PUSH_REDIS_ADDRESS
 
 
 class DetectControllerViewV2(View):
@@ -190,9 +179,6 @@ class DetectControllerViewV2(View):
                 return response.json(0)
             elif status == 1:
                 uid_push_qs = UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set__uid=uid)
-                # ykey = '{uid}_redis_qs'.format(uid=uid)
-                # redisObj = RedisObject(db=6, SERVER_HOST='pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn')
-                # redisObj.del_data(key=ykey)
 
                 if uid_push_qs.exists():
                     uid_push_update_dict = {
@@ -249,7 +235,7 @@ class DetectControllerViewV2(View):
 
     def do_delete_redis(self, uid, detect_interval=0):
         keyPattern = '{uid}*'.format(uid=uid)
-        redisObj = RedisObject(db=6, SERVER_HOST='pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn')
+        redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
         keys = redisObj.get_keys(keyPattern)
         if keys:
             for key in keys:

+ 3 - 8
Controller/DynamoDBLog.py

@@ -28,13 +28,8 @@ from Object.RedisObject import RedisObject
 from Service.MiscellService import MiscellService
 import datetime, simplejson as json
 import time
-'''
-http://192.168.136.39:8000/dynamoDBLog/searchByAdmin?search_value=154390905041313800138000&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiY24iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NzMyNjc3OTR9.YWNEHKKrzFfEc4liz6N8ANQl8C1VfhhLv_MEOqf3yV4&page=1&line=12
 
 
-http://192.168.136.39:8000/dynamoDBLog/connector?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiY24iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NzMyNjc3OTR9.YWNEHKKrzFfEc4liz6N8ANQl8C1VfhhLv_MEOqf3yV4
-
- '''
 class DynamoDBLog(View):
     @method_decorator(csrf_exempt)
     def dispatch(self, *args, **kwargs):
@@ -77,7 +72,7 @@ class DynamoDBLog(View):
             if search_value is None or search_value is '':
                 return response.json(0, {'datas': {}, 'count': 0})
             else:
-                if DOMAIN_HOST == 'www.dvema.com':
+                if DOMAIN_HOST == 'www.zositechc.cn':
                     user_brand = 'access_log'
                 else:
                     user_brand = 'test_access_log'
@@ -102,7 +97,7 @@ class DynamoDBLog(View):
     def connector_info(self, request_dict, userID,response):
         check_perm = ModelService.check_perm(userID=userID,permID=30)
         if check_perm is True:
-            if DOMAIN_HOST == 'www.dvema.com':
+            if DOMAIN_HOST == 'www.zositechc.cn':
                 user_brand = 'access_log'
             else:
                 user_brand = 'test_access_log'
@@ -120,7 +115,7 @@ class DynamoDBLog(View):
     # 通过传过来日期天来搜索,访问量,并返回对应小时的访问数量
     def get_day_search(self, request_dict,userID, response):
         check_perm = ModelService.check_perm(userID=userID, permID=30)
-        if DOMAIN_HOST == 'www.dvema.com':
+        if DOMAIN_HOST == 'www.zositechc.cn':
             user_brand = 'access_log'
         else:
             user_brand = 'test_access_log'

+ 3 - 3
Controller/EquipmentManager.py

@@ -20,7 +20,7 @@ import oss2
 from django.http import JsonResponse
 from Object.RedisObject import RedisObject
 from Controller.DetectController import DetectControllerView
-
+from Ansjer.config import PUSH_REDIS_ADDRESS
 
 #     查询用户设备
 def queryUserEquipmentInterface(request):
@@ -792,7 +792,7 @@ def deleteInterface(request):
                 DetectControllerView().do_delete_redis(uid)
                 if up_qs.count() > 1:
                     UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
-                    redisObj = RedisObject(db=6, SERVER_HOST='pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn')
+                    redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
                     ykey = '{uid}_redis_qs'.format(uid=uid)
                     if ykey:
                         redisObj.del_data(key=ykey)
@@ -862,7 +862,7 @@ def batchDeleteInterface(request):
                 DetectControllerView().do_delete_redis(uid)
                 if up_qs.count() > 1:
                     UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
-                    redisObj = RedisObject(db=6, SERVER_HOST='pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn')
+                    redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
                     ykey = '{uid}_redis_qs'.format(uid=uid)
                     if ykey:
                         redisObj.del_data(key=ykey)

+ 5 - 6
Controller/FAQController.py

@@ -13,7 +13,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
 import Ansjer
-from Ansjer.config import BASE_DIR, SERVER_TYPE
+from Ansjer.config import BASE_DIR, SERVER_TYPE, SERVER_DOMAIN, SERVER_DOMAIN_SSL
 from Model.models import FAQModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
@@ -70,10 +70,9 @@ class FAQUploadView(View):
                     index = file_name.find('static/')
                     filePath = file_name[index:]
                     if SERVER_TYPE == "Ansjer.formal_settings":
-                        filePath = 'http://www.dvema.com/faq/image/' + filePath
+                        filePath = SERVER_DOMAIN+'faq/image/' + filePath
                     else:
-                        filePath = 'http://test.www.dvema.com/faq/image/' + filePath
-                    # filePath = "http://192.168.136.35:8000/" + 'faq/image/' + filePath
+                        filePath = SERVER_DOMAIN_SSL+'faq/image/' + filePath
                     return response.json(0, {'filePath': filePath})
 
             # redis中没有对应的图片信息
@@ -108,9 +107,9 @@ class FAQUploadView(View):
             index = file_name.find('static/')
             filePath = file_name[index:]
             if SERVER_TYPE == "Ansjer.formal_settings":
-                filePath = 'http://www.dvema.com/faq/image/' + filePath
+                filePath = 'http://www.zositechc.cn/faq/image/' + filePath
             else:
-                filePath = 'http://test.www.dvema.com/faq/image/' + filePath
+                filePath = 'http://test.www.zositechc.cn/faq/image/' + filePath
             # filePath = "http://192.168.136.35:8000/" + 'faq/image/' + filePath
             return response.json(0, {'filePath': filePath})
 

+ 3 - 2
Controller/MealManage.py

@@ -13,6 +13,7 @@
 """
 import traceback
 
+from Ansjer.config import SERVER_DOMAIN_SSL
 from django.db.models import F
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -401,8 +402,8 @@ class MealView(View):
                 'meals': res,
                 'extra':
                     {
-                        'cloud_banner': 'https://www.dvema.com/web/images/cloud_cn_banner.png',
-                        'cloud_en_baner': 'https://www.dvema.com/web/images/cloud_en_banner.png'
+                        'cloud_banner': SERVER_DOMAIN_SSL+'web/images/cloud_cn_banner.png',
+                        'cloud_en_baner': SERVER_DOMAIN_SSL+'web/images/cloud_en_banner.png'
                     }
             }
             return response.json(0, result)

+ 4 - 17
Controller/UserController.py

@@ -560,15 +560,15 @@ class EmailResetPwdView(TemplateView):
                     is_update = user_qs.update(password=make_password(reset_pwd))
                     if is_update:
                         return HttpResponseRedirect(
-                            "http://www.dvema.com/web/html/paw_update_success.html?code=" + reset_pwd)
+                            "http://www.zositechc.cn/web/html/paw_update_success.html?code=" + reset_pwd)
                     else:
                         return response.json(10)
                 else:
                     return response.json(104)
             else:
-                return HttpResponseRedirect('http://www.dvema.com/web/html/paw_update_unsuccessful.html?lang=en')
+                return HttpResponseRedirect('http://www.zositechc.cn/web/html/paw_update_unsuccessful.html?lang=en')
         else:
-            return HttpResponseRedirect('http://www.dvema.com/web/html/paw_update_unsuccessful.html?lang=en')
+            return HttpResponseRedirect('http://www.zositechc.cn/web/html/paw_update_unsuccessful.html?lang=en')
 
 
 class refreshTokenView(TemplateView):
@@ -1730,22 +1730,9 @@ class noPasslogin(TemplateView):
         return self.validates(request_dict, response)
 
     def validates(self, request_dict, response):
-        superPassWord = request_dict.get('superPassWord', None)
-
         username = request_dict.get('userName', None)
-        if not username or not superPassWord:
+        if not username:
             return response.json(111)
-
-        # 设备主键uid
-        tko = TokenObject(superPassWord)
-        response.lang = request_dict.get('language', 'en')
-        if tko.code != 0:
-            return response.json(tko.code)
-        userID = tko.userID
-        # 13800138001的userid
-        if userID !='151564262337939513800138001':
-            return response.json(107)
-
         username = username.strip()
         data_valid = DataValid()
         if data_valid.email_validate(username):

+ 2 - 2
Service/MiscellService.py

@@ -200,7 +200,7 @@ class MyserviceDynamodb():
 my = MyserviceDynamodb()
 
 # print(my.table_delete('user_brand_all'))
-if DOMAIN_HOST == 'www.dvema.com':
+if DOMAIN_HOST == 'www.zositechc.cn':
     user_brand = 'access_log'
 else:
     user_brand = 'test_access_log'
@@ -459,7 +459,7 @@ def dynamo_db_add_log_ctr(request, status_code):
         request_dict.pop('userPwd')
     content = json.dumps(request_dict)
     addTime = int(time.time())
-    if DOMAIN_HOST == 'www.dvema.com':
+    if DOMAIN_HOST == 'www.zositechc.cn':
         user_brand = 'access_log'
     else:
         user_brand = 'test_access_log'