重新规划目录复合1.3规范

Author: bigrocs

src/Http/Console/InstallCommand.php renamed to src/App/Console/InstallCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Omnipay\Http\Console;
+namespace CoreCMF\Omnipay\App\Console;
 
 use Illuminate\Console\Command;
 

src/Http/Console/UninstallCommand.php renamed to src/App/Console/UninstallCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Omnipay\Http\Console;
+namespace CoreCMF\Omnipay\App\Console;
 
 use Illuminate\Console\Command;
 

src/Http/Controllers/OmnipayController.php renamed to src/App/Http/Controllers/OmnipayController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Omnipay\Http\Controllers;
+namespace CoreCMF\Omnipay\App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

src/Http/Validator/ConfigRules.php renamed to src/App/Http/Validator/ConfigRules.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Omnipay\Http\Validator;
+namespace CoreCMF\Omnipay\App\Validator;
 
 use CoreCMF\Core\Support\Validator\Rules as coreRules;
 class ConfigRules extends coreRules

src/App/Listeners/OmnipayEventSubscriber.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace CoreCMF\Omnipay\App\Listeners;
+
+/**
+ * [OmnipayEventSubscriber 支付扩展包订阅器]
+ */
+class OmnipayEventSubscriber
+{
+
+    /**
+     * [onAdminMain 后台前端路由注册 侧栏菜单注册]
+     * @param  [type] $event [description]
+     * @return [type]        [description]
+     */
+    public function onAdminMain($event)
+    {
+        $main = $event->main;
+        switch ($main->event) {
+          case 'adminMain':
+            //后台前端路由注册
+            $main->routes->transform(function ($item, $key) use($main) {
+                if ($item->get('name') == 'admin') {
+                    foreach (config('omnipay-route.admin') as $key => $route) {
+                        $item->get('children')->push($route);
+                    }
+                }
+                return $item;
+            });
+            break;
+          case 'adminTop':
+            //后台顶部导航
+            break;
+          case 'adminSidebar':
+            //后台侧栏导航
+            $main->addMenus(config('omnipay-menu.sidebar'));//增加侧栏
+            break;
+        }
+    }
+    /**
+     * 为订阅者注册监听器.
+     *
+     * @param  Illuminate\Events\Dispatcher  $events
+     */
+    public function subscribe($events)
+    {
+        $events->listen(
+            'CoreCMF\Core\Support\Events\BuilderMain',
+            'CoreCMF\Omnipay\App\Listeners\OmnipayEventSubscriber@onAdminMain'
+        );
+    }
+
+}

src/Http/Models/Config.php renamed to src/App/Models/Config.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Omnipay\Http\Models;
+namespace CoreCMF\Omnipay\App\Models;
 
 use Schema;
 use Illuminate\Database\Eloquent\Model;

src/Config/menu.php

@@ -0,0 +1,24 @@
+<?php
+
+return [
+    //系统配置
+    'sidebar' => [
+        [
+            'path' => '',
+            'title' => '支付管理',
+            'icon' => 'fa fa-unlock-alt',
+            'subMenus' => [
+              [
+                'path' => '/admin/omnipay/config',
+                'title' => '支付管理',
+                'icon' => 'fa fa-unlock-alt',
+              ],
+              [
+                'path' => '/admin/omnipay/order',
+                'title' => '订单管理',
+                'icon' => 'fa fa-unlock-alt',
+              ],
+            ]
+        ]
+    ],
+];

src/Config/route.php

@@ -0,0 +1,19 @@
+<?php
+
+return [
+    //后台侧栏前端路由注册
+    'admin' => [
+        [
+          "path" => "/admin/omnipay/config",
+          "name" => "admin.omnipay.config",
+          "meta" => ["apiUrl" => route('api.admin.omnipay.config')],
+          "component" => ["template" => "<bve-index/>"]
+        ],
+        [
+          "path" => "/admin/omnipay/order",
+          "name" => "admin.omnipay.order",
+          "meta" => ["apiUrl" => route('api.admin.omnipay.order')],
+          "component" => ["template" => "<bve-index/>"]
+        ],
+    ],
+];

src/Http/Listeners/OmnipayEventSubscriber.php

@@ -9,8 +9,8 @@
 class OmnipayServiceProvider extends ServiceProvider
 {
     protected $commands = [
-        \CoreCMF\Omnipay\Http\Console\InstallCommand::class,
-        \CoreCMF\Omnipay\Http\Console\UninstallCommand::class,
+        \CoreCMF\Omnipay\App\Console\InstallCommand::class,
+        \CoreCMF\Omnipay\App\Console\UninstallCommand::class,
     ];
     /**
      * Perform post-registration booting of services.
@@ -21,12 +21,8 @@ public function boot()
     {
         //加载artisan commands
         $this->commands($this->commands);
-        //配置路由
-        $this->loadRoutesFrom(__DIR__.'/Routes/web.php');
         //迁移文件配置
         $this->loadMigrationsFrom(__DIR__.'/Databases/migrations');
-        // 加载配置
-        $this->mergeConfigFrom(__DIR__.'/Config/laravel-omnipay.php', 'laravel-omnipay');
     }
 
     /**
@@ -43,8 +39,14 @@ public function register()
      */
     public function initService()
     {
-
-        $this->mergeConfigFrom(__DIR__.'/Config/config.php', 'omnipay');
+        //配置路由
+        $this->loadRoutesFrom(__DIR__.'/Routes/web.php');
+        $this->loadRoutesFrom(__DIR__.'/Routes/api.php');
+        // 加载配置
+        $this->mergeConfigFrom(__DIR__.'/Config/config.php', 'omnipay');//组件配置信息
+        $this->mergeConfigFrom(__DIR__.'/Config/menu.php', 'omnipay-menu');//菜单
+        $this->mergeConfigFrom(__DIR__.'/Config/route.php', 'omnipay-route');//前端路由
+        $this->mergeConfigFrom(__DIR__.'/Config/laravel-omnipay.php', 'laravel-omnipay');
         //注册providers服务
         $this->registerProviders();
     }