blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-09-10 22:39:44 +08:00
Code Issues Projects Releases Wiki Activity

修改应用调用

Browse Source
This commit is contained in:
Anyon 2022-07-12 10:53:27 +08:00
parent a12f7599a2
commit 7526721b4a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/data/service/PaymentService.php
View File

@ -12,6 +12,7 @@ use app\data\service\payment\JoinpayPaymentService;
use app\data\service\payment\VoucherPaymentService; use app\data\service\payment\VoucherPaymentService;
use app\data\service\payment\WechatPaymentService; use app\data\service\payment\WechatPaymentService;
use think\admin\Exception; use think\admin\Exception;
use think\admin\Library;
use think\App; use think\App;
/** /**
@ -174,22 +175,22 @@ abstract class PaymentService
{ {
if ($code === 'empty') { if ($code === 'empty') {
$vars = ['code' => 'empty', 'type' => 'empty', 'params' => []]; $vars = ['code' => 'empty', 'type' => 'empty', 'params' => []];
return static::$driver[$code] = app()->make(EmptyPaymentService::class, $vars); return static::$driver[$code] = Library::$sapp->make(EmptyPaymentService::class, $vars);
} }
[, $type, $params] = self::config($code); [, $type, $params] = self::config($code);
if (isset(static::$driver[$code])) return static::$driver[$code]; if (isset(static::$driver[$code])) return static::$driver[$code];
$vars = ['code' => $code, 'type' => $type, 'params' => $params]; $vars = ['code' => $code, 'type' => $type, 'params' => $params];
// 实例化具体支付参数类型 // 实例化具体支付参数类型
if (stripos($type, 'balance') === 0) { if (stripos($type, 'balance') === 0) {
return static::$driver[$code] = app()->make(BalancePyamentService::class, $vars); return static::$driver[$code] = Library::$sapp->make(BalancePyamentService::class, $vars);
} elseif (stripos($type, 'voucher') === 0) { } elseif (stripos($type, 'voucher') === 0) {
return static::$driver[$code] = app()->make(VoucherPaymentService::class, $vars); return static::$driver[$code] = Library::$sapp->make(VoucherPaymentService::class, $vars);
} elseif (stripos($type, 'alipay_') === 0) { } elseif (stripos($type, 'alipay_') === 0) {
return static::$driver[$code] = app()->make(AlipayPaymentService::class, $vars); return static::$driver[$code] = Library::$sapp->make(AlipayPaymentService::class, $vars);
} elseif (stripos($type, 'wechat_') === 0) { } elseif (stripos($type, 'wechat_') === 0) {
return static::$driver[$code] = app()->make(WechatPaymentService::class, $vars); return static::$driver[$code] = Library::$sapp->make(WechatPaymentService::class, $vars);
} elseif (stripos($type, 'joinpay_') === 0) { } elseif (stripos($type, 'joinpay_') === 0) {
return static::$driver[$code] = app()->make(JoinpayPaymentService::class, $vars); return static::$driver[$code] = Library::$sapp->make(JoinpayPaymentService::class, $vars);
} else { } else {
throw new Exception(sprintf('支付驱动[%s]未定义', $type)); throw new Exception(sprintf('支付驱动[%s]未定义', $type));
} }

2
app/data/service/UserTokenService.php
View File

@ -54,7 +54,7 @@ class UserTokenService extends Service
private static function buildVerify(): string private static function buildVerify(): string
{ {
return md5('-'); return md5('-');
// return md5(app()->request->server('HTTP_USER_AGENT', '-')); //return md5(Library::$sapp->request->server('HTTP_USER_AGENT', '-'));
} }
/** /**