Skip to content

G
goods
Commit 6726b544 authored by luhongguang's avatar luhongguang
Browse files
Options

update:tcc 下单商品扣库存

parent 1eace844
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 112 deletions
application/library/Validate/GoodsTccValidate.php
View file @ 6726b544
...@@ -12,12 +12,12 @@ namespace Validate; ...@@ -12,12 +12,12 @@ namespace Validate;
class GoodsTccValidate extends BaseValidate class GoodsTccValidate extends BaseValidate
{ {
protected $rule = [ protected $rule = [
't_id' => 'require', 'tid' => 'require',
'keys' => 'require', 'keys' => 'require',
]; ];
protected $message = [ protected $message = [
"t_id" => "tcc事务id不能为空", "tid" => "tcc事务id不能为空",
"keys" => "商品信息不能为空", "keys" => "商品信息不能为空",
]; ];
} }
\ No newline at end of file
application/modules/Tcc/controllers/Tcc.php
View file @ 6726b544
...@@ -15,7 +15,7 @@ class TccController extends Base ...@@ -15,7 +15,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::placeAnOrderTry($this->params["keys"], $this->params["t_id"]); $res = TccService::placeAnOrderTry($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
...@@ -27,7 +27,7 @@ class TccController extends Base ...@@ -27,7 +27,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::placeAnOrderConfirm($this->params["keys"], $this->params["t_id"]); $res = TccService::placeAnOrderConfirm($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
...@@ -39,7 +39,7 @@ class TccController extends Base ...@@ -39,7 +39,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::placeAnOrderCancel($this->params["keys"], $this->params["t_id"]); $res = TccService::placeAnOrderCancel($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
...@@ -51,7 +51,7 @@ class TccController extends Base ...@@ -51,7 +51,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::cancelOrderTry($this->params["keys"], $this->params["t_id"]); $res = TccService::cancelOrderTry($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
...@@ -63,7 +63,7 @@ class TccController extends Base ...@@ -63,7 +63,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::cancelOrderConfirm($this->params["keys"], $this->params["t_id"]); $res = TccService::cancelOrderConfirm($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
...@@ -75,7 +75,7 @@ class TccController extends Base ...@@ -75,7 +75,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::cancelOrderCancel($this->params["keys"], $this->params["t_id"]); $res = TccService::cancelOrderCancel($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
...@@ -87,7 +87,7 @@ class TccController extends Base ...@@ -87,7 +87,7 @@ class TccController extends Base
{ {
(new GoodsTccValidate())->validate(); (new GoodsTccValidate())->validate();
$res = TccService::tccIsFinish($this->params["keys"], $this->params["t_id"]); $res = TccService::tccIsFinish($this->params["keys"], $this->params["tid"]);
$this->success(["result"=>$res]); $this->success(["result"=>$res]);
} }
} }
\ No newline at end of file
application/services/tcc/TccService.php
View file @ 6726b544
...@@ -37,7 +37,7 @@ class TccService ...@@ -37,7 +37,7 @@ class TccService
} }
//有结果返回原来的结果，幂等 //有结果返回原来的结果，幂等
$tccInfoList = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuIds, "status" => Tcc::STATUS_TRY]); $tccInfoList = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuIds, "status" => Tcc::STATUS_TRY]);
if (!empty($tccInfoList)) { if (!empty($tccInfoList)) {
foreach ($tccInfoList as $tccInfo) { foreach ($tccInfoList as $tccInfo) {
if ($tccInfo["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) { if ($tccInfo["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) {
...@@ -48,11 +48,11 @@ class TccService ...@@ -48,11 +48,11 @@ class TccService
} }
//如果已经有 confirm 或者 cancel，则直接失败 //如果已经有 confirm 或者 cancel，则直接失败
$cTccInfoList = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuIds, "status" => [Tcc::STATUS_CONFIRM, Tcc::STATUS_CANCEL], "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]); $cTccInfoList = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuIds, "status" => [Tcc::STATUS_CONFIRM, Tcc::STATUS_CANCEL], "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]);
if (!empty($cTccInfoList)) { if (!empty($cTccInfoList)) {
foreach ($goodsSkuIds as $goodsSkuId) { foreach ($goodsSkuIds as $goodsSkuId) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -61,8 +61,9 @@ class TccService ...@@ -61,8 +61,9 @@ class TccService
return self::TCC_RESULT_FAIL; return self::TCC_RESULT_FAIL;
} }
$skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds $skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds]
, ["goods_sku_id", "inventory_rest", "inventory_lock", "online_status"]]); , ["goods_sku_id", "inventory_rest", "inventory_lock", "online_status"]);
if (!empty($skus)) { if (!empty($skus)) {
GoodsSku::beginTransaction(); GoodsSku::beginTransaction();
foreach ($skus as $sku) { foreach ($skus as $sku) {
...@@ -80,7 +81,7 @@ class TccService ...@@ -80,7 +81,7 @@ class TccService
], ["goods_sku_id" => $goodsSkuId]); ], ["goods_sku_id" => $goodsSkuId]);
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
...@@ -89,7 +90,7 @@ class TccService ...@@ -89,7 +90,7 @@ class TccService
GoodsSku::rollback(); GoodsSku::rollback();
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -103,7 +104,7 @@ class TccService ...@@ -103,7 +104,7 @@ class TccService
foreach ($skus as $sku) { foreach ($skus as $sku) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $sku["goods_sku_id"], "goods_sku_id" => $sku["goods_sku_id"],
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -139,7 +140,7 @@ class TccService ...@@ -139,7 +140,7 @@ class TccService
//有结果返回原来的结果，幂等 //有结果返回原来的结果，幂等
$tccInfoList = Tcc::getRecordMaster([ $tccInfoList = Tcc::getRecordMaster([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuIds, "goods_sku_id" => $goodsSkuIds,
"status" => Tcc::STATUS_CONFIRM "status" => Tcc::STATUS_CONFIRM
]); ]);
...@@ -154,15 +155,16 @@ class TccService ...@@ -154,15 +155,16 @@ class TccService
//在confirm时候必须已经有try，如果没有就直接返回fail //在confirm时候必须已经有try，如果没有就直接返回fail
$cTccInfoList = Tcc::getRecordMaster([ $cTccInfoList = Tcc::getRecordMaster([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuIds, "goods_sku_id" => $goodsSkuIds,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS
]); ]);
if (empty($cTccInfoList)) {
if (empty($cTccInfoList) || count($cTccInfoList) != count($goodsSkuIds)) {
foreach ($goodsSkuIds as $goodsSkuId) { foreach ($goodsSkuIds as $goodsSkuId) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -172,7 +174,7 @@ class TccService ...@@ -172,7 +174,7 @@ class TccService
} }
//如果已经 cancel 成功, 则失败 //如果已经 cancel 成功, 则失败
$cTccInfoList = Tcc::getRecordMaster([ $cTccInfoList = Tcc::getRecordMaster([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuIds, "goods_sku_id" => $goodsSkuIds,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS
...@@ -181,8 +183,8 @@ class TccService ...@@ -181,8 +183,8 @@ class TccService
return self::TCC_RESULT_FAIL; return self::TCC_RESULT_FAIL;
} }
$skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds $skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds]
, ["goods_sku_id", "total_amount_order", "inventory_lock", "online_status"]]); , ["goods_sku_id", "total_amount_order", "inventory_lock", "online_status"]);
if (!empty($skus)) { if (!empty($skus)) {
GoodsSku::beginTransaction(); GoodsSku::beginTransaction();
foreach ($skus as $sku) { foreach ($skus as $sku) {
...@@ -200,7 +202,7 @@ class TccService ...@@ -200,7 +202,7 @@ class TccService
], ["goods_sku_id" => $goodsSkuId]); ], ["goods_sku_id" => $goodsSkuId]);
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
...@@ -209,7 +211,7 @@ class TccService ...@@ -209,7 +211,7 @@ class TccService
GoodsSku::rollback(); GoodsSku::rollback();
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -223,7 +225,7 @@ class TccService ...@@ -223,7 +225,7 @@ class TccService
foreach ($skus as $sku) { foreach ($skus as $sku) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $sku["goods_sku_id"], "goods_sku_id" => $sku["goods_sku_id"],
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -259,7 +261,7 @@ class TccService ...@@ -259,7 +261,7 @@ class TccService
//有结果返回原来的结果，幂等 //有结果返回原来的结果，幂等
$tccInfoList = Tcc::getRecordMaster([ $tccInfoList = Tcc::getRecordMaster([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuIds, "goods_sku_id" => $goodsSkuIds,
"status" => Tcc::STATUS_CANCEL "status" => Tcc::STATUS_CANCEL
]); ]);
...@@ -274,15 +276,15 @@ class TccService ...@@ -274,15 +276,15 @@ class TccService
//在cancel时候必须已经有try，如果没有就直接返回fail //在cancel时候必须已经有try，如果没有就直接返回fail
$cTccInfoList = Tcc::getRecordMaster([ $cTccInfoList = Tcc::getRecordMaster([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuIds, "goods_sku_id" => $goodsSkuIds,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS
]); ]);
if (empty($cTccInfoList)) { if (empty($cTccInfoList) || count($cTccInfoList) != count($goodsSkuIds)) {
foreach ($goodsSkuIds as $goodsSkuId) { foreach ($goodsSkuIds as $goodsSkuId) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -292,7 +294,7 @@ class TccService ...@@ -292,7 +294,7 @@ class TccService
} }
//如果已经 confirm 成功, 则失败 //如果已经 confirm 成功, 则失败
$cTccInfoList = Tcc::getRecordMaster([ $cTccInfoList = Tcc::getRecordMaster([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuIds, "goods_sku_id" => $goodsSkuIds,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS
...@@ -301,8 +303,8 @@ class TccService ...@@ -301,8 +303,8 @@ class TccService
return self::TCC_RESULT_FAIL; return self::TCC_RESULT_FAIL;
} }
$skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds $skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds]
, ["goods_sku_id", "inventory_rest", "inventory_lock", "online_status"]]); , ["goods_sku_id", "inventory_rest", "inventory_lock", "online_status"]);
if (!empty($skus)) { if (!empty($skus)) {
GoodsSku::beginTransaction(); GoodsSku::beginTransaction();
foreach ($skus as $sku) { foreach ($skus as $sku) {
...@@ -320,7 +322,7 @@ class TccService ...@@ -320,7 +322,7 @@ class TccService
], ["goods_sku_id" => $goodsSkuId]); ], ["goods_sku_id" => $goodsSkuId]);
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
...@@ -329,7 +331,7 @@ class TccService ...@@ -329,7 +331,7 @@ class TccService
GoodsSku::rollback(); GoodsSku::rollback();
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -343,7 +345,7 @@ class TccService ...@@ -343,7 +345,7 @@ class TccService
foreach ($skus as $sku) { foreach ($skus as $sku) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $sku["goods_sku_id"], "goods_sku_id" => $sku["goods_sku_id"],
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -363,7 +365,7 @@ class TccService ...@@ -363,7 +365,7 @@ class TccService
*/ */
public static function cancelOrderTry($goodsSkuId, $tid) public static function cancelOrderTry($goodsSkuId, $tid)
{ {
$tccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_TRY]); $tccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_TRY]);
//有结果返回原来的结果，幂等 //有结果返回原来的结果，幂等
if (!empty($tccInfo)) { if (!empty($tccInfo)) {
if ($tccInfo[0]["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) { if ($tccInfo[0]["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) {
...@@ -374,10 +376,10 @@ class TccService ...@@ -374,10 +376,10 @@ class TccService
} }
//如果已经有 confirm 或者 cancel，则直接失败 //如果已经有 confirm 或者 cancel，则直接失败
$cTccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => [Tcc::STATUS_CONFIRM, Tcc::STATUS_CANCEL], "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]); $cTccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => [Tcc::STATUS_CONFIRM, Tcc::STATUS_CANCEL], "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]);
if (!empty($cTccInfo)) { if (!empty($cTccInfo)) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -394,7 +396,7 @@ class TccService ...@@ -394,7 +396,7 @@ class TccService
], ["goods_sku_id" => $goodsSkuId]); ], ["goods_sku_id" => $goodsSkuId]);
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
...@@ -404,7 +406,7 @@ class TccService ...@@ -404,7 +406,7 @@ class TccService
GoodsSku::rollback(); GoodsSku::rollback();
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -413,7 +415,7 @@ class TccService ...@@ -413,7 +415,7 @@ class TccService
} }
} else { } else {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_TRY, "status" => Tcc::STATUS_TRY,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -432,7 +434,7 @@ class TccService ...@@ -432,7 +434,7 @@ class TccService
*/ */
public static function cancelOrderConfirm($goodsSkuId, $tid) public static function cancelOrderConfirm($goodsSkuId, $tid)
{ {
$tccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CONFIRM]); $tccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CONFIRM]);
//有结果返回原来的结果，幂等 //有结果返回原来的结果，幂等
if (!empty($tccInfo)) { if (!empty($tccInfo)) {
if ($tccInfo[0]["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) { if ($tccInfo[0]["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) {
...@@ -443,10 +445,10 @@ class TccService ...@@ -443,10 +445,10 @@ class TccService
} }
//在confirm时候必须已经有try，如果没有就直接返回fail //在confirm时候必须已经有try，如果没有就直接返回fail
$tryTccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_TRY, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]); $tryTccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_TRY, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]);
if (empty($tryTccInfo)) { if (empty($tryTccInfo)) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -455,7 +457,7 @@ class TccService ...@@ -455,7 +457,7 @@ class TccService
} }
//如果已经 cancel 成功 //如果已经 cancel 成功
$cancelTccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CANCEL, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]); $cancelTccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CANCEL, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]);
if (!empty($cancelTccInfo)) { if (!empty($cancelTccInfo)) {
return self::TCC_RESULT_FAIL; return self::TCC_RESULT_FAIL;
} }
...@@ -469,7 +471,7 @@ class TccService ...@@ -469,7 +471,7 @@ class TccService
], ["goods_sku_id" => $goodsSkuId]); ], ["goods_sku_id" => $goodsSkuId]);
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
...@@ -479,7 +481,7 @@ class TccService ...@@ -479,7 +481,7 @@ class TccService
GoodsSku::rollback(); GoodsSku::rollback();
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -488,7 +490,7 @@ class TccService ...@@ -488,7 +490,7 @@ class TccService
} }
} else { } else {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CONFIRM, "status" => Tcc::STATUS_CONFIRM,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -507,7 +509,7 @@ class TccService ...@@ -507,7 +509,7 @@ class TccService
*/ */
public static function cancelOrderCancel($goodsSkuId, $tid) public static function cancelOrderCancel($goodsSkuId, $tid)
{ {
$tccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CANCEL]); $tccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CANCEL]);
//有结果返回原来的结果，幂等 //有结果返回原来的结果，幂等
if (!empty($tccInfo)) { if (!empty($tccInfo)) {
if ($tccInfo[0]["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) { if ($tccInfo[0]["operator_result"] == Tcc::OPERATOR_RESULT_FAIL) {
...@@ -518,10 +520,10 @@ class TccService ...@@ -518,10 +520,10 @@ class TccService
} }
//在cancel时候必须已经有try，如果没有就直接返回fail //在cancel时候必须已经有try，如果没有就直接返回fail
$tryTccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_TRY, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]); $tryTccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_TRY, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]);
if (empty($tryTccInfo)) { if (empty($tryTccInfo)) {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -530,7 +532,7 @@ class TccService ...@@ -530,7 +532,7 @@ class TccService
} }
//如果已经 confirm 成功 //如果已经 confirm 成功
$confirmTccInfo = Tcc::getRecordMaster(["t_id" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CONFIRM, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]); $confirmTccInfo = Tcc::getRecordMaster(["tid" => $tid, "goods_sku_id" => $goodsSkuId, "status" => Tcc::STATUS_CONFIRM, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS]);
if (!empty($confirmTccInfo)) { if (!empty($confirmTccInfo)) {
return self::TCC_RESULT_FAIL; return self::TCC_RESULT_FAIL;
} }
...@@ -544,7 +546,7 @@ class TccService ...@@ -544,7 +546,7 @@ class TccService
], ["goods_sku_id" => $goodsSkuId]); ], ["goods_sku_id" => $goodsSkuId]);
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
...@@ -554,7 +556,7 @@ class TccService ...@@ -554,7 +556,7 @@ class TccService
GoodsSku::rollback(); GoodsSku::rollback();
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -563,7 +565,7 @@ class TccService ...@@ -563,7 +565,7 @@ class TccService
} }
} else { } else {
Tcc::save([ Tcc::save([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => Tcc::STATUS_CANCEL, "status" => Tcc::STATUS_CANCEL,
"operator_result" => Tcc::OPERATOR_RESULT_FAIL, "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
...@@ -583,7 +585,7 @@ class TccService ...@@ -583,7 +585,7 @@ class TccService
public static function tccIsFinish($goodsSkuId, $tid) public static function tccIsFinish($goodsSkuId, $tid)
{ {
$tccInfo = Tcc::getRecord([ $tccInfo = Tcc::getRecord([
"t_id" => $tid, "tid" => $tid,
"goods_sku_id" => $goodsSkuId, "goods_sku_id" => $goodsSkuId,
"status" => [Tcc::STATUS_CONFIRM, Tcc::STATUS_CANCEL], "status" => [Tcc::STATUS_CONFIRM, Tcc::STATUS_CANCEL],
"operator_result" => Tcc::OPERATOR_RESULT_SUCCESS, "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS,
......
vendor/api/php_services/src/Daemon/Daemon.php
View file @ 6726b544
...@@ -32,7 +32,7 @@ class Daemon ...@@ -32,7 +32,7 @@ class Daemon
public function __construct(string $task_name, $task_class, int $worker_num = 1) public function __construct(string $task_name, $task_class, int $worker_num = 1, array $params =[])
{ {
$this->checkEnv(); $this->checkEnv();
...@@ -46,6 +46,7 @@ class Daemon ...@@ -46,6 +46,7 @@ class Daemon
} }
$this->task_name = $task_name; $this->task_name = $task_name;
$this->params = $params;
$this->task_class = $task_class; $this->task_class = $task_class;
$this->max_process_num = $worker_num; $this->max_process_num = $worker_num;
$this->env = Application::app()->environ() ?? "dev"; $this->env = Application::app()->environ() ?? "dev";
...@@ -76,11 +77,7 @@ class Daemon ...@@ -76,11 +77,7 @@ class Daemon
while(1) while(1)
{ {
//注册信号处理,master进程中捕获SIGUSR1后通知worker进程退出 //注册信号处理,master进程中捕获SIGUSR1后通知worker进程退出
if( pcntl_signal(SIGUSR1, array(__CLASS__, "signal_handler"),false) ) if( !pcntl_signal(SIGUSR1, array(__CLASS__, "signal_handler"),false) ) {
{
// DaemonLog::info($this->log_signature,'master pcntl SIGUSR1 success');
}else
{
DaemonLog::error($this->log_signature,'master pcntl SIGUSR1 failed'); DaemonLog::error($this->log_signature,'master pcntl SIGUSR1 failed');
} }
pcntl_signal_dispatch(); pcntl_signal_dispatch();
...@@ -139,7 +136,6 @@ class Daemon ...@@ -139,7 +136,6 @@ class Daemon
chdir(ROOT_PATH); chdir(ROOT_PATH);
umask(0); umask(0);
fclose(STDIN); fclose(STDIN);
fclose(STDOUT); fclose(STDOUT);
fclose(STDERR); fclose(STDERR);
...@@ -164,15 +160,12 @@ class Daemon ...@@ -164,15 +160,12 @@ class Daemon
}elseif ($pid == 0) { }elseif ($pid == 0) {
//子进程 //子进程
cli_set_process_title($this->task_name . ' ' . $this->env . ' worker process'); cli_set_process_title($this->task_name . ' ' . $this->env . ' worker process');
// DaemonLog::info($this->log_signature,"worker Process {".posix_getpid()."} was created".' master process id:'.posix_getppid()); DaemonLog::info($this->log_signature,"worker Process {".posix_getpid()."} was created".' master process id:'.posix_getppid());
//注册子进程信号 //注册子进程信号
if( pcntl_signal(SIGUSR2, array(__CLASS__, "signal_handler"),false) ) if( !pcntl_signal(SIGUSR2, array(__CLASS__, "signal_handler"),false) )
{ {
// DaemonLog::info( $this->log_signature ,"worker Process {".posix_getpid()."} pcntl SIGUSR2 success".' master process id:'.posix_getppid() ); DaemonLog::error( $this->log_signature ,"worker Process {".posix_getpid()."} pcntl SIGUSR2 failed".' master process id:'.posix_getppid() );
}else
{
// DaemonLog::error( $this->log_signature ,"worker Process {".posix_getpid()."} pcntl SIGUSR2 failed".' master process id:'.posix_getppid() );
} }
// 执行指定次数后自动退出 // 执行指定次数后自动退出
...@@ -181,7 +174,7 @@ class Daemon ...@@ -181,7 +174,7 @@ class Daemon
pcntl_signal_dispatch(); pcntl_signal_dispatch();
try { try {
$task = new $this->task_class(); $task = new $this->task_class(...$this->params);
$task->run(); $task->run();
}catch (\Exception $e){ }catch (\Exception $e){
// 默认2分钟内最多记录10条异常日志，超过100次则报警 // 默认2分钟内最多记录10条异常日志，超过100次则报警
...@@ -223,11 +216,7 @@ class Daemon ...@@ -223,11 +216,7 @@ class Daemon
$this->terminate = true; $this->terminate = true;
foreach ($this->process_list as $pid) foreach ($this->process_list as $pid)
{ {
if( posix_kill($pid, SIGUSR2) ) if( !posix_kill($pid, SIGUSR2) ) {
{
// DaemonLog::info( $this->log_signature ,'master process send SIGUSR2 to '.$pid.' success' );
}else
{
DaemonLog::error( $this->log_signature ,'master process send SIGUSR2 to '.$pid.' failed' ); DaemonLog::error( $this->log_signature ,'master process send SIGUSR2 to '.$pid.' failed' );
} }
} }
......
vendor/api/php_services/src/Sms/Sms.php 0 → 100644
View file @ 6726b544
<?php
namespace Api\PhpServices\Sms;
use Api\PhpUtils\Common\TimeOut;
use Api\PhpUtils\Http\Request;
use App\Exception\custom\CodeSpecialException;
class Sms
{
/**
* 验证短信是否正确
*
* @param $params['mobile'] 手机号
* @param $params['code'] 验证码
* @param $params['appid'] appid
*/
public function checkSmsCode($params)
{
$url = config('interface','service.user.check_sms_code');
if(!$url){
throw new CodeSpecialException("failed");
}
if (empty($params)) {
throw new CodeSpecialException("failed");
}
$params = [
'mobile' => !empty($params['mobile']) ? $params['mobile'] : '',
'appid' => !empty($params['appid']) ? $params['appid'] : '',
'code' => !empty($params['code']) ? $params['code'] : '',
'key' => 'f16bdd46292480b4b82c841d90a6ba02',
'partner' => 'merchant-b'
];
$sms = (new TimeOut())->runGet($url, $params);
if(!$sms){
throw new CodeSpecialException("timeout");
}
if (!empty($sms) && $sms['code'] == 0) {
return true;
}else{
return false;
}
}
/**
* 发送验证码
*
* @param $params['mobile'] 手机号
* @param $params['appid'] appid
* @param $params['scene'] 使用场景 例如： 登陆传login
* @param $params['template'] 模版id，发送短信模版
* @param $params['code_lenght'] 短信验证码长度 4位和6位
* @param $params['ticket_expire'] 验证码验证周期，默认86400秒（1天），最小值为60秒，少于最小值使用默认值
* @param $params['resend_times'] 验证周期内验证码最大发送次数，默认重发最多10次，最小值为1次，少于最小值使用默认值
* @param $params['retry_times']验证周期内每个验证码最大可校验次数，默认每个验证码最大可校验10次，最小值为1次，少于最小值使用默认值
*
*/
public function sendSmsCode($params = [])
{
$url = config('interface','service.user.send_sms_code');
if(!$url){
throw new CodeSpecialException("failed");
}
if (empty($params)) {
throw new CodeSpecialException("failed");
}
$params = [
'mobile' => !empty($params['mobile']) ? $params['mobile'] : '',
'appid' => !empty($params['appid']) ? $params['appid'] : 'hubble',
'scene' => !empty($params['scene']) ? $params['scene'] : '',
'key' => 'f16bdd46292480b4b82c841d90a6ba02',
'partner' => 'merchant-b',
'template' => !empty($params['template']) ? $params['template'] : 7,
'code_lenght' => !empty($params['code_lenght']) ? $params['code_lenght'] : 6,
'ticket_expire' => !empty($params['ticket_expire']) ? $params['ticket_expire'] : 86400,
'resend_times' => !empty($params['resend_times']) ? $params['resend_times'] : 5,
'retry_times' => !empty($params['retry_times']) ? $params['retry_times'] : 10,
];
$sms = (new TimeOut())->runGet($url, $params);
if(!$sms){
throw new CodeSpecialException("timeout");
}
if (!empty($sms) && $sms['code'] == 0) {
return $sms;
}else{
return $sms;
}
}
/**
* 发送短信，不需要验证，场景是，只发，例如：审核通过，发个通知短信，审核驳回，发一个通知短信
*
* @param $mobile 手机号
* @param $template 短信模版
* @param $param = [] 数组，多个参数传值
*/
public function messageSendSms($mobile,$template,$param = [])
{
$url = config('interface', 'service.message.send_sms');
if (!$url) {
throw new CodeSpecialException("failed");
}
$params = [
'mobile' => $mobile,
'key' => 'b2acfb0d53c8557c9b0a0346d2a4fab4',
'template' => $template,
'param' => $param,
];
$sms = (new TimeOut())->runGet($url, $params);
if (!$sms) {
throw new CodeSpecialException("timeout");
}
if (!empty($sms) && $sms['code'] == 0) {
return true;
} else {
return false;
}
}
}
vendor/api/php_utils/src/Mon/MonUtil.php
View file @ 6726b544
...@@ -65,7 +65,7 @@ class MonUtil{ ...@@ -65,7 +65,7 @@ class MonUtil{
$request_module = str_replace(array(".", ":", "/"),array("_", "_", "-"), $host); $request_module = str_replace(array(".", ":", "/"),array("_", "_", "-"), $host);
if (empty($module)) { if (empty($module)) {
//默认取url 中的域名作为module //默认取url 中的域名作为module
$domain = $_SERVER['SERVER_NAME'] ?? 'unknow_domain'; $domain = str_replace(array(".", ":", "/"),array("_", "_", "-"), $_SERVER['SERVER_NAME'] ?? 'unknow_domain');
$module = $domain.'.'.($request_module ?? 'other_depent'); $module = $domain.'.'.($request_module ?? 'other_depent');
} }
......
vendor/composer/InstalledVersions.php
View file @ 6726b544
...@@ -32,7 +32,7 @@ private static $installed = array ( ...@@ -32,7 +32,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '76981b468d0856b108d42431aeb21cc295e6c5e4', 'reference' => '1eace8446433e21d1d739f4b35df4703230a20f3',
'name' => 'yidian/yaf_demo', 'name' => 'yidian/yaf_demo',
), ),
'versions' => 'versions' =>
...@@ -45,7 +45,7 @@ private static $installed = array ( ...@@ -45,7 +45,7 @@ private static $installed = array (
array ( array (
0 => '9999999-dev', 0 => '9999999-dev',
), ),
'reference' => '6af1722df32913ad981251a0d1c11b77d53be716', 'reference' => 'd97dbc9073709d51ee448492163a532980e05fec',
), ),
'api/php_utils' => 'api/php_utils' =>
array ( array (
...@@ -55,7 +55,7 @@ private static $installed = array ( ...@@ -55,7 +55,7 @@ private static $installed = array (
array ( array (
0 => '9999999-dev', 0 => '9999999-dev',
), ),
'reference' => 'a6fdc2ddaf55ca6f8f86a3295b7659a70c50b2ec', 'reference' => '3d3b07c4a7c3c486b05501c0b5dd9ec532b11ae5',
), ),
'bacon/bacon-qr-code' => 'bacon/bacon-qr-code' =>
array ( array (
...@@ -308,7 +308,7 @@ private static $installed = array ( ...@@ -308,7 +308,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => 'fd89ef387030f4d4126fd9cddcc18dbfed27a346', 'reference' => '401339856144dd876034b5df480e8f4f36355d09',
), ),
'symfony/property-info' => 'symfony/property-info' =>
array ( array (
...@@ -335,7 +335,7 @@ private static $installed = array ( ...@@ -335,7 +335,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '76981b468d0856b108d42431aeb21cc295e6c5e4', 'reference' => '1eace8446433e21d1d739f4b35df4703230a20f3',
), ),
), ),
); );
......
vendor/composer/autoload_classmap.php
View file @ 6726b544
...@@ -31,6 +31,7 @@ return array( ...@@ -31,6 +31,7 @@ return array(
'Api\\PhpServices\\Session\\SessionManager' => $vendorDir . '/api/php_services/src/Session/SessionManager.php', 'Api\\PhpServices\\Session\\SessionManager' => $vendorDir . '/api/php_services/src/Session/SessionManager.php',
'Api\\PhpServices\\ShopImage\\GetImage' => $vendorDir . '/api/php_services/src/ShopImage/GetImage.php', 'Api\\PhpServices\\ShopImage\\GetImage' => $vendorDir . '/api/php_services/src/ShopImage/GetImage.php',
'Api\\PhpServices\\ShopImage\\QR' => $vendorDir . '/api/php_services/src/ShopImage/QR.php', 'Api\\PhpServices\\ShopImage\\QR' => $vendorDir . '/api/php_services/src/ShopImage/QR.php',
'Api\\PhpServices\\Sms\\Sms' => $vendorDir . '/api/php_services/src/Sms/Sms.php',
'Api\\PhpServices\\Towerpro\\Towerpro' => $vendorDir . '/api/php_services/src/Towerpro/Towerpro.php', 'Api\\PhpServices\\Towerpro\\Towerpro' => $vendorDir . '/api/php_services/src/Towerpro/Towerpro.php',
'Api\\PhpServices\\Tuffy\\TuffyService' => $vendorDir . '/api/php_services/src/Tuffy/TuffyService.php', 'Api\\PhpServices\\Tuffy\\TuffyService' => $vendorDir . '/api/php_services/src/Tuffy/TuffyService.php',
'Api\\PhpServices\\XhProfiler\\XhMongo' => $vendorDir . '/api/php_services/src/XhProfiler/XhMongo.php', 'Api\\PhpServices\\XhProfiler\\XhMongo' => $vendorDir . '/api/php_services/src/XhProfiler/XhMongo.php',
......
vendor/composer/autoload_files.php
View file @ 6726b544
...@@ -8,18 +8,18 @@ $baseDir = dirname($vendorDir); ...@@ -8,18 +8,18 @@ $baseDir = dirname($vendorDir);
return array( return array(
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php', 'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php', '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php', '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php', 'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php', 'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'a9ed0d27b5a698798a89181429f162c5' => $vendorDir . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php', 'a9ed0d27b5a698798a89181429f162c5' => $vendorDir . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
'3a37ebac017bc098e9a86b35401e7a68' => $vendorDir . '/mongodb/mongodb/src/functions.php', '3a37ebac017bc098e9a86b35401e7a68' => $vendorDir . '/mongodb/mongodb/src/functions.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
); );
vendor/composer/autoload_static.php
View file @ 6726b544
...@@ -9,20 +9,20 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2 ...@@ -9,20 +9,20 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
public static $files = array ( public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php', '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php', '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php', 'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'a9ed0d27b5a698798a89181429f162c5' => __DIR__ . '/..' . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php', 'a9ed0d27b5a698798a89181429f162c5' => __DIR__ . '/..' . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
'3a37ebac017bc098e9a86b35401e7a68' => __DIR__ . '/..' . '/mongodb/mongodb/src/functions.php', '3a37ebac017bc098e9a86b35401e7a68' => __DIR__ . '/..' . '/mongodb/mongodb/src/functions.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
'8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
); );
public static $prefixLengthsPsr4 = array ( public static $prefixLengthsPsr4 = array (
...@@ -260,6 +260,7 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2 ...@@ -260,6 +260,7 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
'Api\\PhpServices\\Session\\SessionManager' => __DIR__ . '/..' . '/api/php_services/src/Session/SessionManager.php', 'Api\\PhpServices\\Session\\SessionManager' => __DIR__ . '/..' . '/api/php_services/src/Session/SessionManager.php',
'Api\\PhpServices\\ShopImage\\GetImage' => __DIR__ . '/..' . '/api/php_services/src/ShopImage/GetImage.php', 'Api\\PhpServices\\ShopImage\\GetImage' => __DIR__ . '/..' . '/api/php_services/src/ShopImage/GetImage.php',
'Api\\PhpServices\\ShopImage\\QR' => __DIR__ . '/..' . '/api/php_services/src/ShopImage/QR.php', 'Api\\PhpServices\\ShopImage\\QR' => __DIR__ . '/..' . '/api/php_services/src/ShopImage/QR.php',
'Api\\PhpServices\\Sms\\Sms' => __DIR__ . '/..' . '/api/php_services/src/Sms/Sms.php',
'Api\\PhpServices\\Towerpro\\Towerpro' => __DIR__ . '/..' . '/api/php_services/src/Towerpro/Towerpro.php', 'Api\\PhpServices\\Towerpro\\Towerpro' => __DIR__ . '/..' . '/api/php_services/src/Towerpro/Towerpro.php',
'Api\\PhpServices\\Tuffy\\TuffyService' => __DIR__ . '/..' . '/api/php_services/src/Tuffy/TuffyService.php', 'Api\\PhpServices\\Tuffy\\TuffyService' => __DIR__ . '/..' . '/api/php_services/src/Tuffy/TuffyService.php',
'Api\\PhpServices\\XhProfiler\\XhMongo' => __DIR__ . '/..' . '/api/php_services/src/XhProfiler/XhMongo.php', 'Api\\PhpServices\\XhProfiler\\XhMongo' => __DIR__ . '/..' . '/api/php_services/src/XhProfiler/XhMongo.php',
......
vendor/composer/installed.json
View file @ 6726b544
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_services.git", "url": "https://git.yidian-inc.com:8021/bp/php_services.git",
"reference": "6af1722df32913ad981251a0d1c11b77d53be716" "reference": "d97dbc9073709d51ee448492163a532980e05fec"
}, },
"require": { "require": {
"api/php_utils": "dev-master", "api/php_utils": "dev-master",
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"perftools/php-profiler": "^0.18.0", "perftools/php-profiler": "^0.18.0",
"php": "7.2.*" "php": "7.2.*"
}, },
"time": "2021-06-29T08:49:34+00:00", "time": "2021-06-29T10:41:52+00:00",
"default-branch": true, "default-branch": true,
"type": "library", "type": "library",
"installation-source": "source", "installation-source": "source",
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git", "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "a6fdc2ddaf55ca6f8f86a3295b7659a70c50b2ec" "reference": "3d3b07c4a7c3c486b05501c0b5dd9ec532b11ae5"
}, },
"require": { "require": {
"elasticsearch/elasticsearch": "~7.0", "elasticsearch/elasticsearch": "~7.0",
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
"mongodb/mongodb": "1.4.3", "mongodb/mongodb": "1.4.3",
"php": "7.2.*" "php": "7.2.*"
}, },
"time": "2021-06-28T03:25:55+00:00", "time": "2021-07-01T07:01:29+00:00",
"default-branch": true, "default-branch": true,
"type": "library", "type": "library",
"installation-source": "source", "installation-source": "source",
...@@ -1773,12 +1773,12 @@ ...@@ -1773,12 +1773,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/property-access.git", "url": "https://github.com/symfony/property-access.git",
"reference": "fd89ef387030f4d4126fd9cddcc18dbfed27a346" "reference": "401339856144dd876034b5df480e8f4f36355d09"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/property-access/zipball/fd89ef387030f4d4126fd9cddcc18dbfed27a346", "url": "https://api.github.com/repos/symfony/property-access/zipball/401339856144dd876034b5df480e8f4f36355d09",
"reference": "fd89ef387030f4d4126fd9cddcc18dbfed27a346", "reference": "401339856144dd876034b5df480e8f4f36355d09",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1793,8 +1793,7 @@ ...@@ -1793,8 +1793,7 @@
"suggest": { "suggest": {
"psr/cache-implementation": "To cache access methods." "psr/cache-implementation": "To cache access methods."
}, },
"time": "2021-05-26T17:43:50+00:00", "time": "2021-06-30T13:58:03+00:00",
"default-branch": true,
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
......
vendor/composer/installed.php
View file @ 6726b544
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '76981b468d0856b108d42431aeb21cc295e6c5e4', 'reference' => '1eace8446433e21d1d739f4b35df4703230a20f3',
'name' => 'yidian/yaf_demo', 'name' => 'yidian/yaf_demo',
), ),
'versions' => 'versions' =>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
array ( array (
0 => '9999999-dev', 0 => '9999999-dev',
), ),
'reference' => '6af1722df32913ad981251a0d1c11b77d53be716', 'reference' => 'd97dbc9073709d51ee448492163a532980e05fec',
), ),
'api/php_utils' => 'api/php_utils' =>
array ( array (
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
array ( array (
0 => '9999999-dev', 0 => '9999999-dev',
), ),
'reference' => 'a6fdc2ddaf55ca6f8f86a3295b7659a70c50b2ec', 'reference' => '3d3b07c4a7c3c486b05501c0b5dd9ec532b11ae5',
), ),
'bacon/bacon-qr-code' => 'bacon/bacon-qr-code' =>
array ( array (
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => 'fd89ef387030f4d4126fd9cddcc18dbfed27a346', 'reference' => '401339856144dd876034b5df480e8f4f36355d09',
), ),
'symfony/property-info' => 'symfony/property-info' =>
array ( array (
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '76981b468d0856b108d42431aeb21cc295e6c5e4', 'reference' => '1eace8446433e21d1d739f4b35df4703230a20f3',
), ),
), ),
); );
vendor/symfony/property-access/PropertyAccessor.php
View file @ 6726b544
...@@ -94,7 +94,7 @@ class PropertyAccessor implements PropertyAccessorInterface ...@@ -94,7 +94,7 @@ class PropertyAccessor implements PropertyAccessorInterface
* @param PropertyReadInfoExtractorInterface $readInfoExtractor * @param PropertyReadInfoExtractorInterface $readInfoExtractor
* @param PropertyWriteInfoExtractorInterface $writeInfoExtractor * @param PropertyWriteInfoExtractorInterface $writeInfoExtractor
*/ */
public function __construct(/*int */$magicMethods = self::MAGIC_GET | self::MAGIC_SET, /*int */$throw = self::THROW_ON_INVALID_PROPERTY_PATH, CacheItemPoolInterface $cacheItemPool = null, /*PropertyReadInfoExtractorInterface */$readInfoExtractor = null, /*PropertyWriteInfoExtractorInterface */$writeInfoExtractor = null) public function __construct($magicMethods = self::MAGIC_GET | self::MAGIC_SET, $throw = self::THROW_ON_INVALID_PROPERTY_PATH, CacheItemPoolInterface $cacheItemPool = null, $readInfoExtractor = null, $writeInfoExtractor = null)
{ {
if (\is_bool($magicMethods)) { if (\is_bool($magicMethods)) {
trigger_deprecation('symfony/property-access', '5.2', 'Passing a boolean as the first argument to "%s()" is deprecated. Pass a combination of bitwise flags instead (i.e an integer).', __METHOD__); trigger_deprecation('symfony/property-access', '5.2', 'Passing a boolean as the first argument to "%s()" is deprecated. Pass a combination of bitwise flags instead (i.e an integer).', __METHOD__);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment