欧洲服务器配置

AdminController/dataSystemManagement/ServiceDataController.py

@@ -42,13 +42,13 @@ class ServiceDataView(View):
             return self.query_first_pay_order(request_dict, response)
         elif operation == 'repeatPayOrder':  # 查询复购订单数据
             return self.query_repeat_pay_order(request_dict, response)
-        elif operation == 'global/payOrder':  # 查询付费订单数据
+        elif operation == 'global/payOrder':  # 查询全球付费订单数据
             return self.query_global_pay_order(request, request_dict, response)
-        elif operation == 'global/freeOrder':  # 查询免费订单数据
+        elif operation == 'global/freeOrder':  # 查询全球免费订单数据
             return self.query_global_free_order(request, request_dict, response)
-        elif operation == 'global/firstPayOrder':  # 查询首次付费订单数据
+        elif operation == 'global/firstPayOrder':  # 查询全球首次付费订单数据
             return self.query_global_first_pay_order(request, request_dict, response)
-        elif operation == 'global/repeatPayOrder':  # 查询复购订单数据
+        elif operation == 'global/repeatPayOrder':  # 查询全球复购订单数据
             return self.query_global_repeat_pay_order(request, request_dict, response)
         else:
             return response.json(414)

Ansjer/config.py

@@ -101,6 +101,9 @@ elif SERVER_TYPE == 'Ansjer.us_config.test_settings':
     from Ansjer.us_config.config_test import *
 elif SERVER_TYPE == 'Ansjer.us_config.formal_settings':
     from Ansjer.us_config.config_formal import *
+# 欧洲
+elif SERVER_TYPE == 'Ansjer.eur_config.formal_settings':
+    from Ansjer.eur_config.config_formal import *
 
 # 国内
 elif SERVER_TYPE == 'Ansjer.cn_config.formal_settings':

Ansjer/eur_config/config_formal.py

@@ -20,8 +20,8 @@ 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 = 'backendserver.5tgle2.0001.usw1.cache.amazonaws.com'
-PUSH_REDIS_ADDRESS = 'pushredis.5tgle2.0001.usw1.cache.amazonaws.com'
+SERVER_HOST = 'server-redis.av1kep.ng.0001.euw1.cache.amazonaws.com'
+PUSH_REDIS_ADDRESS = 'push-redis.av1kep.ng.0001.euw1.cache.amazonaws.com'
 # PAYPAL_CRD = {
 #     "mode": "live",  # sandbox or live
 #     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
@@ -133,4 +133,14 @@ APNS_MODE = 'prod'
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
 
-TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
+TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
+
+# aws api key
+AWS_ARN_S3 = 'arn:aws:s3'
+REGION_NAME = 'us-east-1'
+ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
+SECRET_ACCESS_KEY = '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'
+
+# 存储桶名
+AVATAR_BUCKET = 'avatar-us'         # 头像存储桶
+LOG_BUCKET = 'ansjer-statres'       # 日志存储桶

Ansjer/eur_config/formal_settings.py

@@ -70,19 +70,19 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'Ansjer.us_config.formal_wsgi.application'
+WSGI_APPLICATION = 'Ansjer.eur_config.formal_wsgi.application'
 
 
 # 服务器类型
 DATABASE_DATA = 'Ansjer81'
-SERVER_HOST = 'database-2.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+SERVER_HOST = 'server-eur.chi0brrjyz8l.eu-west-1.rds.amazonaws.com'
 DATABASES_USER = 'azrds'
-DATABASES_PASS = 'azrds.x.x'
+DATABASES_PASS = '47vo87fikT19cekVoSq1'
 
 DATABASE_DATA2 = 'Ansjer81'
-SERVER_HOST2 = 'ansjerpush.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+SERVER_HOST2 = 'push-eur.chi0brrjyz8l.eu-west-1.rds.amazonaws.com'
 DATABASES_USER2 = 'azrds'
-DATABASES_PASS2 = 'azrds.x.x'
+DATABASES_PASS2 = '5T0LVKsXwHFkYNTTa5UG'
 
 DATABASES = {
     'default': {

eur_formal_manage.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.eur_config.formal_settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)