From 9aba7042a6d4f28be06a8d21808bea1f3df23d6e Mon Sep 17 00:00:00 2001 From: RogerWork Date: Sat, 1 Feb 2025 07:21:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=A1=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dingxin_toolbox_drf/settings.py | 19 +++++++++ dspt_api/util/mapi/card_auth.py | 5 +-- dspt_api/util/mapi/card_regist.py | 4 +- dspt_api/views.py | 67 +++++++++++++------------------ env.py | 2 +- 5 files changed, 50 insertions(+), 47 deletions(-) diff --git a/dingxin_toolbox_drf/settings.py b/dingxin_toolbox_drf/settings.py index 89a5cc2..094b399 100644 --- a/dingxin_toolbox_drf/settings.py +++ b/dingxin_toolbox_drf/settings.py @@ -45,6 +45,25 @@ CONFIG = { "NAME": "fws_dgp_card_db", } }, + 'local': { + 'SERVER_IP': '127.0.0.1', + 'WEB_SERVER_IP': '127.0.0.1', + 'DB': { + "HOST": 'home.rogersun.cn', + "PORT": 3306, + "USER": "dingxin", + "PASSWORD": "cine123456", + "NAME": "dingxin_toolbox", + }, + 'REDIS_IP': '127.0.0.1', + 'ECARD_DB': { + "HOST": '172.16.3.53', + "PORT": 3306, + "USER": "test", + "PASSWORD": "cine123456", + "NAME": "fws_dgp_card_db", + } + }, 'prd': { 'SERVER_IP': '172.16.1.63', 'WEB_SERVER_IP': '172.16.1.222', diff --git a/dspt_api/util/mapi/card_auth.py b/dspt_api/util/mapi/card_auth.py index 6eeb9e9..20404a9 100644 --- a/dspt_api/util/mapi/card_auth.py +++ b/dspt_api/util/mapi/card_auth.py @@ -32,10 +32,7 @@ class MapiCardAuth: add_param(self.return_data, 'card', card_num, timestamp=int(time.time() * 1000)) # password - pwd = '123321' - _md5 = hashlib.md5() - _md5.update(pwd.encode('utf-8')) - add_param(self.return_data, 'password', _md5.hexdigest() , timestamp=int(time.time() * 1000)) + add_param(self.return_data, 'password', self.pay_type['card_password'] , timestamp=int(time.time() * 1000)) print(__name__, self.return_data) return self.return_data diff --git a/dspt_api/util/mapi/card_regist.py b/dspt_api/util/mapi/card_regist.py index 0b266d9..db4196a 100644 --- a/dspt_api/util/mapi/card_regist.py +++ b/dspt_api/util/mapi/card_regist.py @@ -44,7 +44,7 @@ class MapiCardRegist: redis_key_api_card_level) card_info = '请手动输入参数，或先请求接口：3.1.1 获取影院卡等级规则' if result_card_level: - card_info = {'password': 'c8837b23ff8aaa8a2dde915473ce0991', + card_info = {'password': self.pay_type['card_password'], 'mobile': '18688886666', 'cardLevelId': data_card_level['levelId'], 'cardLevelName': data_card_level['levelName'], @@ -52,7 +52,7 @@ class MapiCardRegist: 'sendCardFee': data_card_level['sendCardFee'], 'sendCardEquityFee': data_card_level['sendCardEquityFee'], 'exchangeBarcode': None} - add_param(self.return_data, 'card_info', json.dumps(card_info)) + add_param(self.return_data, 'card_info', json.dumps(card_info) if result_card_level else card_info) print(__name__, self.return_data) return self.return_data diff --git a/dspt_api/views.py b/dspt_api/views.py index f82c49e..5db44e9 100644 --- a/dspt_api/views.py +++ b/dspt_api/views.py @@ -157,26 +157,7 @@ def get_suggest_params_by_api(request): print('pay_type', pay_type) elif member_type == 'member': print('pay_type', request.GET.get('options[pay_type]')) - pay_type_dict = json.loads(request.GET.get('options[pay_type]')) - pay_type = { - 'select_price_type': pay_type_dict.get('select_price_type', None), - 'ticket_info': { - 'ticket_price': pay_type_dict.get('ticket_info', None).get('ticket_price', None), - 'have_service_fee': pay_type_dict.get('ticket_info', None).get('have_service_fee', None), - }, - 'ticket_quan_check': pay_type_dict.get('ticket_quan_check', None), - 'ticket_quan': { - 'ticket_quan_num': pay_type_dict.get('ticket_quan', None).get('ticket_quan_num', None), - 'ticket_quan_value': pay_type_dict.get('ticket_quan', None).get('ticket_quan_value', None), - }, - 'goods_quan_check': pay_type_dict.get('goods_quan_check', None), - 'goods_quan': { - 'goods_quan_num': pay_type_dict.get('goods_quan', None).get('goods_quan_num', None), - 'goods_quan_value': pay_type_dict.get('goods_quan', None).get('goods_quan_value', None), - 'goods_quan_type': pay_type_dict.get('goods_quan', None).get('goods_quan_type', None), - }, - 'card_num': pay_type_dict.get('card_num', None), - } + pay_type = handle_pay_type(request.GET.get('options[pay_type]')) print('pay_type', pay_type) else: print('options[pay_type]参数错误') @@ -205,26 +186,7 @@ def get_suggest_params_timestamp_by_api(request): print('pay_type', pay_type) elif member_type == 'member': print('pay_type', request.GET.get('options[pay_type]')) - pay_type_dict = json.loads(request.GET.get('options[pay_type]')) - pay_type = { - 'select_price_type': pay_type_dict.get('select_price_type', None), - 'ticket_info': { - 'ticket_price': pay_type_dict.get('ticket_info', None).get('ticket_price', None), - 'have_service_fee': pay_type_dict.get('ticket_info', None).get('have_service_fee', None), - }, - 'ticket_quan_check': pay_type_dict.get('ticket_quan_check', None), - 'ticket_quan': { - 'ticket_quan_num': pay_type_dict.get('ticket_quan', None).get('ticket_quan_num', None), - 'ticket_quan_value': pay_type_dict.get('ticket_quan', None).get('ticket_quan_value', None), - }, - 'goods_quan_check': pay_type_dict.get('goods_quan_check', None), - 'goods_quan': { - 'goods_quan_num': pay_type_dict.get('goods_quan', None).get('goods_quan_num', None), - 'goods_quan_value': pay_type_dict.get('goods_quan', None).get('goods_quan_value', None), - 'goods_quan_type': pay_type_dict.get('goods_quan', None).get('goods_quan_type', None), - }, - 'card_num': pay_type_dict.get('card_num', None), - } + pay_type = handle_pay_type(request.GET.get('options[pay_type]')) print('pay_type', pay_type) else: print('options[pay_type]参数错误') @@ -235,6 +197,31 @@ def get_suggest_params_timestamp_by_api(request): return JsonResponse({'timestamp': _ts}) +def handle_pay_type(pay_type_json): + pay_type_dict = json.loads(pay_type_json) + pay_type = { + 'select_price_type': pay_type_dict.get('select_price_type', None), + 'ticket_info': { + 'ticket_price': pay_type_dict.get('ticket_info', None).get('ticket_price', None), + 'have_service_fee': pay_type_dict.get('ticket_info', None).get('have_service_fee', None), + }, + 'ticket_quan_check': pay_type_dict.get('ticket_quan_check', None), + 'ticket_quan': { + 'ticket_quan_num': pay_type_dict.get('ticket_quan', None).get('ticket_quan_num', None), + 'ticket_quan_value': pay_type_dict.get('ticket_quan', None).get('ticket_quan_value', None), + 'ticket_quan_type': pay_type_dict.get('ticket_quan', None).get('ticket_quan_type', None), + }, + 'goods_quan_check': pay_type_dict.get('goods_quan_check', None), + 'goods_quan': { + 'goods_quan_num': pay_type_dict.get('goods_quan', None).get('goods_quan_num', None), + 'goods_quan_value': pay_type_dict.get('goods_quan', None).get('goods_quan_value', None), + 'goods_quan_type': pay_type_dict.get('goods_quan', None).get('goods_quan_type', None), + }, + 'card_num': pay_type_dict.get('card_num', None), + 'card_password': pay_type_dict.get('card_password', None), + } + return pay_type + # 外部接口， 用于实时生成url并返回前端 @csrf_exempt def general_api_url(request): diff --git a/env.py b/env.py index 380ee2a..2e11221 100644 --- a/env.py +++ b/env.py @@ -1 +1 @@ -ENV = 'dev' +ENV = 'local'