diff --git a/app/Admin/Controllers/PetroController.php b/app/Admin/Controllers/PetroController.php index f552ee7..b8eb8f2 100644 --- a/app/Admin/Controllers/PetroController.php +++ b/app/Admin/Controllers/PetroController.php @@ -16,14 +16,18 @@ class PetroController { try { - $res = PetroYsd::Invalid() - ->setParams([ - 'requestId' => Str::random(32), - 'couponId' => '2830025247791780434', - 'couponType' => 0, - ])->start(); +// dd( +// base64_decode('6buR6b6Z5rGfNuWFg+ayueWTgea1i+ivleWIuA==') +// ); - dd($res); +// $res = PetroYsd::Invalid() +// ->setParams([ +// 'requestId' => Str::random(32), +// 'couponId' => '2830025247791780434', +// 'couponType' => 0, +// ])->start(); +// +// dd($res); // $res = PetroYsd::Query() // ->setParams([ @@ -40,12 +44,12 @@ class PetroController // ])->start(); // // dd($res); - $res = PetroYsd::Grant()->setParams([ 'requestId' => Str::random(32), 'productNo' => 'hljlt_hlj6yypcs', 'mobile' => '15663876870', 'num' => 1, + 'notifyUrl' => route('petro_new.grant_notice'), 'thirdOrderId' => Str::random(32), ])->start(); diff --git a/composer.json b/composer.json index bb5d034..501ebfe 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "predis/predis": "^1.1", "xuanchen/coupon": "^1.0", "xuanchen/petro": "^1.0", - "xuanchen/petro-ysd": "dev-main", + "xuanchen/petro-ysd": "^1.0", "xuanchen/unionpay": "^3.0.0" }, "require-dev": { @@ -28,7 +28,8 @@ "laravel/sail": "^1.0.1", "mockery/mockery": "^1.4.2", "nunomaduro/collision": "^5.0", - "phpunit/phpunit": "^9.3.3" + "phpunit/phpunit": "^9.3.3", + "wulfheart/pretty_routes": "^0.3.0" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index 1b22eb5..ac7ec86 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1fde4d1d7b4ed4a586277a4f6a0f0d95", + "content-hash": "4afa3c4ba7aca22c3ee390667768e41a", "packages": [ { "name": "asm89/stack-cors", @@ -7332,23 +7332,17 @@ }, { "name": "xuanchen/petro-ysd", - "version": "dev-main", + "version": "1.0", "source": { "type": "git", "url": "https://github.com/xuanchen120/petroYsd.git", - "reference": "ac79759dc5b1e03a9d4d1fe09c2ea184aa3e3d7c" + "reference": "f1c4186e93aa2d1138499f0842c97cc02a58445a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/xuanchen120/petroYsd/zipball/ac79759dc5b1e03a9d4d1fe09c2ea184aa3e3d7c", - "reference": "ac79759dc5b1e03a9d4d1fe09c2ea184aa3e3d7c", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://api.github.com/repos/xuanchen120/petroYsd/zipball/f1c4186e93aa2d1138499f0842c97cc02a58445a", + "reference": "f1c4186e93aa2d1138499f0842c97cc02a58445a", + "shasum": "" }, "require": { "guzzlehttp/guzzle": "^7.0.0", @@ -7357,7 +7351,6 @@ "php": ">=7.1.3", "pimple/pimple": "^3.0" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -7387,9 +7380,9 @@ "description": "优惠券", "support": { "issues": "https://github.com/xuanchen120/petroYsd/issues", - "source": "https://github.com/xuanchen120/petroYsd/tree/main" + "source": "https://github.com/xuanchen120/petroYsd/tree/1.0" }, - "time": "2022-05-20T07:16:51+00:00" + "time": "2022-05-25T07:57:56+00:00" }, { "name": "xuanchen/unionpay", @@ -10136,6 +10129,65 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "spatie/laravel-package-tools", + "version": "1.11.3", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-package-tools.git", + "reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/baeb3df0ebb3a541394fdaf8cbe6115bf4034a59", + "reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^7.0|^8.0|^9.0", + "php": "^7.4|^8.0" + }, + "require-dev": { + "mockery/mockery": "^1.4", + "orchestra/testbench": "^5.0|^6.23|^7.0", + "phpunit/phpunit": "^9.4", + "spatie/test-time": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\LaravelPackageTools\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "role": "Developer" + } + ], + "description": "Tools for creating Laravel packages", + "homepage": "https://github.com/spatie/laravel-package-tools", + "keywords": [ + "laravel-package-tools", + "spatie" + ], + "support": { + "issues": "https://github.com/spatie/laravel-package-tools/issues", + "source": "https://github.com/spatie/laravel-package-tools/tree/1.11.3" + }, + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-03-15T20:01:36+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", @@ -10191,18 +10243,85 @@ } ], "time": "2021-07-28T10:34:58+00:00" + }, + { + "name": "wulfheart/pretty_routes", + "version": "0.3.0", + "source": { + "type": "git", + "url": "https://github.com/Wulfheart/pretty-routes.git", + "reference": "e257fac400db2c696ddaec197e634b1fc7c40d22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Wulfheart/pretty-routes/zipball/e257fac400db2c696ddaec197e634b1fc7c40d22", + "reference": "e257fac400db2c696ddaec197e634b1fc7c40d22", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^8.0", + "php": "^7.4|^8.0", + "spatie/laravel-package-tools": "^1.4.3" + }, + "require-dev": { + "brianium/paratest": "^6.2", + "nunomaduro/collision": "^5.3", + "orchestra/testbench": "^6.15", + "phpunit/phpunit": "^9.3", + "spatie/laravel-ray": "^1.9", + "spatie/phpunit-snapshot-assertions": "^4.2", + "vimeo/psalm": "^4.4" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Wulfheart\\PrettyRoutes\\PrettyRoutesServiceProvider" + ], + "aliases": { + "PrettyRoutes": "Wulfheart\\PrettyRoutes\\PrettyRoutesFacade" + } + } + }, + "autoload": { + "psr-4": { + "Wulfheart\\PrettyRoutes\\": "src", + "Wulfheart\\PrettyRoutes\\Database\\Factories\\": "database/factories" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexander Wulf", + "email": "dev@alexfwulf.de", + "role": "Developer" + } + ], + "description": "Display your Laravel routes in the console, but make it pretty. 😎", + "homepage": "https://github.com/wulfheart/pretty_routes", + "keywords": [ + "laravel", + "pretty_routes", + "wulfheart" + ], + "support": { + "issues": "https://github.com/Wulfheart/pretty-routes/issues", + "source": "https://github.com/Wulfheart/pretty-routes/tree/0.3.0" + }, + "time": "2021-05-03T09:19:08+00:00" } ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "xuanchen/petro-ysd": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^7.3|^8.0" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.2.0" }