ソースを参照

修改国内AWS AK/SK

locky 5 日 前
コミット
83664720fd

+ 3 - 2
Ansjer/cn_config/config_formal.py

@@ -12,8 +12,9 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws-cn:s3'
 REGION_NAME = 'cn-northwest-1'
-ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
-SECRET_ACCESS_KEY = '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'
+KVS_REGION = 'cn-north-1'
+ACCESS_KEY_ID = 'AKIA2MMWBR4D3I4YNHSP'
+SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'push'                                # 推送存储桶

+ 2 - 2
Ansjer/cn_config/config_test.py

@@ -12,8 +12,8 @@ AWS相关
 # aws api key
 # AWS_ARN_S3 = 'arn:aws-cn:s3'
 # REGION_NAME = 'cn-northwest-1'
-# ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
-# SECRET_ACCESS_KEY = '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'
+# ACCESS_KEY_ID = 'AKIA2MMWBR4D3I4YNHSP'
+# SECRET_ACCESS_KEY = '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'
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
 REGION_NAME2 = 'us-west-1'

+ 6 - 2
Ansjer/config.py

@@ -29,9 +29,13 @@ REGION_ID_LIST = [1, 2, 3, 4, 5, 6]
 
 # tb_country表id
 # 中东西亚国家id列表
+# 格鲁吉亚,阿塞拜疆,沙特阿拉伯,阿拉伯联合酋长国,土耳其
 ME_COUNTRY_ID_LIST = [31, 32, 36, 39, 48]
 # 东亚国家id列表,id: 2~16
+# 朝鲜,韩国,蒙古,日本,越南,老挝,柬埔寨,缅甸,泰国,马来西亚,文莱,新加坡,印度尼西亚,东帝汶,菲律宾
 EA_COUNTRY_ID_LIST = [i for i in range(2, 17)]
+# 俄罗斯
+RU_COUNTRY_ID_LIST = [91]
 
 # 支付类型
 PAY_TYPE_PAYPAL = 1
@@ -109,8 +113,8 @@ OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 # aws api key
-AWS_ACCESS_KEY_ID = ['AKIA2MMWBR4DSFG67DTG', 'AKIA2E67UIMD45Y3HL53']  # 0国内, 1国外
-AWS_SECRET_ACCESS_KEY = ['aI9gxcAKPmiGgPy9axrtFKzjYGbvpuytEX4xWweL', 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw']
+AWS_ACCESS_KEY_ID = ['AKIA2MMWBR4D3I4YNHSP', 'AKIA2E67UIMD45Y3HL53']  # 0国内, 1国外
+AWS_SECRET_ACCESS_KEY = ['5Q9LsKwa0Q9IRntwDWDzIgDOdT5zayt4M+qJKmuw', 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw']
 AWS_ARN = ['arn:aws-cn:s3', 'arn:aws:s3']
 
 # 尚云服务器CRCKey

+ 2 - 2
Ansjer/local_config/config_local.py

@@ -12,8 +12,8 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws-cn:s3'
 REGION_NAME = 'cn-northwest-1'
-ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
-SECRET_ACCESS_KEY = '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'
+ACCESS_KEY_ID = 'AKIA2MMWBR4D3I4YNHSP'
+SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'push'                                # 推送存储桶

+ 2 - 2
Ansjer/pushconfig.py

@@ -57,8 +57,8 @@ OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 # aws api key
-AWS_ACCESS_KEY_ID = ['AKIA2MMWBR4DSFG67DTG', 'AKIA2E67UIMD45Y3HL53']  # 0国内, 1国外
-AWS_SECRET_ACCESS_KEY = ['aI9gxcAKPmiGgPy9axrtFKzjYGbvpuytEX4xWweL', 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw']
+AWS_ACCESS_KEY_ID = ['AKIA2MMWBR4D3I4YNHSP', 'AKIA2E67UIMD45Y3HL53']  # 0国内, 1国外
+AWS_SECRET_ACCESS_KEY = ['5Q9LsKwa0Q9IRntwDWDzIgDOdT5zayt4M+qJKmuw', 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw']
 AWS_ARN = ['arn:aws-cn:s3', 'arn:aws:s3']