修改代码同步OCI配置

AnsjerPush/cn_config/cn_formal_settings.py

@@ -21,6 +21,13 @@ OSS_ROLE_ARN = os.getenv('OSS_ROLE_ARN', default='')
 HUAWEICLOUD_AK = os.getenv('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = os.getenv('HUAWEICLOUD_SK', default='')
 
+OCI_USER = os.getenv('OCI_USER', default='')
+OCI_FINGERPRINT = os.getenv('OCI_FINGERPRINT', default='')
+OCI_TENANCY = os.getenv('OCI_TENANCY', default='')
+OCI_REGION = os.getenv('OCI_REGION', default=[])
+OCI_KEY_FILE = os.getenv('OCI_KEY_FILE', default='')
+OCI_NAMESPACE_NAME = os.getenv('OCI_NAMESPACE_NAME', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]

AnsjerPush/config.py

@@ -249,24 +249,6 @@ XM_PUSH_CHANNEL_DICT = {
 firebase_admin.initialize_app(credentials.Certificate(
     BASE_DIR + '/static/fcm/adcloud-fdf9b-firebase-adminsdk-dcvn1-d53e047cc8.json'))
 
-OCI_CONFIG = {
-    'us': {
-        'user': 'ocid1.user.oc1..aaaaaaaa63vtn64izdujrghlfby6xrlrrdce4yldtnjm7tmqzoc5i2b36s5q',
-        'fingerprint': '09:ff:f4:fa:64:bd:7b:72:64:67:5e:9a:ba:01:68:7b',
-        'tenancy': 'ocid1.tenancy.oc1..aaaaaaaaemreyqoegf4wbegfzetg63bwvzxa7ahfptbziexslzfmc7gnuwmq',
-        'region': 'us-phoenix-1',
-        'key_file': 'AnsjerPush/servers@ansjer.com_2023-12-20T07_21_33.069Z.pem'
-    },
-    'eur': {
-        'user': 'ocid1.user.oc1..aaaaaaaa63vtn64izdujrghlfby6xrlrrdce4yldtnjm7tmqzoc5i2b36s5q',
-        'fingerprint': '09:ff:f4:fa:64:bd:7b:72:64:67:5e:9a:ba:01:68:7b',
-        'tenancy': 'ocid1.tenancy.oc1..aaaaaaaaemreyqoegf4wbegfzetg63bwvzxa7ahfptbziexslzfmc7gnuwmq',
-        'region': 'uk-london-1',
-        'key_file': 'AnsjerPush/servers@ansjer.com_2023-12-20T07_21_33.069Z.pem'
-    }
-}
-OCI_NAMESPACE_NAME = 'cnmlmfa4fooi'
-
 APP_MAPPING = {
     'ACCloud': ['com.ansjer.accloud', 'com.ansjer.accloud_a'],
 

AnsjerPush/eur_config/eur_formal_settings.py

@@ -20,6 +20,13 @@ OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
+OCI_USER = env('OCI_USER', default='')
+OCI_FINGERPRINT = env('OCI_FINGERPRINT', default='')
+OCI_TENANCY = env('OCI_TENANCY', default='')
+OCI_REGION = env('OCI_REGION', default=[])
+OCI_KEY_FILE = env('OCI_KEY_FILE', default='')
+OCI_NAMESPACE_NAME = env('OCI_NAMESPACE_NAME', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

AnsjerPush/servers@ansjer.com_2023-12-20T07_21_33.069Z.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCRP0y7XdQ04WV7
-pMGtdCMx5Kdq+NIBzCNSbn4sEzjsAGnmqNuJYLYDtKZaWZp2xwq3+0EoRiHkN+P9
-Jrzb5MplbAzGEDWMevdYdqCxPL0H+KIEd2Zy7e3npYUipQ56astPq/9HytwvfbsL
-5ED8/csRqyPy8/JfuRlQ/i7XhhAG7HNx+hEVaiJLhfi0Y7IYX5+Zx4040fmDybfE
-J+IGB0qYNm/OfPIK8x8lr3RcOla86nFPrkgbxQOW1c0hbZ5NYILBJuzhCDsiU62A
-3o557ur8Tr2xAeS3ZVtW1yzbqwZwMyRtN0Anl3inVrSyDgXcEjWlckCi24OVnu2F
-QAd1d4ujAgMBAAECggEAClQyjDZ5c0M+GMNYJJIYOKGWiERmhssyDdger9q0FxBW
-d5k1d3kBqJTNqaoqklzINdovwYHvQg/5bhS1pHuKKxk6dVFMxY8vDMLu3XvAw5La
-TrABAJZL70e1hoevVmRGzgUgs8XIz7XEue1C89rGeJyvg0T2zPjYRIq24Qu/Ewbd
-JvVmjz4nAe28VjgEwzOnrPFkykT9YojUF1Bl26dJBj+oVk+O6Jf74TMhoT9O/B35
-VGDypqm2qyQQ9ra8myNKmTOCpi1RiK433k6RRCywyf6o+Lehot31eFFO6caIayVG
-j2aWe5N2gaWBPGeioFInKXqkw4tjLafWb3oEDJpAdQKBgQDD9CY8M9K3GQekE0Fb
-dh6a6Aza47WXdoOP/wnO+w3DsaqL42ZCp5/L3D3LtNBJiHXQZhXTuciV5qEtjszt
-XquXYJqyz29A7SNLOXLilvjPq71qWzJF6ViWcHBjX1R/7XqJkK0FuaJWaQFJ5uvS
-kEw55IrKnJ8DQ4m1ZJECn4nWLwKBgQC9wWpkmNNOTLyNJ5Ukf5IE2onL3aaa7iUG
-nLCXCUOXBUUGt9FE9As0PdNjXeTqqH80mWIEgyTBkvFNG5yGwNiVVIMd4Sa9Sm7W
-GND1NFeU3TDJ00rV9FSnVSbrJywi8NEst7qZqy4CS7xjr1+qP6xqIKhHS9n4+K8S
-idlsWB94zQKBgFUv7+teMC3vULYQtOoZGMcJOIV0Vv6IxDs2icIUvHAl7dmwu0Ug
-8ERE9Ax6B87f5y/5IWYRL1WTlOBkY0ySSpCdq8MukNQuA5jxWbOOJI7Lv6XcDaf9
-AMkuCn349JhE2m+xmLaTdDKSpb/GByFcH/dPFtNscWiO1PApzyzPxLF7AoGAMZ8M
-pXXZfBZREFCTjdHWa3KCqk8yLD2ubQY4n6aKiEmWfWVAUlnHPEgWqVt6a2rYqPab
-TTbGO+CjPVjFG+/+Mz7AcuXX7ZQzW8Vtj1G6vXECOyUH4t9b6842uTOrNQ/og1sg
-buL2yx7nCuJnj+vKuI4Fs29Adv0BO0XVF6ILyNkCgYAvP+bOLbPCS3u9Sw23e63t
-9EqeyNfR88KmQzVQGcP5yL3yUytQp5RrDqDdndP3uQa1TY6WQLKPqMh7sMWH9yWB
-6B/CudtduRWbWxLjXVN8Lhb9w7ORLRcY23xDQwdueOER3PHnp3UwaebHJ4+JXcdA
-KtygcG+9e3hWuUzyV/QdLQ==
------END PRIVATE KEY-----

AnsjerPush/test_config/test_settings.py

@@ -20,6 +20,13 @@ OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
+OCI_USER = env('OCI_USER', default='')
+OCI_FINGERPRINT = env('OCI_FINGERPRINT', default='')
+OCI_TENANCY = env('OCI_TENANCY', default='')
+OCI_REGION = env('OCI_REGION', default=[])
+OCI_KEY_FILE = env('OCI_KEY_FILE', default='')
+OCI_NAMESPACE_NAME = env('OCI_NAMESPACE_NAME', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

AnsjerPush/us_config/formal_settings.py

@@ -20,6 +20,13 @@ OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
+OCI_USER = env('OCI_USER', default='')
+OCI_FINGERPRINT = env('OCI_FINGERPRINT', default='')
+OCI_TENANCY = env('OCI_TENANCY', default='')
+OCI_REGION = env('OCI_REGION', default=[])
+OCI_KEY_FILE = env('OCI_KEY_FILE', default='')
+OCI_NAMESPACE_NAME = env('OCI_NAMESPACE_NAME', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]

Object/OCIObjectStorage.py

@@ -9,8 +9,16 @@
 import logging
 
 import oci
+from AnsjerPush.config import CONFIG_EUR
 
-from AnsjerPush.config import OCI_CONFIG, OCI_NAMESPACE_NAME
+from django.conf import settings
+
+OCI_USER = settings.OCI_USER
+OCI_FINGERPRINT = settings.OCI_FINGERPRINT
+OCI_TENANCY = settings.OCI_TENANCY
+OCI_REGION = settings.OCI_REGION
+OCI_KEY_FILE = settings.OCI_KEY_FILE
+OCI_NAMESPACE_NAME = settings.OCI_NAMESPACE_NAME
 
 LOGGER = logging.getLogger('time')
 
@@ -24,7 +32,14 @@ class OCIObjectStorage:
 
     def __init__(self, region):
         # Initialize service client with default oci_config file
-        self.object_storage_client = oci.object_storage.ObjectStorageClient(OCI_CONFIG[region])
+        oci_config = {
+            'user': OCI_USER,
+            'fingerprint': OCI_FINGERPRINT,
+            'tenancy': OCI_TENANCY,
+            'region': OCI_REGION[1] if region == CONFIG_EUR else OCI_REGION[0],
+            'key_file': OCI_KEY_FILE
+        }
+        self.object_storage_client = oci.object_storage.ObjectStorageClient(oci_config)
 
     def create_ereauthenticated_request(self, bucket_name, name, object_name, time_expires):
         """

Service/DevicePushService.py

@@ -26,7 +26,7 @@ from AnsjerPush.MessageConfig import EVENT_CONFIGS, DEFAULT_TEXTS, MSG_CONFIG
 from AnsjerPush.config import CONFIG_INFO, CONFIG_CN, MULTI_CHANNEL_TYPE_LIST, SYS_EVENT_TYPE_LIST, \
     EVENT_DICT, EVENT_DICT_CN, CONFIG_TEST, \
     HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET, JPUSH_UID_LIST, \
-    DATA_PUSH_EVENT_TYPE_LIST, PRIMARY_USERS_PUSH_EVENT_TYPE_LIST, OCI_NAMESPACE_NAME
+    DATA_PUSH_EVENT_TYPE_LIST, PRIMARY_USERS_PUSH_EVENT_TYPE_LIST
 from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID, XM_PUSH_CHANNEL_DICT
 from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
     DeviceChannelUserPermission, UidSetModel, Device_Info, UserAudioVideoPush, PushLog, TimeAlbum, AlbumMedia, \
@@ -57,6 +57,8 @@ ALICLOUD_SK = settings.ALICLOUD_SK
 HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
 HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
+OCI_NAMESPACE_NAME = settings.OCI_NAMESPACE_NAME
+
 LOGGING = logging.getLogger('info')
 TIME_LOGGER = logging.getLogger('time')
 ERROR_INFO_LOGGER = logging.getLogger('error_info')