gx

@@ -2,21 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Helper\Arr;
 use App\Helper\FormGlobalsoApi;
-use App\Http\Logic\Bside\InquiryLogic;
-use App\Models\Product\Category;
-use App\Models\Product\Product;
-use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
-use App\Models\RankData\RankData as GoogleRankModel;
-use App\Models\RouteMap\RouteMap;
-use GuzzleHttp\Client;
-use GuzzleHttp\Promise\Utils;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
 
 /**
  * 最近一次询盘

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Bside\Inquiry;
 
 
 use App\Http\Controllers\Bside\BaseController;
-use App\Http\Logic\Bside\InquiryLogic;
+use App\Http\Logic\Bside\Inquiry\InquiryLogic;
 use App\Rules\Ids;
 use App\Services\BatchExportService;
 use Illuminate\Http\Request;

@@ -8,7 +8,7 @@ use App\Helper\GoogleSpeedApi;
 use App\Helper\QuanqiusouApi;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Aside\Project\ProjectLogic;
-use App\Http\Logic\Bside\RankDataLogic;
+use App\Http\Logic\Bside\RankData\RankDataLogic;
 use App\Models\RankData\RankData;
 use App\Models\RankData\Speed as GoogleSpeedModel;
 use App\Services\BatchExportService;

@@ -7,7 +7,7 @@
  * @time   :2023/8/19 9:11
  */
 
-namespace App\Http\Controllers\Bside;
+namespace App\Http\Controllers\Bside\User;
 
 use App\Enums\Common\Code;
 use App\Events\WebSocketMessage;
@@ -15,21 +15,16 @@ use App\Events\WebSocketMessageSent;
 use App\Helper\Common;
 use App\Helper\Translate;
 use App\Helper\Wechat;
-use App\Http\Logic\Bside\User\UserLogic;
+use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\UserLoginLogic;
-use App\Models\File\Image as ImageModel;
 use App\Models\Project\Project;
 use App\Models\Service\Service;
 use App\Models\Sms\SmsLog;
-use App\Models\Template\Template;
-use App\Models\Template\TemplateModule;
 use App\Models\User\DeptUser;
 use App\Models\User\ProjectRole;
 use App\Models\User\User;
-use App\Models\User\User as UserModel;
 use App\Utils\EncryptUtils;
-use Illuminate\Database\Eloquent\Model;
-use \Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Cache;
 use Mrgoon\AliSms\AliSms;
 
 class LoginController extends BaseController
@@ -116,7 +111,7 @@ class LoginController extends BaseController
             'mobile.regex' => '请输入正确的手机号码',
         ]);
         $mobile = $this->param['mobile'];
-        $user = UserModel::where(['mobile' => $mobile])->first();
+        $user = User::where(['mobile' => $mobile])->first();
         if (empty($user)) {
             $this->response('请输入正确的手机号码！', Code::USER_LOGIN_ERROE);
         }

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bside\Visit;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
-use App\Http\Logic\Bside\VisitLogic;
+use App\Http\Logic\Bside\Visit\VisitLogic;
 
 
 /**

@@ -145,6 +145,7 @@ class ATemplateLogic extends BaseLogic
             DB::rollBack();
             $this->fail('error');
         }
+        return $this->success();
     }
 
     /**

@@ -10,6 +10,7 @@
 namespace App\Http\Logic\Bside\BTemplate;
 
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateLog;
 
@@ -81,6 +82,12 @@ class BTemplateLogLogic extends BaseLogic
         if($info === false){
             $this->fail('当前数据不存在，或已被删除');
         }
-        return $this->success($info);
+        $serviceSettingModel = new ServiceSettingModel();
+        $list = $serviceSettingModel->list(['type'=>2],'created_at');
+        $data = [
+            'info' => $info,
+            'header_footer'=>$list,
+        ];
+        return $this->success($data);
     }
 }

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\Inquiry;
 
 use App\Helper\Arr;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\Translate;
 use App\Http\Logic\Aside\Project\ProjectLogic;
+use App\Http\Logic\Bside\BaseLogic;
 
 /**
  * Class InquiryLogic

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\RankData;
 
 
 use App\Helper\Arr;
@@ -8,6 +8,7 @@ use App\Helper\QuanqiusouApi;
 use App\Helper\Translate;
 use App\Http\Logic\Aside\Project\DomainInfoLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
+use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Project\Project;
 use App\Models\RankData\ExternalLinks;
 use App\Models\RankData\IndexedPages;

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\Visit;
 
-use App\Http\Logic\Logic;
+use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Visit\Visit;
 use App\Models\Visit\VisitItem;
 

@@ -349,13 +349,13 @@ Route::middleware(['bloginauth'])->group(function () {
 });
 //无需登录验证的路由组
 Route::group([], function () {
-    Route::any('/login', [\App\Http\Controllers\Bside\LoginController::class, 'login'])->name('login');
-    Route::any('/projectLogin', [\App\Http\Controllers\Bside\LoginController::class, 'projectLogin'])->name('projectLogin');
-    Route::any('/ceshi', [\App\Http\Controllers\Bside\LoginController::class, 'ceshi'])->name('ceshi');
-    Route::any('/stringTranslation', [\App\Http\Controllers\Bside\LoginController::class, 'stringTranslation'])->name('stringTranslation');
-    Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\LoginController::class, 'sendLoginSms'])->name('sendLoginSms');
-    Route::any('/autologin', [\App\Http\Controllers\Bside\LoginController::class, 'autologin'])->name('autologin');
-    Route::any('/qrcode', [\App\Http\Controllers\Bside\LoginController::class, 'qrcode'])->name('qrcode');
-    Route::any('/globalSo_v6_login', [\App\Http\Controllers\Bside\LoginController::class, 'globalSo_v6_login'])->name('globalSo_v6_login');
-    Route::any('/getWechatLoginInfo', [\App\Http\Controllers\Bside\LoginController::class, 'getWechatLoginInfo'])->name('getWechatLoginInfo');
+    Route::any('/login', [\App\Http\Controllers\Bside\User\LoginController::class, 'login'])->name('login');
+    Route::any('/projectLogin', [\App\Http\Controllers\Bside\User\LoginController::class, 'projectLogin'])->name('projectLogin');
+    Route::any('/ceshi', [\App\Http\Controllers\Bside\User\LoginController::class, 'ceshi'])->name('ceshi');
+    Route::any('/stringTranslation', [\App\Http\Controllers\Bside\User\LoginController::class, 'stringTranslation'])->name('stringTranslation');
+    Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\User\LoginController::class, 'sendLoginSms'])->name('sendLoginSms');
+    Route::any('/autologin', [\App\Http\Controllers\Bside\User\LoginController::class, 'autologin'])->name('autologin');
+    Route::any('/qrcode', [\App\Http\Controllers\Bside\User\LoginController::class, 'qrcode'])->name('qrcode');
+    Route::any('/globalSo_v6_login', [\App\Http\Controllers\Bside\User\LoginController::class, 'globalSo_v6_login'])->name('globalSo_v6_login');
+    Route::any('/getWechatLoginInfo', [\App\Http\Controllers\Bside\User\LoginController::class, 'getWechatLoginInfo'])->name('getWechatLoginInfo');
 });

 <?php
 
 use Illuminate\Support\Facades\Route;
+
 /**
  * @remark :
  * @name   :wechat.php
@@ -8,5 +9,5 @@ use Illuminate\Support\Facades\Route;
  * @method :post
  * @time   :2023/8/24 10:14
  */
-Route::any('/eventmessage', [\App\Http\Controllers\Bside\LoginController::class, 'eventMessage'])->name('eventMessage');
+Route::any('/eventmessage', [\App\Http\Controllers\Bside\User\LoginController::class, 'eventMessage'])->name('eventMessage');