From 80df5579199cbe068e48f70f27fc55a86d0cf622 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Fri, 12 Dec 2025 14:34:07 +0800
Subject: [PATCH] bugfix

---
 unipay/.init.py.swp | Bin 16384 -> 0 bytes
 unipay/init.py      | 136 ++++++++++++++++++++++----------------------
 2 files changed, 68 insertions(+), 68 deletions(-)
 delete mode 100644 unipay/.init.py.swp

diff --git a/unipay/.init.py.swp b/unipay/.init.py.swp
deleted file mode 100644
index 211d800e624a4af7eb1b6f51f7659a7fbd97eadf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeI3du$v>9ml7I(q2kR1C%0EmFY&vXLLCyM3sso|KU0=m^$&vuQo){YJEGlx4zq5
z@9x<-MJaBGA4wfMDd~gskv60c(&m8*C{65ENC*T1RKZ^esRGG+b_7x+kl+vg;X6A!
z>pMGgT2Vw*%}F2a?aXg}Gy9$Q>|NjH-nJd|>)9;?pW6v}^wc(M%ZBG}y1eTKQZ5ej
z(CdDR&ah<<_?vbZ`THGbXj9H}vIQq^6jr2s6b>8Qazn|sTqC(ywiRUE@(NpZs}xWQ
ze25B^g8ohSttVT*wq-N-x>37_e(tk9A7Tc|l~O<{pcGIFC<T-PN&%&SQa~y2QCA>v
zZzSJAA#aQeT8ytZthjz6zTXgE?G^Fyt-2@$lmbctrGQdEDWDWk3Md7X0!jg;fKosy
z@DWtNFbVl2%JnYa@Z<fz-2eacGlcvNoCgzN5Db8?f_uOQ5Z*?}k3l#1`+9r_XTkGe
z7&L*efV;tM;Jr^1G6@>Mo#1vr!0&G*<Tv2g;8)-hcne$v&x1!m4r~Em2LE11$REL3
za2h-YdO;)j68Kk&kXOJ6(7|?a<rYHz41NJ-z!>NP_klaX7r=V(r<)1+88`)wf&%y!
zxEtI7{_-h8eh1zJPk>`!3iN<&;4ZKZRBj^V=inJI3%(7$0W#oLuns%{;d{U~a2Hqy
z{)&T^UxHV`3*cdJ3kY#Q^CmbBhCvUw7knPPhq{aE4|3A@!wNoYOzwD~$AXe)(|uar
zF`3q=b@jBgw03oA8LAbT?;8U=u;W2(f0D}Tr>^IWSSIsmQxnxjS$@z6v__Ij8KZ_3
zQ2fNB&}Za_(jFTwF+a#q(+G_EB;GA#@k0-0>IG*Y4J?z#xdqxpb4Izy?4TVHapJ7*
zm2BPixk+RTEADQ0ol^?*z%xvy+fLn{q<9<Y(mTh)XI}_s4unrmEWPqr<wpk=PaF)N
zy%e51QJFd#9zGd<??`y*cvXt-j_n<dbm8KO@bF9FTL%`;9tuw%Ts%5aWwP|n_peM&
zM_E%O4yVV%qpw$9oD3%?!s(~Nvrkvf{p9N0iRwZ%_<<3W{01WkjQk*l*Tf%x0z8P&
zE7#f4+qS*6vun51bx(HCu+0L0vcT#urw17x)AKX5&oRsOk(a<Li;Cnyi7P2u!1e}d
zVHl_7vRU~cku?s6tTIzrxQ1sGeSK&&D+5U?E@~3Rt4f+7iOkV8M9Qdeyon?>mQQy&
zHkzH`m+d??8IO#rSw3FUPGrl;EGKW`Y3m!wMv6LJy71j_{N-@=2T*!p{>5<ieC6<A
zQPCoH@%U@u(Su8qXDG8x*Rkw?h7(7Y=HCcskA+hgL?vFGo32bf6+ZWxNLiVAHJtis
zID4ToeJD=c)7eh1j2~H?Keya<l8(YW&+)WI>IYt$)r)??_U4%z(AMZ;IW{$XTGi3w
zv>x-57J%<btzD}Dc&xu<n`zN=C_YJr^P820(MtA^?Tp$<&y4$PbzenWqLxjQ%tZ5%
z70ufR8fA8X1!+wNYG@w+i~1K2r^n4ew#jSO`jxS<${TP0->Lxvm{<Oo)<X1b@2e6j
zCtqGVf9k)hgjC8iET1j+k#yatX9X-73^2OWsBhKru|8GRXQI2cyG!0<M!=GX5#0vq
zqBdPUD5ITQCj6skSSFvdEHmkcn3!xf8cj<jpLv#<p^k^?i8su6z%q&~Lye+SvN5gY
z3l=6T-E#4@<ax}_mz(4l{tWWF>|634QNo3c5O)Z!&PPVpggGA7!twENY);F-ej}9y
z&6oVZDT+d4KDKRE_#nluYuUN0ju%-z5^|4+<=u5jAg0+=Dv|`zV)DXxq4P3Cp_p<~
zDN&*t10TI8ii=BzNS;m(GkP4HmI2(&b=LzQw?T156HX?@WF}pn3KuRu9v*qJG9#wK
zsm04D7cP!nojZh;UNXEx<9+)H5%bgX>P<6TOCMroOkj@BM|)<Eq_wW@&bC~u{$T4a
zEu&%7=h|wR;4Bx*Ke{iv-=B#tA_~isK4&lDy1f!x4mS$?H@v!A>eF3T<axNvPFH2r
z+}@UJ-lgYy?ng%1hGqLKx3AA=UY}N<MQ1kC^;P+~o;89(U&m=@TW^h5BwE|8;kvqI
z@?tJa5tpzzmuuS|i6M%iiK4>x{i_l88=s+Su|TfQC708?T3b3>yQ{K@l$CvLMX6w4
zTO7#j8ii{Xhu84P*435#(8D>sIoGE5ZcQpWi!lr9{&=Yv6~HYRLBHb_*QiA9DA(TH
z{Xj?Oj-)E9)2*%g+LakOM@@>hm~FtA#)k(!T391|j7K|I+dm(=jRF>zwUTqkU9FvM
z&Fw2SFXjhVwgPUvqve~mn#-LInm|j(&Ifo8!@6|g@(fm+BNS^&v1VMFpT{aSS&GrT
zWA|U3n-Yu9aQ4jN=}QZ5KOS}0e$OfL$%W5-R?&65plS<5qF7@P&ojcjthn%;V#}^5
zywx5NhT`}0S+Ql1Hr2yy=9+^piM=^Ko<;uZp6~y6VsCy1@cqAhzrTe2{cpiD;At=f
z9sv)5JHQ{X=RXE=pb2~t`~yDT1+T~ce#m{Qk5WJ>pcGIFC<T-PN&%&SQa~x76i^C$
zPz6%h5#qpvzb%l*pV*kz29U_8=DZg+HTS}#_6!O(wE@B?IgpHAPQj=)ATmN|vOSGY
z7m|~y-ST8<53H&;sA(CIp?rV6Y$pz+svN|JF{>TK5z>LQi_em(JjCZGt3AXK(u1^H
z?IAu5SnVN>kRGHRJn(m41;;RTu~$#yy%sjz@~sywc?G;rm4Ad68~KKP@=$cYw(0<W
sl=WphneRHb&(h*;W7EBxH)kk+|JNj5Pzmj>^MZ<>{KN<D{ADls58P-5&j0`b

diff --git a/unipay/init.py b/unipay/init.py
index 4c94113..a41605a 100644
--- a/unipay/init.py
+++ b/unipay/init.py
@@ -6,27 +6,27 @@ from paylog import PaymentLog
 
 # 从 env 或配置载入 provider conf（这里只示例）
 CONF = {
-    "wechat": {
-        "mchid": os.getenv("WXP_MCHID",""),
-        "serial_no": os.getenv("WXP_SERIAL",""),
-        "privkey_pem": open(os.getenv("WXP_PRIVKEY","./merchant_private_key.pem"),"rb").read(),
-        "platform_pub_pem": open(os.getenv("WXP_PLATFORM_PUB","./platform_pub.pem"),"rb").read(),
-        "api_v3_key": os.getenv("WXP_API_V3_KEY","").encode()
-    },
-    "paypal": {
-        "client_id": os.getenv("PP_ID",""),
-        "client_secret": os.getenv("PP_SECRET",""),
-        "sandbox": True
-    },
-    "alipay": {
-        "app_id": os.getenv("ALIPAY_APPID",""),
-        "privkey_pem": open(os.getenv("ALIPAY_PRIV","./alipay_priv.pem"),"rb").read(),
-        "alipay_pub_pem": open(os.getenv("ALIPAY_PUB","./alipay_pub.pem"),"rb").read(),
-        "sandbox": True
-    },
-    "stripe": {
-        "api_key": os.getenv("STRIPE_KEY","")
-    }
+	"wechat": {
+		"mchid": os.getenv("WXP_MCHID",""),
+		"serial_no": os.getenv("WXP_SERIAL",""),
+		"privkey_pem": open(os.getenv("WXP_PRIVKEY","./merchant_private_key.pem"),"rb").read(),
+		"platform_pub_pem": open(os.getenv("WXP_PLATFORM_PUB","./platform_pub.pem"),"rb").read(),
+		"api_v3_key": os.getenv("WXP_API_V3_KEY","").encode()
+	},
+	"paypal": {
+		"client_id": os.getenv("PP_ID",""),
+		"client_secret": os.getenv("PP_SECRET",""),
+		"sandbox": True
+	},
+	"alipay": {
+		"app_id": os.getenv("ALIPAY_APPID",""),
+		"privkey_pem": open(os.getenv("ALIPAY_PRIV","./alipay_priv.pem"),"rb").read(),
+		"alipay_pub_pem": open(os.getenv("ALIPAY_PUB","./alipay_pub.pem"),"rb").read(),
+		"sandbox": True
+	},
+	"stripe": {
+		"api_key": os.getenv("STRIPE_KEY","")
+	}
 }
 
 PROVIDERS = {}
@@ -34,13 +34,13 @@ PROVIDERS = {}
 
 # 下单接口（统一）
 async def create_payment(request, params_kw=None):
-    if params_kw is None:
-		params_kw = request.paams_kw
+	if params_kw is None:
+		params_kw = request.params_kw
 	data = params_kw
-    provider = data.get("provider")
-    if provider not in PROVIDERS:
-        return {"error":"unknown provider"}
-    try:
+	provider = data.get("provider")
+	if provider not in PROVIDERS:
+		return {"error":"unknown provider"}
+	try:
 		pl = PaymentLog(request._run_ns)
 		channel = get_provider_channel(provider)
 		userid = await get_suer()
@@ -56,68 +56,68 @@ async def create_payment(request, params_kw=None):
 			res = await PROVIDERS[provider].create_payment(data)
 			return res
 		raise Exception('write payment_log error')
-    except Exception as e:
-        return {"error": str(e)}
+	except Exception as e:
+		return {"error": str(e)}
 
 # 查询
 async def query_payment(request, params_kw=None):
-    if params_kw is None:
-		params_kw = request.paams_kw
+	if params_kw is None:
+		params_kw = request.params_kw
 	data = params_kw
-    provider = data.get("provider")
-    if provider not in PROVIDERS:
-        return {"error":"unknown provider"}
-    try:
-        res = await PROVIDERS[provider].query(data)
-        return res
-    except Exception as e:
-        return {"error": str(e)}
+	provider = data.get("provider")
+	if provider not in PROVIDERS:
+		return {"error":"unknown provider"}
+	try:
+		res = await PROVIDERS[provider].query(data)
+		return res
+	except Exception as e:
+		return {"error": str(e)}
 
 # 退款
 async def refund_payment(request, params_kw=None):
-    if params_kw is None:
-		params_kw = request.paams_kw
+	if params_kw is None:
+		params_kw = request.params_kw
 	data = params_kw
-    provider = data.get("provider")
-    if provider not in PROVIDERS:
-        return {"error":"unknown provider"}
-    try:
-        res = await PROVIDERS[provider].refund(data)
-        return res
-    except Exception as e:
-        return {"error": str(e)}
+	provider = data.get("provider")
+	if provider not in PROVIDERS:
+		return {"error":"unknown provider"}
+	try:
+		res = await PROVIDERS[provider].refund(data)
+		return res
+	except Exception as e:
+		return {"error": str(e)}
 
 # 回调入口：你可把厂商回调用各自 endpoint 再转发到这里，或在厂商控制台按各自 URL 配置
 async def payment_notify(request, callback, params_kw=None):
-    if params_kw is None:
-		params_kw = request.paams_kw
+	if params_kw is None:
+		params_kw = request.params_kw
 	data = params_kw
 	provider = params_kw.provider
-    headers = dict(request.headers)
-    body = await request.text()
-    try:
-        data = await PROVIDERS[provider].handle_notify(headers, body)
-        # 这里 data 应包含标准化字段：out_trade_no/status/attach 等
-        # TODO: 业务幂等处理
-        # 返回厂商要求的固定成功响应
+	headers = dict(request.headers)
+	body = await request.text()
+	try:
+		data = await PROVIDERS[provider].handle_notify(headers, body)
+		# 这里 data 应包含标准化字段：out_trade_no/status/attach 等
+		# TODO: 业务幂等处理
+		# 返回厂商要求的固定成功响应
 		logid = data['out_trade_no']
 		pl = PaymentLog(request._run_ns)
 		await pl.payed_log(logid)
 		await callback(request, data)
-        if provider == "wechat":
-            return {"code":"SUCCESS", "message":"OK"}
-        else:
-            return "OK"
-    except Exception as e:
-        return web.Response(status=500, text=str(e))
+		if provider == "wechat":
+			return {"code":"SUCCESS", "message":"OK"}
+		else:
+			return "OK"
+	except Exception as e:
+		return web.Response(status=500, text=str(e))
 
 # callback url= "/unipay/notify/{provider}"
 
 def load_unipay():
-    PROVIDERS["wechat"] = get_provider("wechat", CONF["wechat"]),
-    PROVIDERS["paypal"] = get_provider("paypal", CONF["paypal"]),
-    PROVIDERS["alipay"] = get_provider("alipay", CONF["alipay"]),
-    PROVIDERS["stripe"] = get_provider("stripe", CONF["stripe"])
+	PROVIDERS["wechat"] = get_provider("wechat", CONF["wechat"]),
+	PROVIDERS["paypal"] = get_provider("paypal", CONF["paypal"]),
+	PROVIDERS["alipay"] = get_provider("alipay", CONF["alipay"]),
+	PROVIDERS["stripe"] = get_provider("stripe", CONF["stripe"])
 	env = ServerEnv()
 	env.payment_notify = payment_notify
 	env.create_payment = create_payment