Commit 6299f7d8 authored by 胡凯旋's avatar 胡凯旋

Merge branch 'test-jenkins' into 'paas'

db service

See merge request hukaixuan/k8s-develop-local!6
parents 18f73449 182aa86c
......@@ -7,7 +7,7 @@ DATABASES = {
'NAME': 'antispam_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -2,7 +2,7 @@ DEBUG = False
CACHES = {
"default": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": "redis://192.168.168.142/5",
"LOCATION": "redis://local-redis-ha/5",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
}
......@@ -15,7 +15,7 @@ DATABASES = {
'NAME': 'apollo_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -29,6 +29,6 @@ AES_KEY = 'keycasefornonprd' # 16个�~W�~J~B�~Z~D�~F�~R�
AES_IV = 'iv_casefornonprd' # 16个�~W�~J~B�~Z~D�~H~]�~K�~P~Q�~G~O
QINIU_ACCESS_KEY = "UPCOYIJkZOMcdd9FDzpBqYjzWUh55fBpVi3AhWpL"
QINIU_SECRET_KEY = "z5YvpDDSam_JE345Z8J_f3TufzelOW2VOGNoBl9e"
BROKER_URL = 'redis://192.168.168.142/6'
BROKER_URL = 'redis://local-redis-ha/6'
ERROR_RESPONSE_TO = ['dingyingcai@gmei.com', 'zhongchengyang@gmei.com', 'xuepengfei@gmei.com']
......@@ -3,12 +3,12 @@
CACHES = {
'default': {
'BACKEND': 'django_redis.cache.RedisCache',
'LOCATION': 'redis://192.168.168.142:3',
'LOCATION': 'redis://local-redis-ha:3',
'TIMEOUT': 86400, # 3600 x 24
},
}
BROKER_URL = 'redis://192.168.168.142/8'
BROKER_URL = 'redis://local-redis-ha/8'
DATABASES = {
'default': {
......@@ -16,7 +16,7 @@ DATABASES = {
'NAME': 'artemis_hotfix2', # zhengxing_test zhengxing_dev4hera zhengxing_dev
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -7,13 +7,13 @@ DEBUG = True
CACHES = {
'default': {
'BACKEND': 'django_redis.cache.RedisCache',
'LOCATION': 'redis://192.168.168.142:6379/6',
'LOCATION': 'redis://local-redis-ha:6379/6',
'KEY_PREFIX': 'ascle',
'TIMEOUT': 86400, # one day
},
}
REDIS = {'host': '192.168.168.142', 'port': 6379, 'db': 6}
BROKER_URL = 'redis://192.168.168.142:6379/8'
REDIS = {'host': 'local-redis-ha', 'port': 6379, 'db': 6}
BROKER_URL = 'redis://local-redis-ha:6379/8'
QINIU_ACCESS_KEY = "UPCOYIJkZOMcdd9FDzpBqYjzWUh55fBpVi3AhWpL"
QINIU_SECRET_KEY = "z5YvpDDSam_JE345Z8J_f3TufzelOW2VOGNoBl9e"
......
REDIS = {
'host': '192.168.168.142',
'host': 'local-redis-ha',
'port': 6379,
'db': 0,
}
REDIS_SENTINEL = [('192.168.168.142', 26379 ), ('192.168.168.142', 26379), ('192.168.168.142', 26379)]
REDIS_SENTINEL = [('local-redis-ha', 26379 ), ('local-redis-ha', 26379), ('local-redis-ha', 26379)]
......@@ -11,7 +11,7 @@ DATABASES = {
'NAME': 'bran_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -23,7 +23,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -12,7 +12,7 @@ DATABASES = {
'NAME': 'cadus',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -25,7 +25,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -46,7 +46,7 @@ DATABASE_ROUTERS = ['common.django_tools.GaiaRouter']
# 'NAME': '',
# 'USER': 'work',
# 'PASSWORD': 'Gengmei1',
# 'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
# 'HOST': 'local-mysql',
# 'PORT': '',
# 'OPTIONS': {
# "init_command": "SET foreign_key_checks = 0;",
......
......@@ -175,7 +175,7 @@ DATABASES = {
'NAME': 'doris_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -187,7 +187,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -199,7 +199,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -211,7 +211,7 @@ DATABASES = {
'NAME': 'gold',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -57,7 +57,7 @@ DATABASES = {
'NAME': 'doris_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -69,7 +69,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -81,7 +81,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -93,7 +93,7 @@ DATABASES = {
'NAME': 'gold',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -57,7 +57,7 @@ DATABASES = {
'NAME': 'doris_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -69,7 +69,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -81,7 +81,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -93,7 +93,7 @@ DATABASES = {
'NAME': 'gold',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -7,7 +7,7 @@ DATABASES = {
'NAME': 'feed_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -19,7 +19,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -31,7 +31,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -7,7 +7,7 @@ DATABASES = {
'NAME': 'feed_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -19,7 +19,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -31,7 +31,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -37,7 +37,7 @@ DATABASES = {
'NAME': 'zhengxing_test', # zhengxing_test test-zhengxing_for_ascle2
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -50,7 +50,7 @@ DATABASES = {
'USER': 'work',
'PASSWORD': 'Gengmei1',
#'HOST': '127.0.0.1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -62,7 +62,7 @@ DATABASES = {
'NAME': 'hera_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -74,7 +74,7 @@ DATABASES = {
'NAME': 'verita_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -86,7 +86,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -98,7 +98,7 @@ DATABASES = {
'NAME': 'bran_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -110,7 +110,7 @@ DATABASES = {
'NAME': 'whisper_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -122,7 +122,7 @@ DATABASES = {
'NAME': 'zhengxing_test', # zhengxing_test test-zhengxing_for_ascle2
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -4,7 +4,7 @@ DATABASES = { # 设置为线上的数据库地址,用户名,密码
'NAME': 'gm_face_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -25,7 +25,7 @@ DATABASES = {
'NAME': 'mars_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -37,7 +37,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -49,7 +49,7 @@ DATABASES = {
'NAME': 'mars_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -61,7 +61,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -73,7 +73,7 @@ DATABASES = {
'NAME': 'zeus_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -10,7 +10,7 @@ DATABASES = {
'NAME': 'mimas_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -6,7 +6,7 @@ DATABASES = {
'USER': 'work',
'PASSWORD': 'Gengmei1',
# 'HOST': '127.0.0.1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......@@ -19,7 +19,7 @@ DATABASES = {
'USER': 'work',
'PASSWORD': 'Gengmei1',
# 'HOST': '127.0.0.1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -6,7 +6,7 @@ DATABASES = {
'NAME': 'zhengxing_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -7,7 +7,7 @@ DATABASES = {
'NAME': 'plutus_hotfix',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
......@@ -6,7 +6,7 @@ DATABASES = {
'NAME': 'push_hotfix',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306', # zhengxing库rds端口
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
{
"mysql": {
"prod": {
"host": "rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com",
"host": "local-mysql",
"db": "zhengxing_test"
},
"slave": {
"host": "rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com",
"host": "local-mysql",
"db": "zhengxing_test"
},
"hera":{
"host": "rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com",
"host": "local-mysql",
"db": "hera_test"
},
"doris":{
"host": "rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com",
"host": "local-mysql",
"db": "doris_test"
}
},
......
......@@ -11,7 +11,7 @@
"databases": {
"default": {
"ENGINE": "django.db.backends.mysql",
"HOST": "rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com",
"HOST": "local-mysql",
"NAME": "zhengxing_test",
"OPTIONS": {
"charset": "utf8mb4",
......
......@@ -10,7 +10,7 @@ DATABASES = {
'NAME': 'zeus_test',
'USER': 'work',
'PASSWORD': 'Gengmei1',
'HOST': 'rm-2ze0v6uua2hl9he8e.mysql.rds.aliyuncs.com',
'HOST': 'local-mysql',
'PORT': '3306',
'OPTIONS': {
"init_command": "SET foreign_key_checks = 0;",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment