From 6d9f0ccac7e957da0a84ccdec06f4f2951aff3ce Mon Sep 17 00:00:00 2001
From: bigrocs <bigrocs@qq.com>
Date: Wed, 20 Sep 2017 10:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=831.3=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/{Http => App}/Console/InstallCommand.php            | 2 +-
 src/{Http => App}/Console/UninstallCommand.php          | 2 +-
 src/{ => App}/Http/Controllers/Api/ConfigController.php | 6 +++---
 src/{ => App}/Http/Validator/ConfigRules.php            | 2 +-
 src/{Http => App}/Listeners/StorageEventSubscriber.php  | 6 +++---
 src/{Http => App}/Models/Config.php                     | 2 +-
 src/Providers/EventServiceProvider.php                  | 2 +-
 src/Routes/api.php                                      | 2 +-
 src/StorageServiceProvider.php                          | 6 +++---
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename src/{Http => App}/Console/InstallCommand.php (95%)
 rename src/{Http => App}/Console/UninstallCommand.php (95%)
 rename src/{ => App}/Http/Controllers/Api/ConfigController.php (98%)
 rename src/{ => App}/Http/Validator/ConfigRules.php (94%)
 rename src/{Http => App}/Listeners/StorageEventSubscriber.php (87%)
 rename src/{Http => App}/Models/Config.php (99%)

diff --git a/src/Http/Console/InstallCommand.php b/src/App/Console/InstallCommand.php
similarity index 95%
rename from src/Http/Console/InstallCommand.php
rename to src/App/Console/InstallCommand.php
index 8265088..05df44d 100644
--- a/src/Http/Console/InstallCommand.php
+++ b/src/App/Console/InstallCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Storage\Http\Console;
+namespace CoreCMF\Storage\App\Console;
 
 use Illuminate\Console\Command;
 
diff --git a/src/Http/Console/UninstallCommand.php b/src/App/Console/UninstallCommand.php
similarity index 95%
rename from src/Http/Console/UninstallCommand.php
rename to src/App/Console/UninstallCommand.php
index c48a0dd..5f69ecd 100644
--- a/src/Http/Console/UninstallCommand.php
+++ b/src/App/Console/UninstallCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Storage\Http\Console;
+namespace CoreCMF\Storage\App\Console;
 
 use Illuminate\Console\Command;
 
diff --git a/src/Http/Controllers/Api/ConfigController.php b/src/App/Http/Controllers/Api/ConfigController.php
similarity index 98%
rename from src/Http/Controllers/Api/ConfigController.php
rename to src/App/Http/Controllers/Api/ConfigController.php
index f59c2b2..6276c3c 100644
--- a/src/Http/Controllers/Api/ConfigController.php
+++ b/src/App/Http/Controllers/Api/ConfigController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace CoreCMF\Storage\Http\Controllers\Api;
+namespace CoreCMF\Storage\App\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
 use Illuminate\Container\Container;
 
 use App\Http\Controllers\Controller;
 use CoreCMF\Admin\App\Models\Config as adminConfig;
-use CoreCMF\Storage\Http\Models\Config;
-use CoreCMF\Storage\Http\Validator\ConfigRules;
+use CoreCMF\Storage\App\Models\Config;
+use CoreCMF\Storage\App\Http\Validator\ConfigRules;
 
 class ConfigController extends Controller
 {
diff --git a/src/Http/Validator/ConfigRules.php b/src/App/Http/Validator/ConfigRules.php
similarity index 94%
rename from src/Http/Validator/ConfigRules.php
rename to src/App/Http/Validator/ConfigRules.php
index e3c0578..4c82b4f 100644
--- a/src/Http/Validator/ConfigRules.php
+++ b/src/App/Http/Validator/ConfigRules.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Storage\Http\Validator;
+namespace CoreCMF\Storage\App\Http\Validator;
 
 use CoreCMF\Core\Support\Validator\Rules as coreRules;
 class ConfigRules extends coreRules
diff --git a/src/Http/Listeners/StorageEventSubscriber.php b/src/App/Listeners/StorageEventSubscriber.php
similarity index 87%
rename from src/Http/Listeners/StorageEventSubscriber.php
rename to src/App/Listeners/StorageEventSubscriber.php
index 289bbe2..99b8ece 100644
--- a/src/Http/Listeners/StorageEventSubscriber.php
+++ b/src/App/Listeners/StorageEventSubscriber.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CoreCMF\Storage\Http\Listeners;
+namespace CoreCMF\Storage\App\Listeners;
 
-use CoreCMF\Storage\Http\Models\Config;
+use CoreCMF\Storage\App\Models\Config;
 /**
  * [SocialiteEventSubscriber 社会登录事件订阅者]
  */
@@ -41,7 +41,7 @@ public function subscribe($events)
     {
         $events->listen(
             'CoreCMF\Core\Support\Events\BuilderTable',
-            'CoreCMF\Storage\Http\Listeners\StorageEventSubscriber@onBuilderTablePackage'
+            'CoreCMF\Storage\App\Listeners\StorageEventSubscriber@onBuilderTablePackage'
         );
     }
 
diff --git a/src/Http/Models/Config.php b/src/App/Models/Config.php
similarity index 99%
rename from src/Http/Models/Config.php
rename to src/App/Models/Config.php
index 14733e8..cc65128 100644
--- a/src/Http/Models/Config.php
+++ b/src/App/Models/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CoreCMF\Storage\Http\Models;
+namespace CoreCMF\Storage\App\Models;
 
 use Schema;
 use Illuminate\Database\Eloquent\Model;
diff --git a/src/Providers/EventServiceProvider.php b/src/Providers/EventServiceProvider.php
index 618f35e..e52722b 100644
--- a/src/Providers/EventServiceProvider.php
+++ b/src/Providers/EventServiceProvider.php
@@ -32,6 +32,6 @@ public function boot()
      * @var [type]
      */
     protected $subscribe = [
-         'CoreCMF\Storage\Http\Listeners\StorageEventSubscriber',
+         'CoreCMF\Storage\App\Listeners\StorageEventSubscriber',
     ];
 }
diff --git a/src/Routes/api.php b/src/Routes/api.php
index 8fd168a..fd6d12b 100644
--- a/src/Routes/api.php
+++ b/src/Routes/api.php
@@ -10,7 +10,7 @@
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
-Route::group(['prefix' => 'api', 'middleware' => 'api', 'namespace' => 'CoreCMF\Storage\Http\Controllers\Api', 'as' => 'api.'], function () {
+Route::group(['prefix' => 'api', 'middleware' => 'api', 'namespace' => 'CoreCMF\Storage\App\Http\Controllers\Api', 'as' => 'api.'], function () {
     /*
     |--------------------------------------------------------------------------
     | 需要用户认证路由模块
diff --git a/src/StorageServiceProvider.php b/src/StorageServiceProvider.php
index 47ab61d..0ae8589 100644
--- a/src/StorageServiceProvider.php
+++ b/src/StorageServiceProvider.php
@@ -3,13 +3,13 @@
 namespace CoreCMF\Storage;
 
 use Illuminate\Support\ServiceProvider;
-use CoreCMF\Storage\Http\Models\Config;
+use CoreCMF\Storage\App\Models\Config;
 
 class StorageServiceProvider extends ServiceProvider
 {
     protected $commands = [
-        \CoreCMF\Storage\Http\Console\InstallCommand::class,
-        \CoreCMF\Storage\Http\Console\UninstallCommand::class,
+        \CoreCMF\Storage\App\Console\InstallCommand::class,
+        \CoreCMF\Storage\App\Console\UninstallCommand::class,
     ];
     /**
      * Perform post-registration booting of services.