调整文件目录结构

Qsnh · Jun 28, 2023 · 6fc9f5d · 6fc9f5d
1 parent d0dc014
commit 6fc9f5d
Show file tree

Hide file tree

Showing 31 changed files with 58 additions and 31 deletions.
diff --git a/app/Console/Commands/AddonsProviderMapGenrator.php b/app/Console/Commands/AddonsProviderMapGenrator.php
@@ -8,7 +8,7 @@
 
 namespace App\Console\Commands;
 
-use App\Meedu\Addons;
+use App\Meedu\Core\Addons;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 

diff --git a/app/Console/Commands/MeEduUpgradeCommand.php b/app/Console/Commands/MeEduUpgradeCommand.php
@@ -9,7 +9,7 @@
 namespace App\Console\Commands;
 
 use App\Meedu\MeEdu;
-use App\Meedu\Upgrade;
+use App\Meedu\Core\Upgrade;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 use Symfony\Component\Console\Command\Command as CommandAlias;

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -26,7 +26,7 @@ class Kernel extends ConsoleKernel
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \Illuminate\Foundation\Bootstrap\SetRequestForConsole::class,
         \Illuminate\Foundation\Bootstrap\RegisterProviders::class,
-        \App\Meedu\AddonsProvider::class,
+        \App\Meedu\Core\AddonsProvider::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
 

diff --git a/app/Hooks/MpWechat/ScanEvtSubHook.php b/app/Hooks/MpWechat/ScanEvtSubHook.php
@@ -9,8 +9,8 @@
 namespace App\Hooks\MpWechat;
 
 use App\Bus\AuthBus;
-use App\Meedu\Wechat;
 use App\Bus\WechatScanBus;
+use App\Meedu\Utils\Wechat;
 use App\Meedu\Hooks\HookParams;
 use App\Constant\FrontendConstant;
 use App\Exceptions\ServiceException;

diff --git a/app/Hooks/MpWechat/SubscribeHook.php b/app/Hooks/MpWechat/SubscribeHook.php
@@ -9,9 +9,9 @@
 namespace App\Hooks\MpWechat;
 
 use App\Bus\AuthBus;
-use App\Meedu\Wechat;
 use App\Bus\WechatBindBus;
 use App\Bus\WechatScanBus;
+use App\Meedu\Utils\Wechat;
 use App\Constant\CacheConstant;
 use App\Meedu\Hooks\HookParams;
 use App\Exceptions\ServiceException;

diff --git a/app/Http/Controllers/Api/V2/LoginController.php b/app/Http/Controllers/Api/V2/LoginController.php
@@ -9,7 +9,7 @@
 namespace App\Http\Controllers\Api\V2;
 
 use App\Bus\AuthBus;
-use App\Meedu\Wechat;
+use App\Meedu\Utils\Wechat;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Constant\CacheConstant;

diff --git a/app/Http/Controllers/Api/V2/MemberController.php b/app/Http/Controllers/Api/V2/MemberController.php
@@ -8,9 +8,9 @@
 
 namespace App\Http\Controllers\Api\V2;
 
-use App\Meedu\Verify;
-use App\Meedu\Wechat;
 use App\Bus\WechatBindBus;
+use App\Meedu\Utils\Verify;
+use App\Meedu\Utils\Wechat;
 use Illuminate\Http\Request;
 use App\Constant\ApiV2Constant;
 use App\Businesses\BusinessState;

diff --git a/app/Http/Controllers/Api/V2/OtherController.php b/app/Http/Controllers/Api/V2/OtherController.php
@@ -8,7 +8,7 @@
 
 namespace App\Http\Controllers\Api\V2;
 
-use App\Meedu\Addons;
+use App\Meedu\Core\Addons;
 use App\Services\Base\Services\ConfigService;
 use App\Services\Base\Interfaces\ConfigServiceInterface;
 

diff --git a/app/Http/Controllers/Api/V3/LoginController.php b/app/Http/Controllers/Api/V3/LoginController.php
@@ -9,8 +9,8 @@
 namespace App\Http\Controllers\Api\V3;
 
 use App\Bus\AuthBus;
-use App\Meedu\Wechat;
 use App\Bus\WechatScanBus;
+use App\Meedu\Utils\Wechat;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Constant\CacheConstant;

diff --git a/app/Http/Controllers/Api/V3/OrderController.php b/app/Http/Controllers/Api/V3/OrderController.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Qsnh/meedu.
+ *
+ * (c) 杭州白书科技有限公司
+ */
+
+namespace App\Http\Controllers\Api\V3;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Api\V2\BaseController;
+
+class OrderController extends BaseController
+{
+    public function create(Request $request)
+    {
+        $type = $request->input('type');
+        $id = (int)$request->input('id');
+        if (!$type || !$id) {
+            return $this->error(__('参数错误'));
+        }
+        return $this->data();
+    }
+}
diff --git a/app/Http/Controllers/Api/V3/SystemController.php b/app/Http/Controllers/Api/V3/SystemController.php
@@ -8,7 +8,7 @@
 
 namespace App\Http\Controllers\Api\V3;
 
-use App\Meedu\Addons;
+use App\Meedu\Core\Addons;
 use App\Meedu\Cache\NavCache;
 use App\Meedu\Cache\LinkCache;
 use App\Meedu\Cache\ViewBlockH5IndexPageCache;

diff --git a/app/Http/Controllers/Api/Wechat/MpWechatController.php b/app/Http/Controllers/Api/Wechat/MpWechatController.php
@@ -8,7 +8,7 @@
 
 namespace App\Http\Controllers\Api\Wechat;
 
-use App\Meedu\Wechat;
+use App\Meedu\Utils\Wechat;
 use App\Meedu\Hooks\HookRun;
 use App\Meedu\Hooks\HookParams;
 use App\Meedu\Hooks\Constant\PositionConstant;

diff --git a/app/Http/Controllers/Backend/Api/V1/AddonsController.php b/app/Http/Controllers/Backend/Api/V1/AddonsController.php
@@ -9,10 +9,10 @@
 namespace App\Http\Controllers\Backend\Api\V1;
 
 use PhpZip\ZipFile;
-use App\Meedu\Addons;
 use GuzzleHttp\Client;
-use App\Meedu\MeEduCloud;
+use App\Meedu\Core\Addons;
 use Illuminate\Http\Request;
+use App\Meedu\Core\MeEduCloud;
 use App\Models\AdministratorLog;
 
 class AddonsController extends BaseController

diff --git a/app/Http/Controllers/Backend/Api/V1/MpWechatController.php b/app/Http/Controllers/Backend/Api/V1/MpWechatController.php
@@ -8,7 +8,7 @@
 
 namespace App\Http\Controllers\Backend\Api\V1;
 
-use App\Meedu\Wechat;
+use App\Meedu\Utils\Wechat;
 use Illuminate\Http\Request;
 use App\Models\AdministratorLog;
 

diff --git a/app/Http/Controllers/Backend/Api/V1/SettingController.php b/app/Http/Controllers/Backend/Api/V1/SettingController.php
@@ -8,7 +8,7 @@
 
 namespace App\Http\Controllers\Backend\Api\V1;
 
-use App\Meedu\Setting;
+use App\Meedu\Core\Setting;
 use Illuminate\Http\Request;
 use App\Models\AdministratorLog;
 use App\Events\AppConfigSavedEvent;

diff --git a/app/Http/Controllers/Frontend/OrderController.php b/app/Http/Controllers/Frontend/OrderController.php
@@ -8,7 +8,7 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use App\Meedu\Wechat;
+use App\Meedu\Utils\Wechat;
 use Illuminate\Http\Request;
 use App\Meedu\Payment\PaymentHandler;
 use App\Meedu\ServiceV2\Services\OrderServiceInterface;

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -25,7 +25,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Bootstrap\HandleExceptions::class,
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \Illuminate\Foundation\Bootstrap\RegisterProviders::class,
-        \App\Meedu\AddonsProvider::class,
+        \App\Meedu\Core\AddonsProvider::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
 

diff --git a/app/Jobs/UserRegisterIpToAreaJob.php b/app/Jobs/UserRegisterIpToAreaJob.php
@@ -8,7 +8,7 @@
 
 namespace App\Jobs;
 
-use App\Meedu\Ip;
+use App\Meedu\Utils\Ip;
 use Illuminate\Bus\Queueable;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Meedu/Addons.php → app/Meedu/Core/Addons.php b/app/Meedu/Addons.php → app/Meedu/Core/Addons.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Core;
 
 use Illuminate\Support\Str;
 use Illuminate\Filesystem\Filesystem;

diff --git a/app/Meedu/AddonsProvider.php → app/Meedu/Core/AddonsProvider.php b/app/Meedu/AddonsProvider.php → app/Meedu/Core/AddonsProvider.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Core;
 
 use Illuminate\Contracts\Foundation\Application;
 

diff --git a/app/Meedu/MeEduCloud.php → app/Meedu/Core/MeEduCloud.php b/app/Meedu/MeEduCloud.php → app/Meedu/Core/MeEduCloud.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Core;
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Cache;

diff --git a/app/Meedu/Setting.php → app/Meedu/Core/Setting.php b/app/Meedu/Setting.php → app/Meedu/Core/Setting.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Core;
 
 use App\Meedu\Sms\SmsInterface;
 use App\Services\Base\Services\ConfigService;

diff --git a/app/Meedu/Upgrade.php → app/Meedu/Core/Upgrade.php b/app/Meedu/Upgrade.php → app/Meedu/Core/Upgrade.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Core;
 
 use App\Meedu\UpgradeLog\UpgradeTo48;
 use App\Meedu\UpgradeLog\UpgradeToV4;

diff --git a/app/Meedu/ServiceV2/Services/SettingService.php b/app/Meedu/ServiceV2/Services/SettingService.php
@@ -8,7 +8,7 @@
 
 namespace App\Meedu\ServiceV2\Services;
 
-use App\Meedu\Setting;
+use App\Meedu\Core\Setting;
 
 class SettingService implements SettingServiceInterface
 {

diff --git a/app/Meedu/Ip.php → app/Meedu/Utils/Ip.php b/app/Meedu/Ip.php → app/Meedu/Utils/Ip.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Utils;
 
 class Ip
 {

diff --git a/app/Meedu/Verify.php → app/Meedu/Utils/Verify.php b/app/Meedu/Verify.php → app/Meedu/Utils/Verify.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Utils;
 
 class Verify
 {

diff --git a/app/Meedu/Wechat.php → app/Meedu/Utils/Wechat.php b/app/Meedu/Wechat.php → app/Meedu/Utils/Wechat.php
@@ -6,7 +6,7 @@
  * (c) 杭州白书科技有限公司
  */
 
-namespace App\Meedu;
+namespace App\Meedu\Utils;
 
 use EasyWeChat\Factory;
 use App\Services\Base\Services\ConfigService;

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -8,7 +8,7 @@
 
 namespace App\Providers;
 
-use App\Meedu\Setting;
+use App\Meedu\Core\Setting;
 use Illuminate\Support\Str;
 use App\Meedu\ServiceV2\ServiceInit;
 use Illuminate\Support\Facades\Schema;

diff --git a/app/helper.php b/app/helper.php
@@ -496,7 +496,7 @@ function url_append_query(string $url, array $data): string
 if (!function_exists('wechat_qrcode_image')) {
     function wechat_qrcode_image(string $code): string
     {
-        $result = \App\Meedu\Wechat::getInstance()->qrcode->temporary($code, 3600);
+        $result = \App\Meedu\Utils\Wechat::getInstance()->qrcode->temporary($code, 3600);
         $url = $result['url'] ?? '';
         return 'data:image/png;base64, ' . base64_encode(\QrCode::format('png')->size(300)->generate($url));
     }

diff --git a/routes/api-v3.php b/routes/api-v3.php
@@ -37,6 +37,8 @@
 Route::get('/courses', 'CourseController@index');
 
 Route::group(['middleware' => ['auth:apiv2', 'api.login.status.check']], function () {
+    // 创建订单
+    Route::post('/order', 'PaymentController@create');
     // 订单支付
     Route::post('/order/pay', 'PaymentController@submit');
 

diff --git a/tests/Feature/Api/V2/MemberTest.php b/tests/Feature/Api/V2/MemberTest.php
@@ -8,7 +8,7 @@
 
 namespace Tests\Feature\Api\V2;
 
-use App\Meedu\Verify;
+use App\Meedu\Utils\Verify;
 use App\Constant\CacheConstant;
 use Illuminate\Http\UploadedFile;
 use App\Services\Member\Models\User;