From 089a3b893b82dc8559e7297e22e8f6d54b7621b6 Mon Sep 17 00:00:00 2001 From: bigrocs Date: Fri, 16 Mar 2018 16:49:21 +0800 Subject: [PATCH 1/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cb059d3..e5e3d26 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.3.1-dev" + "dev-master": "2.3.1-dev" } }, "config": { From c9756ece28549cb6e521430d0bb15c1592db7af7 Mon Sep 17 00:00:00 2001 From: bigrocs Date: Fri, 16 Mar 2018 16:50:16 +0800 Subject: [PATCH 2/7] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e5e3d26..bee6867 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ } ], "require": { - "corecmf/admin": "^1.3", - "corecmf/socialite": "^1.3", + "corecmf/admin": "^2.3", + "corecmf/socialite": "^2.3", "php-http/guzzle6-adapter": "^1.1", "laravel-omnipay/laravel-omnipay": "^3.0", "laravel-omnipay/omnipay-unionpay": "^3.0", From 7c7baa14278789d58aea946d95bcbfe0c6d135e6 Mon Sep 17 00:00:00 2001 From: bigrocs Date: Fri, 16 Mar 2018 18:08:42 +0800 Subject: [PATCH 3/7] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index bee6867..3afddd9 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,10 @@ "corecmf/admin": "^2.3", "corecmf/socialite": "^2.3", "php-http/guzzle6-adapter": "^1.1", - "laravel-omnipay/laravel-omnipay": "^3.0", - "laravel-omnipay/omnipay-unionpay": "^3.0", - "laravel-omnipay/omnipay-wechatpay": "^3.0", - "laravel-omnipay/omnipay-alipay": "^3.0" + "laravel-omnipay/laravel-omnipay": "^3.1", + "laravel-omnipay/omnipay-unionpay": "^3.1", + "laravel-omnipay/omnipay-wechatpay": "^3.1", + "laravel-omnipay/omnipay-alipay": "^3.1" }, "require-dev": { "phpunit/phpunit" : "~4.0||~5.0||~6.0", From 34016e810e05ade1cb7b45c9b65456074e0e647f Mon Sep 17 00:00:00 2001 From: bigrocs Date: Sun, 18 Mar 2018 17:02:34 +0800 Subject: [PATCH 4/7] add CoreCMF packeges config --- composer.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/composer.json b/composer.json index 3afddd9..ee3f788 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,20 @@ "extra": { "branch-alias": { "dev-master": "2.3.1-dev" + }, + "corecmf": { + "name": "Omnipay", + "title": "支付管理", + "description": "第三方支付管理包括阿里云支付宝支付、微信支付、银联支付", + "author": "BigRocs", + "version": "2.3.1", + "providers": [ + "CoreCMF\\Omnipay\\OmnipayServiceProvider", + "Ignited\\LaravelOmnipay\\LaravelOmnipayServiceProvider", + "CoreCMF\\Omnipay\\Providers\\EventServiceProvider", + ], + "install": "corecmf:omnipay:install", + "uninstall": "corecmf:omnipay:uninstall" } }, "config": { From b4b34af13871de295ca25d5ac3a667de3a7d6057 Mon Sep 17 00:00:00 2001 From: bigrocs Date: Sun, 18 Mar 2018 17:13:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ee3f788..642285c 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "providers": [ "CoreCMF\\Omnipay\\OmnipayServiceProvider", "Ignited\\LaravelOmnipay\\LaravelOmnipayServiceProvider", - "CoreCMF\\Omnipay\\Providers\\EventServiceProvider", + "CoreCMF\\Omnipay\\Providers\\EventServiceProvider" ], "install": "corecmf:omnipay:install", "uninstall": "corecmf:omnipay:uninstall" From c977393e4d32a56de5bad8aef0cc937b2a180436 Mon Sep 17 00:00:00 2001 From: bigrocs Date: Sun, 18 Mar 2018 17:38:07 +0800 Subject: [PATCH 6/7] Omnipay --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 642285c..51cc521 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "version": "2.3.1", "providers": [ "CoreCMF\\Omnipay\\OmnipayServiceProvider", - "Ignited\\LaravelOmnipay\\LaravelOmnipayServiceProvider", + "Omnipay\\LaravelOmnipay\\LaravelOmnipayServiceProvider", "CoreCMF\\Omnipay\\Providers\\EventServiceProvider" ], "install": "corecmf:omnipay:install", From 954a78f180976b3c6b5357baa2ff6aed8e421af1 Mon Sep 17 00:00:00 2001 From: bigrocs Date: Sun, 18 Mar 2018 18:02:32 +0800 Subject: [PATCH 7/7] delete providers --- composer.json | 1 - src/Config/config.php | 4 ---- src/OmnipayServiceProvider.php | 12 ------------ 3 files changed, 17 deletions(-) diff --git a/composer.json b/composer.json index 51cc521..e9b06f3 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,6 @@ "version": "2.3.1", "providers": [ "CoreCMF\\Omnipay\\OmnipayServiceProvider", - "Omnipay\\LaravelOmnipay\\LaravelOmnipayServiceProvider", "CoreCMF\\Omnipay\\Providers\\EventServiceProvider" ], "install": "corecmf:omnipay:install", diff --git a/src/Config/config.php b/src/Config/config.php index 37604a4..910fe71 100644 --- a/src/Config/config.php +++ b/src/Config/config.php @@ -9,9 +9,5 @@ 'serviceProvider' => CoreCMF\Omnipay\OmnipayServiceProvider::class, 'install' => 'corecmf:omnipay:install',//安装artisan命令 'uninstall' => 'corecmf:omnipay:uninstall',//卸载artisan命令 - 'providers' => [ - Ignited\LaravelOmnipay\LaravelOmnipayServiceProvider::class, - CoreCMF\Omnipay\Providers\EventServiceProvider::class,//事件服务 - ], 'debug' => true, ]; diff --git a/src/OmnipayServiceProvider.php b/src/OmnipayServiceProvider.php index 724529a..041adb0 100644 --- a/src/OmnipayServiceProvider.php +++ b/src/OmnipayServiceProvider.php @@ -57,18 +57,6 @@ public function initService() $config = new Config(); $config->configRegister();//注册配置信息 $this->browserConfig(); - //注册providers服务 - $this->registerProviders(); - } - /** - * 注册引用服务 - */ - public function registerProviders() - { - $providers = config('omnipay.providers'); - foreach ($providers as $provider) { - $this->app->register($provider); - } } //注册webOmnipay中间件 public function middleware()