blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修改注释

Browse Source
This commit is contained in:
邹景立 2021-03-01 10:37:31 +08:00
parent f602bb4470
commit 20ce38cf9b
19 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ class DataService extends Service
/**
* 获取支付配置
* @return array|void
* @throws \think\admin\Exception
* @throws Exception
*/
public function payment(): array
{

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

@ -9,7 +9,7 @@ use app\data\service\payment\JoinPaymentService;
use app\data\service\payment\WechatPaymentService;
use think\App;
use think\Container;
use think\Exception;
use think\admin\Exception;
/**
* 支付基础服务

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

@ -3,7 +3,7 @@
namespace app\data\service;
use think\admin\Service;
use think\Exception;
use think\admin\Exception;
/**
* 用户奖励配置

6
app/data/service/UserService.php
View File

@ -161,14 +161,14 @@ class UserService extends Service
* @param array $list 原数据列表
* @param string $keys 用户UID字段
* @param string $bind 绑定字段名称
* @param string $column 返回用户字段
* @param string $cols 返回用户字段
* @return array
*/
public function buildByUid(array &$list, string $keys = 'uid', string $bind = 'user', string $column = '*'): array
public function buildByUid(array &$list, string $keys = 'uid', string $bind = 'user', string $cols = '*'): array
{
if (count($list) < 1) return $list;
$uids = array_unique(array_column($list, $keys));
$users = $this->app->db->name('DataUser')->whereIn('id', $uids)->column($column, 'id');
$users = $this->app->db->name('DataUser')->whereIn('id', $uids)->column($cols, 'id');
foreach ($list as &$vo) $vo[$bind] = $users[$vo[$keys]] ?? [];
return $list;
}

13
app/data/service/payment/AlipayPaymentService.php
View File

@ -3,6 +3,7 @@
namespace app\data\service\payment;
use app\data\service\PaymentService;
use think\admin\Exception;
/**
* 支付宝支付基础服务
@ -66,7 +67,7 @@ class AlipayPaymentService extends PaymentService
* @param string $paymentRemark 订单订单描述
* @param string $paymentReturn 完成回跳地址
* @return array
* @throws \think\Exception
* @throws Exception
*/
public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
{
@ -74,12 +75,12 @@ class AlipayPaymentService extends PaymentService
if (isset(static::TYPES[$this->type])) {
$tradeType = static::TYPES[$this->type]['type'];
} else {
throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
throw new Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
}
$this->config['notify_url'] = sysuri("@data/api.notify/alipay/scene/order/param/{$this->code}", [], false, true);
if (in_array($tradeType, [static::PAYMENT_ALIPAY_WAP, static::PAYMENT_ALIPAY_WEB])) {
if (empty($paymentReturn)) {
throw new \think\Exception('支付回跳地址不能为空！');
throw new Exception('支付回跳地址不能为空！');
} else {
$this->config['return_url'] = $paymentReturn;
}
@ -91,7 +92,7 @@ class AlipayPaymentService extends PaymentService
} elseif ($tradeType === static::PAYMENT_ALIPAY_WEB) {
$payment = \AliPay\Web::instance($this->config);
} else {
throw new \think\Exception("支付类型[{$tradeType}]暂时不支持！");
throw new Exception("支付类型[{$tradeType}]暂时不支持！");
}
$data = ['out_trade_no' => $orderNo, 'total_amount' => $paymentAmount, 'subject' => $paymentTitle];
if (!empty($paymentRemark)) $data['body'] = $paymentRemark;
@ -100,10 +101,10 @@ class AlipayPaymentService extends PaymentService
$this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount);
// 返回支付参数
return ['result' => $result];
} catch (\think\Exception $exception) {
} catch (Exception $exception) {
throw $exception;
} catch (\Exception $exception) {
throw new \think\Exception($exception->getMessage(), $exception->getCode());
throw new Exception($exception->getMessage(), $exception->getCode());
}
}

2
app/data/service/payment/BalancePyamentService.php
View File

@ -5,7 +5,7 @@ namespace app\data\service\payment;
use app\data\service\PaymentService;
use app\data\service\UserService;
use think\admin\extend\CodeExtend;
use think\Exception;
use think\admin\Exception;
/**
* 账号余额支付参数处理

2
app/data/service/payment/EmptyPaymentService.php
View File

@ -4,7 +4,7 @@ namespace app\data\service\payment;
use app\data\service\PaymentService;
use think\admin\extend\CodeExtend;
use think\Exception;
use think\admin\Exception;
/**
* 空支付通道

13
app/data/service/payment/JoinPaymentService.php
View File

@ -4,6 +4,7 @@ namespace app\data\service\payment;
use app\data\service\PaymentService;
use think\admin\extend\HttpExtend;
use think\admin\Exception;
/**
* 汇聚支付基础服务
@ -64,7 +65,7 @@ class JoinPaymentService extends PaymentService
* @param string $paymentRemark 订单订单描述
* @param string $paymentReturn 支付回跳地址
* @return array
* @throws \think\Exception
* @throws Exception
*/
public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
{
@ -72,7 +73,7 @@ class JoinPaymentService extends PaymentService
if (isset(static::TYPES[$this->type])) {
$tradeType = static::TYPES[$this->type]['type'];
} else {
throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
throw new Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
}
$data = [
'p0_Version' => '1.0',
@ -97,14 +98,14 @@ class JoinPaymentService extends PaymentService
// 返回支付参数
return json_decode($result['rc_Result'], true);
} elseif (is_array($result) && isset($result['rb_CodeMsg'])) {
throw new \think\Exception($result['rb_CodeMsg']);
throw new Exception($result['rb_CodeMsg']);
} else {
throw new \think\Exception('获取预支付码失败！');
throw new Exception('获取预支付码失败！');
}
} catch (\think\Exception $exception) {
} catch (Exception $exception) {
throw $exception;
} catch (\Exception $exception) {
throw new \think\Exception($exception->getMessage(), $exception->getCode());
throw new Exception($exception->getMessage(), $exception->getCode());
}
}

13
app/data/service/payment/WechatPaymentService.php
View File

@ -3,6 +3,7 @@
namespace app\data\service\payment;
use app\data\service\PaymentService;
use think\admin\Exception;
use WePay\Order;
/**
@ -42,7 +43,7 @@ class WechatPaymentService extends PaymentService
* @param string $paymentRemark 订单订单描述
* @param string $paymentReturn 支付回跳地址
* @return array
* @throws \think\Exception
* @throws Exception
*/
public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
{
@ -50,7 +51,7 @@ class WechatPaymentService extends PaymentService
if (isset(static::TYPES[$this->type])) {
$tradeType = static::TYPES[$this->type]['type'];
} else {
throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
throw new Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
}
$body = empty($paymentRemark) ? $paymentTitle : ($paymentTitle . '-' . $paymentRemark);
$data = [
@ -72,14 +73,14 @@ class WechatPaymentService extends PaymentService
return $this->payment->jsapiParams($info['prepay_id']);
}
if (isset($info['err_code_des'])) {
throw new \think\Exception($info['err_code_des']);
throw new Exception($info['err_code_des']);
} else {
throw new \think\Exception('获取预支付码失败！');
throw new Exception('获取预支付码失败！');
}
} catch (\think\Exception $exception) {
} catch (Exception $exception) {
throw $exception;
} catch (\Exception $exception) {
throw new \think\Exception($exception->getMessage(), $exception->getCode());
throw new Exception($exception->getMessage(), $exception->getCode());
}
}

8
app/data/sys.php
View File

@ -6,14 +6,14 @@ use app\data\command\UserLevel;
use app\data\command\UserTransfer;
use think\Console;
Console::starting(function (Console $console) {
if (app()->request->isCli()) {
if (app()->request->isCli()) {
Console::starting(function (Console $console) {
$console->addCommand(OrderClear::class);
$console->addCommand(UserBalance::class);
$console->addCommand(UserLevel::class);
$console->addCommand(UserTransfer::class);
}
});
});
}
if (!function_exists('show_goods_spec')) {
/**

4
app/wechat/command/Fans.php
View File

@ -68,7 +68,7 @@ class Fans extends Command
* @return string
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -136,7 +136,7 @@ class Fans extends Command
* @return string
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

2
app/wechat/controller/Fans.php
View File

@ -36,7 +36,7 @@ class Fans extends Controller
* 微信用户管理
* @auth true
* @menu true
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

4
app/wechat/controller/News.php
View File

@ -118,9 +118,9 @@ class News extends Controller
$ids = $this->_buildArticle($this->request->post('data', []));
[$map, $data] = [['id' => $this->id], ['article_id' => $ids]];
if ($this->app->db->name($this->table)->where($map)->update($data) !== false) {
$this->success('图文更新成功！', 'javascript:history.back()');
$this->success('更新成功！', 'javascript:history.back()');
} else {
$this->error('图文更新失败，请稍候再试！');
$this->error('更新失败，请稍候再试！');
}
}
}

4
app/wechat/controller/api/Js.php
View File

@ -40,7 +40,7 @@ class Js extends Controller
* @return \think\Response
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -69,7 +69,7 @@ class Js extends Controller
* 给指定地址创建签名参数
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

2
app/wechat/controller/api/Login.php
View File

@ -61,7 +61,7 @@ class Login extends Controller
* 微信授权结果处理
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

8
app/wechat/controller/api/Push.php
View File

@ -101,7 +101,7 @@ class Push extends Controller
$this->encrypt = boolval($this->request->post('encrypt', 0));
$this->receive = $this->_arrayChangeKeyCase(json_decode(input('params', '[]'), true));
if (empty($this->appid) || empty($this->openid) || empty($this->receive)) {
throw new \think\Exception('微信API实例缺失必要参数[appid,openid,receive]');
throw new \think\admin\Exception('微信API实例缺失必要参数[appid,openid,receive]');
}
} else {
$this->forceJson = false; // 直接返回JSON对象数据
@ -131,7 +131,7 @@ class Push extends Controller
* @throws \WeChat\Exceptions\InvalidDecryptException
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -147,7 +147,7 @@ class Push extends Controller
* @throws \WeChat\Exceptions\InvalidDecryptException
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -189,7 +189,7 @@ class Push extends Controller
* @throws \WeChat\Exceptions\InvalidDecryptException
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

10
app/wechat/controller/api/Test.php
View File

@ -106,7 +106,7 @@ class Test extends Controller
* 网页授权测试
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -122,7 +122,7 @@ class Test extends Controller
* JSSDK测试
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -175,12 +175,14 @@ class Test extends Controller
/**
* 微信JSAPI支付测试
* @throws \WeChat\Exceptions\InvalidResponseException
* @return string
* @return void|string
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \WeChat\Exceptions\InvalidResponseException
*/
public function jsapi()
{

2
app/wechat/service/MediaService.php
View File

@ -59,7 +59,7 @@ class MediaService extends Service
* @return string media_id
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

20
app/wechat/service/WechatService.php
View File

@ -89,7 +89,6 @@ class WechatService extends Service
* @param string $name
* @param array $arguments
* @return mixed
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
@ -99,11 +98,11 @@ class WechatService extends Service
{
[$type, $class, $classname] = static::parseName($name);
if ("{$type}{$class}" !== $name) {
throw new \think\Exception("抱歉，实例 {$name} 不在符合规则！");
throw new \think\admin\Exception("抱歉，实例 {$name} 不在符合规则！");
}
if (sysconf('wechat.type') === 'api' || $type === 'WePay') {
if ($type === 'ThinkService') {
throw new \think\Exception("抱歉，接口模式不能实例 {$classname} 对象！");
throw new \think\admin\Exception("抱歉，接口模式不能实例 {$classname} 对象！");
}
return new $classname(static::instance()->getConfig());
} else {
@ -118,7 +117,7 @@ class WechatService extends Service
$client = new JsonRpcClient(str_replace('_TYPE_', 'jsonrpc', $location));
}
try {
$exception = new \think\Exception($client->getMessage(), $client->getCode());
$exception = new \think\admin\Exception($client->getMessage(), $client->getCode());
} catch (\Exception $exception) {
$exception = null;
}
@ -148,7 +147,7 @@ class WechatService extends Service
/**
* 获取当前微信APPID
* @return string
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -165,7 +164,7 @@ class WechatService extends Service
/**
* 获取接口授权模式
* @return string
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -174,13 +173,12 @@ class WechatService extends Service
{
$type = strtolower(sysconf('wechat.type'));
if (in_array($type, ['api', 'thr'])) return $type;
throw new \think\Exception('请在后台配置微信对接授权模式');
throw new \think\admin\Exception('请在后台配置微信对接授权模式');
}
/**
* 获取公众号配置参数
* @return array
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
@ -218,7 +216,7 @@ class WechatService extends Service
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -260,7 +258,7 @@ class WechatService extends Service
} elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
return ['openid' => $openid, 'fansinfo' => $userinfo];
} else {
throw new \think\Exception('Query params [rcode] not find.');
throw new \think\admin\Exception('Query params [rcode] not find.');
}
} else {
$result = static::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull);
@ -284,7 +282,7 @@ class WechatService extends Service
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\Exception
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException