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:
Anyon 2020-12-14 10:57:39 +08:00
parent de011137a1
commit 5f4e5ebd1b
12 changed files with 89 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/controller/api/Goods.php
View File

@ -40,7 +40,7 @@ class Goods extends Controller
*/
public function getGoods()
{
if ($code = input('code', null)) {
if ($code = input('code', '')) {
$this->app->db->name('ShopGoods')->where(['code' => $code])->update([
'num_read' => $this->app->db->raw('num_read+1'),
]);

6
app/data/controller/api/Login.php
View File

@ -44,7 +44,7 @@ class Login extends Controller
if (empty($user)) $this->error('该手机号还没有注册哦！');
if (empty($user['status'])) $this->error('该用户账号状态异常！');
if (md5($data['password']) === $user['password']) {
$this->success('手机登录成功！', UserService::instance()->save($map, [], 'web', true));
$this->success('手机登录成功！', UserService::instance()->set($map, [], $this->type, true));
} else {
$this->error('账号登录失败，请稍候再试！');
}
@ -79,7 +79,7 @@ class Login extends Controller
$this->error('手机号已注册，请使用其它手机号！');
}
$data['password'] = md5($data['password']);
$user = UserService::instance()->save($map, $data, $this->type, true);
$user = UserService::instance()->set($map, $data, $this->type, true);
empty($user) ? $this->error('手机注册失败！') : $this->success('用户注册成功！', $user);
}
@ -96,7 +96,7 @@ class Login extends Controller
'phone.require' => '手机号不能为空！',
'secure.require' => '安全码不能为空！',
]);
if ($data['secure'] !== sysconf('zt.secure_code')) $this->error('短信发送安全码错误！');
if ($data['secure'] !== sysconf('zt.secure_code')) $this->error('接口安全码错误！');
[$state, $message, $data] = MessageService::instance()->sendVerifyCode($data['phone']);
$state ? $this->success($message, $data) : $this->error($message, $data);
}

8
app/data/controller/api/Notify.php
View File

@ -2,8 +2,8 @@
namespace app\data\controller\api;
use app\data\service\payment\JoinPayService;
use app\data\service\payment\WechatPayService;
use app\data\service\payment\JoinPaymentService;
use app\data\service\payment\WechatPaymentService;
use think\admin\Controller;
/**
@ -25,7 +25,7 @@ class Notify extends Controller
public function wxpay(string $scene = 'order'): string
{
if (strtolower($scene) === 'order') {
return WechatPayService::instance()->notify();
return WechatPaymentService::instance()->notify();
} else {
return 'success';
}
@ -42,7 +42,7 @@ class Notify extends Controller
public function joinpay(string $scene = 'order'): string
{
if (strtolower($scene) === 'order') {
return JoinPayService::instance()->notify();
return JoinPaymentService::instance()->notify();
} else {
return 'success';
}

22
app/data/controller/api/Wechat.php
View File

@ -26,6 +26,12 @@ class Wechat extends Controller
*/
private $type = UserService::APITYPE_WECHAT;
/**
* 唯一绑定字段
* @var string
*/
private $field;
/**
* 粉丝OPNEID
* @var string
@ -50,6 +56,18 @@ class Wechat extends Controller
*/
private $userInfo;
/**
* 控制器初始化
*/
protected function initialize()
{
if (empty(UserService::TYPES[$this->type]['auth'])) {
$this->error("接口类型[{$this->type}]没有定义规则");
} else {
$this->field = UserService::TYPES[$this->type]['auth'];
}
}
/**
* 加载对应JSSDK数据
* @return \think\Response
@ -76,8 +94,8 @@ class Wechat extends Controller
$data['openid2'] = $data['openid'];
$data['base_sex'] = ['未知', '男', '女'][$data['sex']] ?? '未知';
if (isset($data['headimgurl'])) $data['headimg'] = $data['headimgurl'];
$map = isset($data['unionid']) ? ['unionid' => $data['unionid']] : [UserService::AUTHS[$this->type] => $this->openid];
$this->userInfo = UserService::instance()->save($map, array_merge($map, $data), $this->type, true);
$map = isset($data['unionid']) ? ['unionid' => $data['unionid']] : [$this->field => $this->openid];
$this->userInfo = UserService::instance()->set($map, array_merge($map, $data), $this->type, true);
$content = $this->_buildContent();
}
return Response::create($content)->contentType('application/x-javascript');

29
app/data/controller/api/Wxapp.php
View File

@ -21,13 +21,19 @@ class Wxapp extends Controller
* 接口认证类型
* @var string
*/
protected $type = UserService::APITYPE_WXAPP;
private $type = UserService::APITYPE_WXAPP;
/**
* 唯一绑定字段
* @var string
*/
private $field;
/**
* 小程序配置参数
* @var array
*/
protected $config;
private $config;
/**
* 接口服务初始化
@ -40,8 +46,13 @@ class Wxapp extends Controller
$this->config = [
'appid' => sysconf('data.wxapp_appid'),
'appsecret' => sysconf('data.wxapp_appkey'),
'cache_path' => $this->app->getRuntimePath() . 'wechat',
'cache_path' => $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'wechat',
];
if (empty(UserService::TYPES[$this->type]['auth'])) {
$this->error("接口类型[{$this->type}]没有定义规则");
} else {
$this->field = UserService::TYPES[$this->type]['auth'];
}
}
/**
@ -55,9 +66,9 @@ class Wxapp extends Controller
{
$input = $this->_vali(['code.require' => '登录凭证code不能为空！']);
[$openid, $unionid, $sessionKey] = $this->_getSessionKey($input['code']);
$map = empty($unionid) ? ['openid1' => $openid] : ['unionid' => $unionid];
$data = array_merge($map, ['openid1' => $openid, 'session_key' => $sessionKey]);
$this->success('授权换取成功！', UserService::instance()->save($map, $data, $this->type, true));
$map = empty($unionid) ? [$this->field => $openid] : ['unionid' => $unionid];
$data = array_merge($map, [$this->field => $openid, 'session_key' => $sessionKey]);
$this->success('授权换取成功！', UserService::instance()->set($map, $data, $this->type, true));
}
/**
@ -80,9 +91,9 @@ class Wxapp extends Controller
$result = Crypt::instance($this->config)->decode($input['iv'], $input['session_key'], $input['encrypted']);
if (is_array($result) && isset($result['openId']) && isset($result['avatarUrl']) && isset($result['nickName'])) {
$sex = ['未知', '男', '女'][$result['gender']] ?? '未知';
$map = empty($result['unionId']) ? ['openid1' => $result['openId']] : ['unionid' => $result['unionId']];
$data = [UserService::AUTHS[$this->type] => $result['openId'], 'headimg' => $result['avatarUrl'], 'nickname' => $result['nickName'], 'base_sex' => $sex];
$this->success('数据解密成功！', UserService::instance()->save($map, array_merge($map, $data), $this->type, true));
$map = empty($result['unionId']) ? [$this->field => $result['openId']] : ['unionid' => $result['unionId']];
$data = [$this->field => $result['openId'], 'headimg' => $result['avatarUrl'], 'nickname' => $result['nickName'], 'base_sex' => $sex];
$this->success('数据解密成功！', UserService::instance()->set($map, array_merge($map, $data), $this->type, true));
} elseif (is_array($result) && isset($result['phoneNumber'])) {
$this->success('数据解密成功！', $result);
} else {

3
app/data/controller/api/auth/Address.php
View File

@ -109,8 +109,7 @@ class Address extends Auth
public function remove()
{
$map = $this->_vali([
'uid.value' => $this->uuid,
'code.require' => '地址编号不能为空！',
'uid.value' => $this->uuid, 'code.require' => '地址编号不能为空！',
]);
$address = $this->app->db->name($this->table)->where($map)->find();
if (empty($address)) $this->error('需要删除的地址不存在！');

8
app/data/controller/api/auth/Config.php
View File

@ -22,11 +22,13 @@ class Config extends Auth
{
$types = [];
foreach (PaymentService::TYPES as $type => $arr) {
if (in_array($this->type, $arr['auth'])) $types[] = $type;
if (isset($arr['auth']) && in_array($this->type, $arr['auth'])) {
$types[] = $type;
}
}
$map = ['status' => 1, 'deleted' => 0];
$query = $this->app->db->name('DataPayment')->where($map)->whereIn('type', $types);
$result = $query->order('sort desc,id desc')->field('id,name,type,create_at')->select();
$this->success('获取支付通道数据', $result->toArray());
$collect = $query->order('sort desc,id desc')->field('id,name,type,create_at')->select();
$this->success('获取支付通道数据', $collect->toArray());
}
}

4
app/data/controller/api/auth/Order.php
View File

@ -192,9 +192,9 @@ class Order extends Auth
$order = $this->app->db->name('ShopOrder')->where($map)->find();
if (empty($order)) $this->error('获取订单数据失败，请稍候再试！');
if ($order['status'] != 2) $this->error('该订单不能发起支付哦！');
if ($order['payment_status']) $this->error('订单已经支付，不需要再次支付哦！');
if ($order['payment_status'] > 0) $this->error('订单已经完成支付！');
try {
$openid = $this->user[UserService::AUTHS[$this->type]] ?? '';
$openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? '';
$params = PaymentService::build($data['payid'])->create($openid, $order['order_no'], $order['amount_total'], '商城订单支付', '');
$this->success('获取支付参数成功！', $params);
} catch (HttpResponseException $exception) {

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

@ -2,8 +2,8 @@
namespace app\data\service;
use app\data\service\payment\JoinPayService;
use app\data\service\payment\WechatPayService;
use app\data\service\payment\JoinPaymentService;
use app\data\service\payment\WechatPaymentService;
use think\admin\Service;
/**
@ -29,7 +29,7 @@ abstract class PaymentService extends Service
],
PaymentService::PAYMENT_JOINPAY_GZH => [
'name' => '汇聚服务号支付',
'auth' => 'UserService::APITYPE_WECHAT',
'auth' => [UserService::APITYPE_WECHAT],
],
PaymentService::PAYMENT_WECHAT_JSAPI => [
'name' => '微信商户支付',
@ -51,7 +51,7 @@ abstract class PaymentService extends Service
/**
* 支付服务对象
* @var JoinPayService|WechatPayService
* @var JoinPaymentService|WechatPaymentService
*/
protected static $driver = [];
@ -59,7 +59,7 @@ abstract class PaymentService extends Service
/**
* 根据配置实例支付服务
* @param string $payid 支付通道编号
* @return JoinPayService|WechatPayService
* @return JoinPaymentService|WechatPaymentService
* @throws \think\Exception
*/
public static function build(string $payid): PaymentService
@ -84,9 +84,9 @@ abstract class PaymentService extends Service
// 实例化具体支付通道类型
static::$type = $payment['type'];
if (stripos(static::$type, 'wechat_') === 0) {
return static::$driver[$payid] = WechatPayService::instance();
return static::$driver[$payid] = WechatPaymentService::instance();
} else {
return static::$driver[$payid] = JoinPayService::instance();
return static::$driver[$payid] = JoinPaymentService::instance();
}
}

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

@ -16,18 +16,23 @@ class UserService extends Service
const APITYPE_WXAPP = 'wxapp';
const APITYPE_WECHAT = 'wechat';
const AUTHS = [
UserService::APITYPE_WAP => 'phone,password',
UserService::APITYPE_WEB => 'phone,password',
UserService::APITYPE_WXAPP => 'openid1',
UserService::APITYPE_WECHAT => 'openid2',
];
const TYPES = [
UserService::APITYPE_WAP => '手机浏览器访问',
UserService::APITYPE_WEB => '电脑浏览器访问',
UserService::APITYPE_WXAPP => '微信小程序访问',
UserService::APITYPE_WECHAT => '微信服务号访问',
UserService::APITYPE_WAP => [
'name' => '手机浏览器访问',
'auth' => '',
],
UserService::APITYPE_WEB => [
'name' => '电脑浏览器访问',
'auth' => '',
],
UserService::APITYPE_WXAPP => [
'name' => '微信小程序访问',
'auth' => 'openid1',
],
UserService::APITYPE_WECHAT => [
'name' => '微信服务号访问',
'auth' => 'openid2',
],
];
/**
@ -69,7 +74,7 @@ class UserService extends Service
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function save(array $map, array $data, string $type, bool $force = false): array
public function set(array $map, array $data, string $type, bool $force = false): array
{
unset($data['id'], $data['deleted'], $data['create_at']);
if ($uuid = $this->app->db->name('DataUser')->where($map)->where(['deleted' => 0])->value('id')) {

8
app/data/service/payment/JoinPayService.php → app/data/service/payment/JoinPaymentService.php
View File

@ -7,10 +7,10 @@ use think\admin\extend\HttpExtend;
/**
* 汇聚支付基础服务
* Class JoinPayService
* Class JoinPaymentService
* @package app\store\service\payment
*/
class JoinPayService extends PaymentService
class JoinPaymentService extends PaymentService
{
/**
* 请求地址
@ -44,9 +44,9 @@ class JoinPayService extends PaymentService
/**
* 汇聚支付服务初始化
* @return JoinPayService
* @return JoinPaymentService
*/
protected function initialize(): JoinPayService
protected function initialize(): JoinPaymentService
{
$this->appid = static::$config['joinpay_appid'];
$this->trade = static::$config['joinpay_trade'];;

10
app/data/service/payment/WechatPayService.php → app/data/service/payment/WechatPaymentService.php
View File

@ -7,10 +7,10 @@ use WePay\Order;
/**
* 微信官方公众号支持
* Class WechatPayService
* Class WechatPaymentService
* @package app\store\service\payment
*/
class WechatPayService extends PaymentService
class WechatPaymentService extends PaymentService
{
/**
* 微信对象对象
@ -20,15 +20,15 @@ class WechatPayService extends PaymentService
/**
* 微信支付服务初始化
* @return WechatPayService
* @return WechatPaymentService
*/
protected function initialize(): WechatPayService
protected function initialize(): WechatPaymentService
{
$this->payment = Order::instance([
'appid' => static::$config['wechat_appid'],
'mch_id' => static::$config['wechat_mch_id'],
'mch_key' => static::$config['wechat_mch_key'],
'cache_path' => $this->app->getRuntimePath() . 'wechat',
'cache_path' => $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'wechat',
]);
return $this;
}