国内/美洲服使用环境变量配置,修复兑换码体验云存问题

Ansjer/cn_config/formal_settings.py

@@ -1,5 +1,17 @@
 import os
 from Ansjer.config import BASE_DIR
+import environ
+
+env = environ.Env(
+    DEBUG=(bool, False)
+)
+# 读取 .env 文件
+environ.Env.read_env(os.path.join(BASE_DIR, '.env'))
+
+ACCESS_KEY_ID = env('ACCESS_KEY_ID', default='')
+SECRET_ACCESS_KEY = env('SECRET_ACCESS_KEY', default='')
+AWS_ACCESS_KEY_ID = env.list('AWS_ACCESS_KEY_ID', default=[])
+AWS_SECRET_ACCESS_KEY = env.list('AWS_SECRET_ACCESS_KEY', default=[])
 
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
 # DEBUG = True
@@ -78,29 +90,28 @@ TEMPLATES = [
 WSGI_APPLICATION = 'Ansjer.cn_config.formal_wsgi.application'
 
 # 业务数据库
-DATABASE_DATA = 'ansjer_server_cn'
-SERVER_HOST = '192.168.0.51'
-DATABASES_USER = 'root'
-DATABASES_PASS = 'Ansjer123'
+DATABASE_DATA = env('DATABASE_DATA')
+SERVER_HOST = env('SERVER_HOST')
+DATABASES_USER = env('DATABASES_USER')
+DATABASES_PASS = env('DATABASES_PASS')
 
 # 推送数据库
-DATABASE_DATA2 = 'ansjer_push_cn'
-SERVER_HOST2 = '192.168.0.50'
-DATABASES_USER2 = 'root'
-DATABASES_PASS2 = 'Ansjer123'
+DATABASE_DATA2 = env('DATABASE_DATA2')
+SERVER_HOST2 = env('SERVER_HOST2')
+DATABASES_USER2 = env('DATABASES_USER2')
+DATABASES_PASS2 = env('DATABASES_PASS2')
 
 # 业务代理客户数据库
-DATABASE_DATA3 = 'pro_asj_agent'
-SERVER_HOST3 = '192.168.0.51'
-DATABASES_USER3 = 'root'
-DATABASES_PASS3 = 'Ansjer123'
+DATABASE_DATA3 = env('DATABASE_DATA3')
+SERVER_HOST3 = env('SERVER_HOST3')
+DATABASES_USER3 = env('DATABASES_USER3')
+DATABASES_PASS3 = env('DATABASES_PASS3')
 
 # 袋鼠妈妈数据库
-DATABASE_DATA4 = 'pro_roomumy'
-SERVER_HOST4 = '192.168.0.51'
-DATABASES_USER4 = 'root'
-DATABASES_PASS4 = 'Ansjer123'
-
+DATABASE_DATA4 = env('DATABASE_DATA4')
+SERVER_HOST4 = env('SERVER_HOST4')
+DATABASES_USER4 = env('DATABASES_USER4')
+DATABASES_PASS4 = env('DATABASES_PASS4')
 
 DATABASES = {
     'default': {

Ansjer/us_config/formal_settings.py

@@ -1,5 +1,17 @@
 import os
 from Ansjer.config import BASE_DIR
+import environ
+
+env = environ.Env(
+    DEBUG=(bool, False)
+)
+# 读取 .env 文件
+environ.Env.read_env(os.path.join(BASE_DIR, '.env'))
+
+ACCESS_KEY_ID = env('ACCESS_KEY_ID', default='')
+SECRET_ACCESS_KEY = env('SECRET_ACCESS_KEY', default='')
+AWS_ACCESS_KEY_ID = env.list('AWS_ACCESS_KEY_ID', default=[])
+AWS_SECRET_ACCESS_KEY = env.list('AWS_SECRET_ACCESS_KEY', default=[])
 
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
 # DEBUG = True
@@ -76,29 +88,29 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'Ansjer.us_config.formal_wsgi.application'
 
+# 业务数据库
+DATABASE_DATA = env('DATABASE_DATA')
+SERVER_HOST = env('SERVER_HOST')
+DATABASES_USER = env('DATABASES_USER')
+DATABASES_PASS = env('DATABASES_PASS')
 
-# 服务器类型
-DATABASE_DATA = 'Ansjer81'
-SERVER_HOST = 'database-2.clraczw4p0yj.us-west-1.rds.amazonaws.com'
-DATABASES_USER = 'azrds'
-DATABASES_PASS = 'azrds.x.x'
-
-DATABASE_DATA2 = 'Ansjer81'
-SERVER_HOST2 = 'ansjerpush.clraczw4p0yj.us-west-1.rds.amazonaws.com'
-DATABASES_USER2 = 'azrds'
-DATABASES_PASS2 = 'azrds.x.x'
+# 推送数据库
+DATABASE_DATA2 = env('DATABASE_DATA2')
+SERVER_HOST2 = env('SERVER_HOST2')
+DATABASES_USER2 = env('DATABASES_USER2')
+DATABASES_PASS2 = env('DATABASES_PASS2')
 
 # 业务代理客户数据库
-DATABASE_DATA3 = 'pro_asj_agent'
-SERVER_HOST3 = 'database-2.clraczw4p0yj.us-west-1.rds.amazonaws.com'
-DATABASES_USER3 = 'azrds'
-DATABASES_PASS3 = 'azrds.x.x'
+DATABASE_DATA3 = env('DATABASE_DATA3')
+SERVER_HOST3 = env('SERVER_HOST3')
+DATABASES_USER3 = env('DATABASES_USER3')
+DATABASES_PASS3 = env('DATABASES_PASS3')
 
 # 袋鼠妈妈数据库
-DATABASE_DATA4 = 'pro_roomumy'
-SERVER_HOST4 = 'database-2.clraczw4p0yj.us-west-1.rds.amazonaws.com'
-DATABASES_USER4 = 'azrds'
-DATABASES_PASS4 = 'azrds.x.x'
+DATABASE_DATA4 = env('DATABASE_DATA4')
+SERVER_HOST4 = env('SERVER_HOST4')
+DATABASES_USER4 = env('DATABASES_USER4')
+DATABASES_PASS4 = env('DATABASES_PASS4')
 
 DATABASES = {
     'default': {

Controller/CloudStorage.py

@@ -1643,11 +1643,12 @@ class CloudStorageView(View):
         # 检查pay_type是否为10或11
         if pay_type not in [10, 11]:
             return response.json(444, 'pay_type')
-        # 检查store_meal的pay_type是否为10或11
-        store_meal_pay_types = [pt['id'] for pt in Pay_Type.objects.filter(store_meal=rank).values('id')]
-        if pay_type not in store_meal_pay_types:
-            redis_obj.del_data(key=uid + 'do_experience_order')
-            return response.json(444, 'rank')
+        # 体验套餐检查store_meal的pay_type是否为10
+        if rank is not None:
+            store_meal_pay_types = [pt['id'] for pt in Pay_Type.objects.filter(store_meal=rank).values('id')]
+            if pay_type not in store_meal_pay_types:
+                redis_obj.del_data(key=uid + 'do_experience_order')
+                return response.json(444, 'rank')
 
         if pay_type == 10:  # 判断是否已体验过套餐
             experience_context_qs = ExperienceContextModel.objects.filter(uid=uid, experience_type=0)