Browse Source

修改推送数据库别名db2为PushModel

lang 3 years ago
parent
commit
03f7ad4ec1

+ 2 - 1
Ansjer/cn_config/formal_settings.py

@@ -16,6 +16,7 @@ INSTALLED_APPS = [
     'corsheaders',
     'imagekit',
     'Model',
+    'PushModel',
 ]
 
 MIDDLEWARE = [
@@ -110,7 +111,7 @@ DATABASES = {
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {
     'Model': 'default',
-    'db2': 'mysql02',
+    'PushModel': 'mysql02',
 }
 
 

+ 1 - 1
Ansjer/cn_config/test_settings.py

@@ -115,7 +115,7 @@ DATABASES = {
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {
     'Model': 'default',
-    'db2': 'mysql02',
+    'PushModel': 'mysql02',
 }
 
 AUTH_PASSWORD_VALIDATORS = [

+ 2 - 1
Ansjer/eur_config/formal_settings.py

@@ -16,6 +16,7 @@ INSTALLED_APPS = [
     'corsheaders',
     'imagekit',
     'Model',
+    'PushModel',
 ]
 
 MIDDLEWARE = [
@@ -108,7 +109,7 @@ DATABASES = {
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {
     'Model': 'default',
-    'db2': 'mysql02',
+    'PushModel': 'mysql02',
 }
 
 

+ 1 - 1
Ansjer/eur_config/test_settings.py

@@ -114,7 +114,7 @@ DATABASES = {
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {
     'Model': 'default',
-    'db2': 'mysql02',
+    'PushModel': 'mysql02',
 }
 
 AUTH_PASSWORD_VALIDATORS = [

+ 14 - 14
Ansjer/local_config/local_settings.py

@@ -102,10 +102,10 @@ DATABASES_USER = 'root'
 DATABASES_PASS = 'root'
 
 # 推送数据库
-# DATABASE_DATA2 = 'ansjerpush'
-# SERVER_HOST2 = '127.0.0.1'
-# DATABASES_USER2 = 'root'
-# DATABASES_PASS2 = 'root'
+DATABASE_DATA2 = 'ansjerpush'
+SERVER_HOST2 = '127.0.0.1'
+DATABASES_USER2 = 'root'
+DATABASES_PASS2 = 'root'
 
 # 序列号公共数据库
 # DATABASE_DATA3 = 'ansjer_test'
@@ -123,16 +123,16 @@ DATABASES = {
         '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
-    # },
+    '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
+    },
     # 'mysql03': {
     #     'ENGINE': 'django.db.backends.mysql',
     #     'NAME': DATABASE_DATA3,

+ 2 - 1
Ansjer/us_config/formal_settings.py

@@ -16,6 +16,7 @@ INSTALLED_APPS = [
     'corsheaders',
     'imagekit',
     'Model',
+    'PushModel',
 ]
 
 MIDDLEWARE = [
@@ -109,7 +110,7 @@ DATABASES = {
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {
     'Model': 'default',
-    'db2': 'mysql02',
+    'PushModel': 'mysql02',
 }
 
 

+ 1 - 1
Ansjer/us_config/test_settings.py

@@ -114,7 +114,7 @@ DATABASES = {
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {
     'Model': 'default',
-    'db2': 'mysql02',
+    'PushModel': 'mysql02',
 }
 
 AUTH_PASSWORD_VALIDATORS = [

+ 2 - 2
Model/models.py

@@ -341,7 +341,7 @@ class Equipment_Info(models.Model):
         verbose_name = u'设备信息推送表'
         verbose_name_plural = verbose_name
         ordering = ('-id',)
-        app_label = "db2"
+        app_label = "PushModel"
 
 class Ai_Push_Info(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
@@ -886,7 +886,7 @@ class SysMsgModel(models.Model):
         verbose_name = '系统消息'
         verbose_name_plural = verbose_name
         ordering = ('-id',)
-        app_label = "db2"
+        app_label = "PushModel"
 
 
 # 设备推送重构