Merge remote-tracking branch 'remotes/origin/dev' into test

Ansjer/formal_settings.py

@@ -72,26 +72,44 @@ TEMPLATES = [
 WSGI_APPLICATION = 'Ansjer.formal_wsgi.application'
 
 # 服务器类型
-# DATABASE_DATA = 'Ansjer81'
-# SERVER_HOST = 'localhost'
-# DATABASES_USER = 'ansjer'
-# DATABASES_PASS = '1234'
 DATABASE_DATA = 'Ansjer81'
-# SERVER_HOST = 'azrdsinstance.clraczw4p0yj.us-west-1.rds.amazonaws.com'
 SERVER_HOST = 'database-2.clraczw4p0yj.us-west-1.rds.amazonaws.com'
 DATABASES_USER = 'azrds'
 DATABASES_PASS = 'azrds.x.x'
 
-DATABASES = {'default': {
-    'ENGINE': 'django.db.backends.mysql',
-    'NAME': DATABASE_DATA,
-    'USER': DATABASES_USER,
-    'PASSWORD': DATABASES_PASS,
-    'HOST': SERVER_HOST,
-    'PORT': '3306',
-    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-    'AUTOCOMMIT': True
-}}
+DATABASE_DATA2 = 'Ansjer81'
+SERVER_HOST2 = 'ansjerpush.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+DATABASES_USER2 = 'azrds'
+DATABASES_PASS2 = 'azrds.x.x'
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': DATABASE_DATA,
+        'USER': DATABASES_USER,
+        'PASSWORD': DATABASES_PASS,
+        'HOST': SERVER_HOST,
+        'PORT': '3306',
+        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+        'AUTOCOMMIT': True
+    },
+    'mysql02': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': DATABASE_DATA2,
+        'USER': DATABASES_USER2,
+        'PASSWORD': DATABASES_PASS2,
+        'HOST': SERVER_HOST2,
+        'PORT': '3306',
+        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+        'AUTOCOMMIT': True
+    }
+}
+DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
+DATABASE_APPS_MAPPING = {
+    'db1': 'default',
+    'db2': 'mysql02',
+}
+
 
 AUTH_PASSWORD_VALIDATORS = [
     {

Ansjer/formal_statistics_push_day_task.py

@@ -1,27 +0,0 @@
-import json
-
-import requests
-
-
-base_url = 'http://dvema.com'
-username='13800138001'
-password='ansjer123456'
-
-login_url = base_url + 'account/login'
-
-data = {
-    'userName': username,
-    'userPwd': password
-}
-res = requests.post(url=login_url, data=data)
-res = res.json()
-print(res)
-
-if res['result_code'] == 0:
-    statistics_url = base_url + 'statistcs/pushDay'
-    data = {
-        'token': res['result']['access_token']
-    }
-    res = requests.post(url=statistics_url, data=data)
-    print(res.json())
-

Ansjer/formal_statistics_push_month_task.py

@@ -1,27 +0,0 @@
-import json
-
-import requests
-
-
-# url = 'http://test.dvema.com'
-base_url = 'http://dvema.com/'
-username='13800138001'
-password='ansjer123456'
-login_url = base_url + 'account/login'
-
-data = {
-    'userName': username,
-    'userPwd': password
-}
-res = requests.post(url=login_url, data=data)
-res = res.json()
-print(res)
-
-if res['result_code'] == 0:
-    statistics_url = base_url + 'statistcs/pushMonth'
-    data = {
-        'token': res['result']['access_token']
-    }
-    res = requests.post(url=statistics_url, data=data)
-    print(res.json())
-

Ansjer/test_settings.py

@@ -78,8 +78,8 @@ SERVER_HOST = 'database-2.clraczw4p0yj.us-west-1.rds.amazonaws.com'
 DATABASES_USER = 'azrds'
 DATABASES_PASS = 'azrds.x.x'
 
-DATABASE_DATA2 = 'AnsjerPush'
-SERVER_HOST2 = 'azrdsinstance.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+DATABASE_DATA2 = 'AnsjerTest'
+SERVER_HOST2 = 'ansjerpush.clraczw4p0yj.us-west-1.rds.amazonaws.com'
 DATABASES_USER2 = 'azrds'
 DATABASES_PASS2 = 'azrds.x.x'
 

Ansjer/test_statistics_push_day_task.py

@@ -1,27 +0,0 @@
-import json
-
-import requests
-
-
-# url = 'http://test.dvema.com'
-base_url = 'http://test.dvema.com/'
-username='13800138001'
-password='ansjer999999'
-login_url = base_url + 'account/login'
-
-data = {
-    'userName': username,
-    'userPwd': password
-}
-res = requests.post(url=login_url, data=data)
-res = res.json()
-print(res)
-
-if res['result_code'] == 0:
-    statistics_url = base_url + 'statistcs/pushDay'
-    data = {
-        'token': res['result']['access_token']
-    }
-    res = requests.post(url=statistics_url, data=data)
-    print(res.json())
-

Ansjer/test_statistics_push_month_task.py

@@ -1,27 +0,0 @@
-import json
-
-import requests
-
-
-# url = 'http://test.dvema.com'
-base_url = 'http://test.dvema.com/'
-username='13800138001'
-password='ansjer999999'
-login_url = base_url + 'account/login'
-
-data = {
-    'userName': username,
-    'userPwd': password
-}
-res = requests.post(url=login_url, data=data)
-res = res.json()
-print(res)
-
-if res['result_code'] == 0:
-    statistics_url = base_url + 'statistcs/pushMonth'
-    data = {
-        'token': res['result']['access_token']
-    }
-    res = requests.post(url=statistics_url, data=data)
-    print(res.json())
-