gx

@@ -5,7 +5,7 @@ namespace App\Console\Commands;
 use App\Helper\OaGlobalsoApi;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\Channel\Channel;
-use App\Models\NoticeLog;
+use App\Models\Com\NoticeLog;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectRenew;
 use App\Utils\LogUtils;

@@ -5,7 +5,7 @@ namespace App\Console\Commands;
 use App\Helper\Arr;
 use App\Models\Product\Category;
 use App\Models\Product\Product;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use GuzzleHttp\Client;
 use GuzzleHttp\Promise\Utils;
 use Illuminate\Console\Command;

@@ -6,8 +6,7 @@ namespace App\Http\Controllers\Aside;
 use App\Enums\Common\Code;
 use App\Http\Logic\Aside\LoginLogic;
 use App\Models\Manage\Manage;
-use App\Models\SmsLog;
-use App\Models\User\User as UserModel;
+use App\Models\Sms\SmsLog;
 use App\Rules\Mobile;
 use Illuminate\Http\Request;
 use Mrgoon\AliSms\AliSms;

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Aside;
 
 use App\Http\Logic\Aside\Project\ProjectLogic;
-use App\Models\NoticeLog;
+use App\Models\Com\NoticeLog;
 use App\Utils\LogUtils;
 
 /**

@@ -3,14 +3,13 @@
 namespace App\Http\Controllers\Aside\Project;
 
 use App\Enums\Common\Code;
-use App\Helper\Common;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Project\OnlineCheckLogic;
 use App\Http\Logic\Aside\Project\ProcessRecordsLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Requests\Aside\Project\ProcessRecordsRequest;
 use App\Http\Requests\Aside\Project\ProjectRequest;
-use App\Models\City;
+use App\Models\Com\City;
 use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 use App\Models\Inquiry\InquirySet;

@@ -8,7 +8,7 @@ use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
 use App\Http\Requests\Bside\Blog\BlogCategoryRequest;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 
 class BlogCategoryController extends BaseController
 {

@@ -7,10 +7,9 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
 use App\Http\Logic\Bside\Blog\BlogLabelLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
-use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Models\Blog\Blog as BlogModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 
 class BlogController extends BaseController

@@ -12,16 +12,10 @@ namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
 use App\Helper\Translate;
 use App\Http\Logic\Bside\User\UserLoginLogic;
-use App\Models\File\Image;
 use App\Models\Service\Service;
-use App\Models\SmsLog;
-use App\Models\Template\BTemplate;
-use App\Models\Template\Template;
-use App\Models\Template\TemplateModule;
+use App\Models\Sms\SmsLog;
 use App\Models\User\User as UserModel;
 use App\Utils\EncryptUtils;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 use Mrgoon\AliSms\AliSms;
 
 class LoginController extends BaseController
@@ -120,62 +114,4 @@ class LoginController extends BaseController
     }
 
 
-    public function ceshi(){
-        $templateModel = new TemplateModule();
-        $list = $templateModel->list();
-        foreach ($list as $k => $v){
-            $html = $this->re($v['html'],'https://develop.globalso.com/a/image/','https://ecdn6.globalso.com/public/template/');
-            $html = $this->re($html,'https://develop.globalso.com/b/image/','https://ecdn6.globalso.com/public/template/');
-//            preg_match_all('/\"https:\/\/develop.globalso.com\/b\/image\/(.*?)\"/', $v['html'], $matches);
-//            if (!empty($matches[1])) {
-//                $srcValues = $matches[1];
-//                $imageModel = new Image();
-//                $html = $v['html'];
-//                foreach ($srcValues as $srcValue) {
-//                    $image_info = $imageModel->read(['hash' => $srcValue]);
-//                    if ($image_info !== false) {
-//                        $path = basename($image_info['path']);
-//                        $html = $this->re($html, $srcValue, $path);
-//                    }
-//                }
-                $templateModel->edit(['html'=>$html],['id'=>$v['id']]);
-//            }
-        }
-        return 1;
-    }
-
-    public function re(&$html,$srcValue,$path){
-        $html = str_replace(
-            $srcValue,
-            $path,
-            $html
-        );
-        return $html;
-    }
-
-    public function updateHtml(){
-        $html = $this->re($v['html'],'https://develop.globalso.com/a/image/','https://ecdn6.globalso.com/public/template/');
-        $html = $this->re($v['html'],'https://develop.globalso.com/b/image/','https://ecdn6.globalso.com/public/template/');
-    }
-
-    public function updateCe(){
-        $templateModel = new TemplateModule();
-        $list = [];
-        foreach ($list as $k => $v){
-            preg_match_all('/\"https:\/\/develop.globalso.com\/a\/image\/(.*?)\"/', $v['html'], $matches);
-            if (!empty($matches[1])) {
-                $srcValues = $matches[1];
-                $imageModel = new Image();
-                $html = $v['html'];
-                foreach ($srcValues as $srcValue) {
-                    $image_info = $imageModel->read(['hash' => $srcValue]);
-                    if ($image_info !== false) {
-                        $path = basename($image_info['path']);
-                        $html = $this->re($html, $srcValue, $path);
-                    }
-                }
-            }
-            $templateModel->edit(['html'=>$html],['id'=>$v['id']]);
-        }
-    }
 }

@@ -7,7 +7,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Nav\NavLogic;
 use App\Http\Requests\Bside\Nav\NavRequest;
-use App\Models\BNav;
+use App\Models\Nav\BNav;
 
 /**
  * 导航栏目 b端编辑 c端显示

@@ -8,7 +8,7 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic;
 use App\Http\Requests\Bside\News\NewsCategoryRequest;
 use App\Models\News\News as NewsModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 
 class NewsCategoryController extends BaseController
 {

@@ -8,9 +8,8 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Models\News\News as NewsModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
-use Illuminate\Http\Request;
 
 
 /**

@@ -3,13 +3,12 @@
 namespace App\Http\Controllers\Bside\Product;
 
 use App\Enums\Common\Code;
-use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\CategoryLogic;
 use App\Http\Requests\Bside\Product\CategoryRequest;
 use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 

@@ -9,8 +9,7 @@ use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Requests\Bside\Product\KeywordRequest;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
-use App\Models\Project\Project;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bside\Route;
 
 
 use App\Http\Controllers\Bside\BaseController;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Http\Request;
 
 class RouteController extends BaseController

@@ -4,11 +4,11 @@ namespace App\Http\Logic\Aside;
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Common;
-use App\Models\Manage\Manage;
 use App\Models\Manage\LoginLog;
+use App\Models\Manage\Manage;
 use App\Models\Manage\MenuSpecial;
 use App\Models\Service\Service;
-use App\Models\SmsLog;
+use App\Models\Sms\SmsLog;
 use App\Utils\EncryptUtils;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Hash;

@@ -7,12 +7,11 @@ use App\Models\Blog\BlogCategory;
 use App\Models\News\NewsCategory;
 use App\Models\Product\Category;
 use App\Models\Product\Product;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
-use App\Models\Template\ModuleSetting;
-use App\Models\Template\Template;
 use App\Models\Template\BSetting;
 use App\Models\Template\BTemplate;
+use App\Models\Template\Template;
 
 /**
  * @remark :b端模块

@@ -3,12 +3,11 @@
 namespace App\Http\Logic\Bside\BTemplate;
 
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BSetting;
 use App\Models\Template\BTemplate;
-use App\Models\Template\Template;
 
 class CustomTemplateLogic extends BaseLogic
 {

@@ -3,15 +3,10 @@
 namespace App\Http\Logic\Bside;
 
 
-use App\Enums\Common\Code;
 use App\Enums\Common\Common;
 use App\Exceptions\BsideGlobalException;
-use App\Http\Controllers\File\ImageController;
-use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Logic;
-use App\Models\File\Image as ImageModel;
-use App\Models\Project\Project;
-use App\Models\UpdateNotify;
+use App\Models\Com\UpdateNotify;
 use Illuminate\Support\Facades\Cache;
 
 /**

@@ -2,14 +2,10 @@
 
 namespace App\Http\Logic\Bside\Blog;
 
-use App\Enums\Common\Code;
-use App\Helper\Common;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Http\Logic\Bside\User\UserLogic;
-use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\Blog\Blog as BlogModel;
-use App\Models\News\NewsCategory as NewsCategoryModel;
-use App\Models\RouteMap;
+use App\Models\Blog\BlogCategory as BlogCategoryModel;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 
 class BlogCategoryLogic extends BaseLogic

@@ -7,7 +7,7 @@ use App\Helper\Common;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Blog\Blog;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 
 class BlogLogic extends BaseLogic

@@ -3,9 +3,8 @@
 namespace App\Http\Logic\Bside\Nav;
 
 
-use App\Enums\Common\Code;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\BNav;
+use App\Models\Nav\BNav;
 
 
 /**

@@ -2,12 +2,10 @@
 
 namespace App\Http\Logic\Bside\News;
 
-use App\Enums\Common\Code;
-use App\Helper\Common;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\News\News as NewsModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 
 class NewsCategoryLogic extends BaseLogic

@@ -7,7 +7,7 @@ use App\Helper\Common;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\News\News;
 use App\Models\News\NewsCategory as NewsCategoryModel;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 use mysql_xdevapi\Exception;
 

@@ -7,9 +7,8 @@ use App\Helper\Arr;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
-use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 
 /**

@@ -5,9 +5,9 @@ namespace App\Http\Logic\Bside\Product;
 use App\Exceptions\BsideGlobalException;
 use App\Helper\Arr;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\Product\KeywordRelated;
-use App\Models\RouteMap;
 use App\Models\Product\Keyword;
+use App\Models\Product\KeywordRelated;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 
 /**

@@ -4,11 +4,9 @@ namespace App\Http\Logic\Bside\Product;
 
 use App\Helper\Arr;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Http\Logic\Bside\User\UserLogic;
 use App\Models\Product\CategoryRelated;
-use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
-use App\Models\RouteMap;
+use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use Illuminate\Support\Facades\DB;
 

@@ -4,7 +4,7 @@ namespace App\Http\Logic\Bside\Setting;
 
 use App\Helper\Common as CommonHelper;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\UpdateNotify;
+use App\Models\Com\UpdateNotify;
 use App\Models\WebSetting\WebSetting;
 
 class WebSettingLogic extends BaseLogic

@@ -3,11 +3,7 @@
 namespace App\Http\Logic\Bside\User;
 
 use App\Enums\Common\Code;
-use App\Helper\Common;
-use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\SmsLog;
-use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User;
 use Illuminate\Support\Facades\Cache;
 

@@ -6,9 +6,8 @@ use App\Enums\Common\Code;
 use App\Exceptions\AsideGlobalException;
 use App\Exceptions\BsideGlobalException;
 use App\Helper\Common;
-use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\Project\Project;
-use App\Models\SmsLog;
+use App\Models\Sms\SmsLog;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User;
 use Illuminate\Support\Facades\Cache;

 <?php
 
-namespace App\Models;
+namespace App\Models\Com;
 
 
 use App\Helper\Arr;

 <?php
-namespace App\Models;
+namespace App\Models\Com;
 
 use App\Helper\Arr;
 use Illuminate\Database\Eloquent\Model;

@@ -7,7 +7,9 @@
  * @time   :2023/7/31 15:10
  */
 
-namespace App\Models;
+namespace App\Models\Com;
+
+use App\Models\Base;
 
 class UpdateNotify extends Base
 {

@@ -43,10 +43,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 class CustomerVisit extends Base
 {
     use HasFactory;
-
     protected $table = 'gl_customer_visit';
-    //连接数据库
-    protected $connection = 'custom_mysql';
     const LIMIT = 15;
 
     /** @var int PC端 */

@@ -7,6 +7,4 @@ use App\Models\Base;
 class CustomerVisitItem extends Base
 {
     protected $table = 'gl_customer_visit_item';
-    //连接数据库
-    protected $connection = 'custom_mysql';
 }

 <?php
 
-namespace App\Models;
+namespace App\Models\Nav;
 
+use App\Models\Base;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**

@@ -4,8 +4,6 @@ namespace App\Models\Product;
 
 
 use App\Models\Base;
-use App\Models\RouteMap;
-use App\Services\Facades\Upload;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**

@@ -3,7 +3,6 @@
 namespace App\Models\Product;
 
 use App\Models\Base;
-use App\Models\RouteMap;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Keyword extends Base

@@ -4,11 +4,7 @@ namespace App\Models\Product;
 
 use App\Helper\Arr;
 use App\Models\Base;
-use App\Models\RouteMap;
-use App\Services\Facades\Upload;
-use App\Services\ProjectServer;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Facades\DB;
 
 /**
  * @method static get()

 <?php
 
-namespace App\Models;
+namespace App\Models\RouteMap;
 
 use App\Helper\Translate;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-use function MongoDB\select_server;
+use App\Models\Base;
 
 /**
  * 路由映射表

@@ -5,7 +5,9 @@
  * Date: 2023/6/3
  * Time: 17:42
  */
-namespace App\Models;
+namespace App\Models\Sms;
+use App\Models\Base;
+
 class SmsLog extends Base
 {
     //设置关联表名

@@ -3,14 +3,7 @@
 namespace App\Models\User;
 
 //use Illuminate\Contracts\Auth\MustVerifyEmail;
-use App\Helper\Common;
 use App\Models\Base;
-use App\Models\SmsLog;
-use App\Models\User\ProjectRole as ProjectRoleModel;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\Cache;
-use Laravel\Sanctum\HasApiTokens;
 
 //use Illuminate\Foundation\Auth\User as Authenticatable;