正在显示
41 个修改的文件
包含
44 行增加
和
153 行删除
| @@ -5,7 +5,7 @@ namespace App\Console\Commands; | @@ -5,7 +5,7 @@ namespace App\Console\Commands; | ||
| 5 | use App\Helper\OaGlobalsoApi; | 5 | use App\Helper\OaGlobalsoApi; |
| 6 | use App\Http\Logic\Aside\Project\ProjectLogic; | 6 | use App\Http\Logic\Aside\Project\ProjectLogic; |
| 7 | use App\Models\Channel\Channel; | 7 | use App\Models\Channel\Channel; |
| 8 | -use App\Models\NoticeLog; | 8 | +use App\Models\Com\NoticeLog; |
| 9 | use App\Models\Project\Project; | 9 | use App\Models\Project\Project; |
| 10 | use App\Models\Project\ProjectRenew; | 10 | use App\Models\Project\ProjectRenew; |
| 11 | use App\Utils\LogUtils; | 11 | use App\Utils\LogUtils; |
| @@ -5,7 +5,7 @@ namespace App\Console\Commands; | @@ -5,7 +5,7 @@ namespace App\Console\Commands; | ||
| 5 | use App\Helper\Arr; | 5 | use App\Helper\Arr; |
| 6 | use App\Models\Product\Category; | 6 | use App\Models\Product\Category; |
| 7 | use App\Models\Product\Product; | 7 | use App\Models\Product\Product; |
| 8 | -use App\Models\RouteMap; | 8 | +use App\Models\RouteMap\RouteMap; |
| 9 | use GuzzleHttp\Client; | 9 | use GuzzleHttp\Client; |
| 10 | use GuzzleHttp\Promise\Utils; | 10 | use GuzzleHttp\Promise\Utils; |
| 11 | use Illuminate\Console\Command; | 11 | use Illuminate\Console\Command; |
| @@ -6,8 +6,7 @@ namespace App\Http\Controllers\Aside; | @@ -6,8 +6,7 @@ namespace App\Http\Controllers\Aside; | ||
| 6 | use App\Enums\Common\Code; | 6 | use App\Enums\Common\Code; |
| 7 | use App\Http\Logic\Aside\LoginLogic; | 7 | use App\Http\Logic\Aside\LoginLogic; |
| 8 | use App\Models\Manage\Manage; | 8 | use App\Models\Manage\Manage; |
| 9 | -use App\Models\SmsLog; | ||
| 10 | -use App\Models\User\User as UserModel; | 9 | +use App\Models\Sms\SmsLog; |
| 11 | use App\Rules\Mobile; | 10 | use App\Rules\Mobile; |
| 12 | use Illuminate\Http\Request; | 11 | use Illuminate\Http\Request; |
| 13 | use Mrgoon\AliSms\AliSms; | 12 | use Mrgoon\AliSms\AliSms; |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | namespace App\Http\Controllers\Aside; | 3 | namespace App\Http\Controllers\Aside; |
| 4 | 4 | ||
| 5 | use App\Http\Logic\Aside\Project\ProjectLogic; | 5 | use App\Http\Logic\Aside\Project\ProjectLogic; |
| 6 | -use App\Models\NoticeLog; | 6 | +use App\Models\Com\NoticeLog; |
| 7 | use App\Utils\LogUtils; | 7 | use App\Utils\LogUtils; |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| @@ -3,14 +3,13 @@ | @@ -3,14 +3,13 @@ | ||
| 3 | namespace App\Http\Controllers\Aside\Project; | 3 | namespace App\Http\Controllers\Aside\Project; |
| 4 | 4 | ||
| 5 | use App\Enums\Common\Code; | 5 | use App\Enums\Common\Code; |
| 6 | -use App\Helper\Common; | ||
| 7 | use App\Http\Controllers\Aside\BaseController; | 6 | use App\Http\Controllers\Aside\BaseController; |
| 8 | use App\Http\Logic\Aside\Project\OnlineCheckLogic; | 7 | use App\Http\Logic\Aside\Project\OnlineCheckLogic; |
| 9 | use App\Http\Logic\Aside\Project\ProcessRecordsLogic; | 8 | use App\Http\Logic\Aside\Project\ProcessRecordsLogic; |
| 10 | use App\Http\Logic\Aside\Project\ProjectLogic; | 9 | use App\Http\Logic\Aside\Project\ProjectLogic; |
| 11 | use App\Http\Requests\Aside\Project\ProcessRecordsRequest; | 10 | use App\Http\Requests\Aside\Project\ProcessRecordsRequest; |
| 12 | use App\Http\Requests\Aside\Project\ProjectRequest; | 11 | use App\Http\Requests\Aside\Project\ProjectRequest; |
| 13 | -use App\Models\City; | 12 | +use App\Models\Com\City; |
| 14 | use App\Models\Devops\ServerConfig; | 13 | use App\Models\Devops\ServerConfig; |
| 15 | use App\Models\Domain\DomainInfo; | 14 | use App\Models\Domain\DomainInfo; |
| 16 | use App\Models\Inquiry\InquirySet; | 15 | use App\Models\Inquiry\InquirySet; |
| @@ -8,7 +8,7 @@ use App\Http\Logic\Bside\Blog\BlogCategoryLogic; | @@ -8,7 +8,7 @@ use App\Http\Logic\Bside\Blog\BlogCategoryLogic; | ||
| 8 | use App\Http\Requests\Bside\Blog\BlogCategoryRequest; | 8 | use App\Http\Requests\Bside\Blog\BlogCategoryRequest; |
| 9 | use App\Models\Blog\Blog as BlogModel; | 9 | use App\Models\Blog\Blog as BlogModel; |
| 10 | use App\Models\Blog\BlogCategory as BlogCategoryModel; | 10 | use App\Models\Blog\BlogCategory as BlogCategoryModel; |
| 11 | -use App\Models\RouteMap; | 11 | +use App\Models\RouteMap\RouteMap; |
| 12 | 12 | ||
| 13 | class BlogCategoryController extends BaseController | 13 | class BlogCategoryController extends BaseController |
| 14 | { | 14 | { |
| @@ -7,10 +7,9 @@ use App\Http\Controllers\Bside\BaseController; | @@ -7,10 +7,9 @@ use App\Http\Controllers\Bside\BaseController; | ||
| 7 | use App\Http\Logic\Bside\Blog\BlogCategoryLogic; | 7 | use App\Http\Logic\Bside\Blog\BlogCategoryLogic; |
| 8 | use App\Http\Logic\Bside\Blog\BlogLabelLogic; | 8 | use App\Http\Logic\Bside\Blog\BlogLabelLogic; |
| 9 | use App\Http\Logic\Bside\Blog\BlogLogic; | 9 | use App\Http\Logic\Bside\Blog\BlogLogic; |
| 10 | -use App\Http\Logic\Bside\News\NewsLogic; | ||
| 11 | use App\Http\Requests\Bside\Blog\BlogRequest; | 10 | use App\Http\Requests\Bside\Blog\BlogRequest; |
| 12 | use App\Models\Blog\Blog as BlogModel; | 11 | use App\Models\Blog\Blog as BlogModel; |
| 13 | -use App\Models\RouteMap; | 12 | +use App\Models\RouteMap\RouteMap; |
| 14 | use App\Models\User\User; | 13 | use App\Models\User\User; |
| 15 | 14 | ||
| 16 | class BlogController extends BaseController | 15 | class BlogController extends BaseController |
| @@ -12,16 +12,10 @@ namespace App\Http\Controllers\Bside; | @@ -12,16 +12,10 @@ namespace App\Http\Controllers\Bside; | ||
| 12 | use App\Enums\Common\Code; | 12 | use App\Enums\Common\Code; |
| 13 | use App\Helper\Translate; | 13 | use App\Helper\Translate; |
| 14 | use App\Http\Logic\Bside\User\UserLoginLogic; | 14 | use App\Http\Logic\Bside\User\UserLoginLogic; |
| 15 | -use App\Models\File\Image; | ||
| 16 | use App\Models\Service\Service; | 15 | use App\Models\Service\Service; |
| 17 | -use App\Models\SmsLog; | ||
| 18 | -use App\Models\Template\BTemplate; | ||
| 19 | -use App\Models\Template\Template; | ||
| 20 | -use App\Models\Template\TemplateModule; | 16 | +use App\Models\Sms\SmsLog; |
| 21 | use App\Models\User\User as UserModel; | 17 | use App\Models\User\User as UserModel; |
| 22 | use App\Utils\EncryptUtils; | 18 | use App\Utils\EncryptUtils; |
| 23 | -use Illuminate\Support\Facades\Cache; | ||
| 24 | -use Illuminate\Support\Facades\DB; | ||
| 25 | use Mrgoon\AliSms\AliSms; | 19 | use Mrgoon\AliSms\AliSms; |
| 26 | 20 | ||
| 27 | class LoginController extends BaseController | 21 | class LoginController extends BaseController |
| @@ -120,62 +114,4 @@ class LoginController extends BaseController | @@ -120,62 +114,4 @@ class LoginController extends BaseController | ||
| 120 | } | 114 | } |
| 121 | 115 | ||
| 122 | 116 | ||
| 123 | - public function ceshi(){ | ||
| 124 | - $templateModel = new TemplateModule(); | ||
| 125 | - $list = $templateModel->list(); | ||
| 126 | - foreach ($list as $k => $v){ | ||
| 127 | - $html = $this->re($v['html'],'https://develop.globalso.com/a/image/','https://ecdn6.globalso.com/public/template/'); | ||
| 128 | - $html = $this->re($html,'https://develop.globalso.com/b/image/','https://ecdn6.globalso.com/public/template/'); | ||
| 129 | -// preg_match_all('/\"https:\/\/develop.globalso.com\/b\/image\/(.*?)\"/', $v['html'], $matches); | ||
| 130 | -// if (!empty($matches[1])) { | ||
| 131 | -// $srcValues = $matches[1]; | ||
| 132 | -// $imageModel = new Image(); | ||
| 133 | -// $html = $v['html']; | ||
| 134 | -// foreach ($srcValues as $srcValue) { | ||
| 135 | -// $image_info = $imageModel->read(['hash' => $srcValue]); | ||
| 136 | -// if ($image_info !== false) { | ||
| 137 | -// $path = basename($image_info['path']); | ||
| 138 | -// $html = $this->re($html, $srcValue, $path); | ||
| 139 | -// } | ||
| 140 | -// } | ||
| 141 | - $templateModel->edit(['html'=>$html],['id'=>$v['id']]); | ||
| 142 | -// } | ||
| 143 | - } | ||
| 144 | - return 1; | ||
| 145 | - } | ||
| 146 | - | ||
| 147 | - public function re(&$html,$srcValue,$path){ | ||
| 148 | - $html = str_replace( | ||
| 149 | - $srcValue, | ||
| 150 | - $path, | ||
| 151 | - $html | ||
| 152 | - ); | ||
| 153 | - return $html; | ||
| 154 | - } | ||
| 155 | - | ||
| 156 | - public function updateHtml(){ | ||
| 157 | - $html = $this->re($v['html'],'https://develop.globalso.com/a/image/','https://ecdn6.globalso.com/public/template/'); | ||
| 158 | - $html = $this->re($v['html'],'https://develop.globalso.com/b/image/','https://ecdn6.globalso.com/public/template/'); | ||
| 159 | - } | ||
| 160 | - | ||
| 161 | - public function updateCe(){ | ||
| 162 | - $templateModel = new TemplateModule(); | ||
| 163 | - $list = []; | ||
| 164 | - foreach ($list as $k => $v){ | ||
| 165 | - preg_match_all('/\"https:\/\/develop.globalso.com\/a\/image\/(.*?)\"/', $v['html'], $matches); | ||
| 166 | - if (!empty($matches[1])) { | ||
| 167 | - $srcValues = $matches[1]; | ||
| 168 | - $imageModel = new Image(); | ||
| 169 | - $html = $v['html']; | ||
| 170 | - foreach ($srcValues as $srcValue) { | ||
| 171 | - $image_info = $imageModel->read(['hash' => $srcValue]); | ||
| 172 | - if ($image_info !== false) { | ||
| 173 | - $path = basename($image_info['path']); | ||
| 174 | - $html = $this->re($html, $srcValue, $path); | ||
| 175 | - } | ||
| 176 | - } | ||
| 177 | - } | ||
| 178 | - $templateModel->edit(['html'=>$html],['id'=>$v['id']]); | ||
| 179 | - } | ||
| 180 | - } | ||
| 181 | } | 117 | } |
| @@ -7,7 +7,7 @@ use App\Enums\Common\Code; | @@ -7,7 +7,7 @@ use App\Enums\Common\Code; | ||
| 7 | use App\Http\Controllers\Bside\BaseController; | 7 | use App\Http\Controllers\Bside\BaseController; |
| 8 | use App\Http\Logic\Bside\Nav\NavLogic; | 8 | use App\Http\Logic\Bside\Nav\NavLogic; |
| 9 | use App\Http\Requests\Bside\Nav\NavRequest; | 9 | use App\Http\Requests\Bside\Nav\NavRequest; |
| 10 | -use App\Models\BNav; | 10 | +use App\Models\Nav\BNav; |
| 11 | 11 | ||
| 12 | /** | 12 | /** |
| 13 | * 导航栏目 b端编辑 c端显示 | 13 | * 导航栏目 b端编辑 c端显示 |
| @@ -8,7 +8,7 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic; | @@ -8,7 +8,7 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic; | ||
| 8 | use App\Http\Requests\Bside\News\NewsCategoryRequest; | 8 | use App\Http\Requests\Bside\News\NewsCategoryRequest; |
| 9 | use App\Models\News\News as NewsModel; | 9 | use App\Models\News\News as NewsModel; |
| 10 | use App\Models\News\NewsCategory as NewsCategoryModel; | 10 | use App\Models\News\NewsCategory as NewsCategoryModel; |
| 11 | -use App\Models\RouteMap; | 11 | +use App\Models\RouteMap\RouteMap; |
| 12 | 12 | ||
| 13 | class NewsCategoryController extends BaseController | 13 | class NewsCategoryController extends BaseController |
| 14 | { | 14 | { |
| @@ -8,9 +8,8 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic; | @@ -8,9 +8,8 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic; | ||
| 8 | use App\Http\Logic\Bside\News\NewsLogic; | 8 | use App\Http\Logic\Bside\News\NewsLogic; |
| 9 | use App\Http\Requests\Bside\News\NewsRequest; | 9 | use App\Http\Requests\Bside\News\NewsRequest; |
| 10 | use App\Models\News\News as NewsModel; | 10 | use App\Models\News\News as NewsModel; |
| 11 | -use App\Models\RouteMap; | 11 | +use App\Models\RouteMap\RouteMap; |
| 12 | use App\Models\User\User; | 12 | use App\Models\User\User; |
| 13 | -use Illuminate\Http\Request; | ||
| 14 | 13 | ||
| 15 | 14 | ||
| 16 | /** | 15 | /** |
| @@ -3,13 +3,12 @@ | @@ -3,13 +3,12 @@ | ||
| 3 | namespace App\Http\Controllers\Bside\Product; | 3 | namespace App\Http\Controllers\Bside\Product; |
| 4 | 4 | ||
| 5 | use App\Enums\Common\Code; | 5 | use App\Enums\Common\Code; |
| 6 | -use App\Helper\Arr; | ||
| 7 | use App\Http\Controllers\Bside\BaseController; | 6 | use App\Http\Controllers\Bside\BaseController; |
| 8 | use App\Http\Logic\Bside\Product\CategoryLogic; | 7 | use App\Http\Logic\Bside\Product\CategoryLogic; |
| 9 | use App\Http\Requests\Bside\Product\CategoryRequest; | 8 | use App\Http\Requests\Bside\Product\CategoryRequest; |
| 10 | use App\Models\Product\Category; | 9 | use App\Models\Product\Category; |
| 11 | use App\Models\Product\CategoryRelated; | 10 | use App\Models\Product\CategoryRelated; |
| 12 | -use App\Models\RouteMap; | 11 | +use App\Models\RouteMap\RouteMap; |
| 13 | use App\Rules\Ids; | 12 | use App\Rules\Ids; |
| 14 | use Illuminate\Http\Request; | 13 | use Illuminate\Http\Request; |
| 15 | 14 |
| @@ -9,8 +9,7 @@ use App\Http\Logic\Bside\Product\KeywordLogic; | @@ -9,8 +9,7 @@ use App\Http\Logic\Bside\Product\KeywordLogic; | ||
| 9 | use App\Http\Requests\Bside\Product\KeywordRequest; | 9 | use App\Http\Requests\Bside\Product\KeywordRequest; |
| 10 | use App\Models\Product\Keyword; | 10 | use App\Models\Product\Keyword; |
| 11 | use App\Models\Product\KeywordRelated; | 11 | use App\Models\Product\KeywordRelated; |
| 12 | -use App\Models\Project\Project; | ||
| 13 | -use App\Models\RouteMap; | 12 | +use App\Models\RouteMap\RouteMap; |
| 14 | use App\Rules\Ids; | 13 | use App\Rules\Ids; |
| 15 | use Illuminate\Http\Request; | 14 | use Illuminate\Http\Request; |
| 16 | 15 |
| @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bside\Route; | @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bside\Route; | ||
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | use App\Http\Controllers\Bside\BaseController; | 7 | use App\Http\Controllers\Bside\BaseController; |
| 8 | -use App\Models\RouteMap; | 8 | +use App\Models\RouteMap\RouteMap; |
| 9 | use Illuminate\Http\Request; | 9 | use Illuminate\Http\Request; |
| 10 | 10 | ||
| 11 | class RouteController extends BaseController | 11 | class RouteController extends BaseController |
| @@ -4,11 +4,11 @@ namespace App\Http\Logic\Aside; | @@ -4,11 +4,11 @@ namespace App\Http\Logic\Aside; | ||
| 4 | 4 | ||
| 5 | use App\Enums\Common\Code; | 5 | use App\Enums\Common\Code; |
| 6 | use App\Enums\Common\Common; | 6 | use App\Enums\Common\Common; |
| 7 | -use App\Models\Manage\Manage; | ||
| 8 | use App\Models\Manage\LoginLog; | 7 | use App\Models\Manage\LoginLog; |
| 8 | +use App\Models\Manage\Manage; | ||
| 9 | use App\Models\Manage\MenuSpecial; | 9 | use App\Models\Manage\MenuSpecial; |
| 10 | use App\Models\Service\Service; | 10 | use App\Models\Service\Service; |
| 11 | -use App\Models\SmsLog; | 11 | +use App\Models\Sms\SmsLog; |
| 12 | use App\Utils\EncryptUtils; | 12 | use App\Utils\EncryptUtils; |
| 13 | use Illuminate\Support\Facades\Cache; | 13 | use Illuminate\Support\Facades\Cache; |
| 14 | use Illuminate\Support\Facades\Hash; | 14 | use Illuminate\Support\Facades\Hash; |
| @@ -7,12 +7,11 @@ use App\Models\Blog\BlogCategory; | @@ -7,12 +7,11 @@ use App\Models\Blog\BlogCategory; | ||
| 7 | use App\Models\News\NewsCategory; | 7 | use App\Models\News\NewsCategory; |
| 8 | use App\Models\Product\Category; | 8 | use App\Models\Product\Category; |
| 9 | use App\Models\Product\Product; | 9 | use App\Models\Product\Product; |
| 10 | -use App\Models\RouteMap; | 10 | +use App\Models\RouteMap\RouteMap; |
| 11 | use App\Models\Service\Service as ServiceSettingModel; | 11 | use App\Models\Service\Service as ServiceSettingModel; |
| 12 | -use App\Models\Template\ModuleSetting; | ||
| 13 | -use App\Models\Template\Template; | ||
| 14 | use App\Models\Template\BSetting; | 12 | use App\Models\Template\BSetting; |
| 15 | use App\Models\Template\BTemplate; | 13 | use App\Models\Template\BTemplate; |
| 14 | +use App\Models\Template\Template; | ||
| 16 | 15 | ||
| 17 | /** | 16 | /** |
| 18 | * @remark :b端模块 | 17 | * @remark :b端模块 |
| @@ -3,12 +3,11 @@ | @@ -3,12 +3,11 @@ | ||
| 3 | namespace App\Http\Logic\Bside\BTemplate; | 3 | namespace App\Http\Logic\Bside\BTemplate; |
| 4 | 4 | ||
| 5 | use App\Http\Logic\Bside\BaseLogic; | 5 | use App\Http\Logic\Bside\BaseLogic; |
| 6 | -use App\Models\RouteMap; | 6 | +use App\Models\RouteMap\RouteMap; |
| 7 | use App\Models\Service\Service as ServiceSettingModel; | 7 | use App\Models\Service\Service as ServiceSettingModel; |
| 8 | use App\Models\Template\BCustomTemplate; | 8 | use App\Models\Template\BCustomTemplate; |
| 9 | use App\Models\Template\BSetting; | 9 | use App\Models\Template\BSetting; |
| 10 | use App\Models\Template\BTemplate; | 10 | use App\Models\Template\BTemplate; |
| 11 | -use App\Models\Template\Template; | ||
| 12 | 11 | ||
| 13 | class CustomTemplateLogic extends BaseLogic | 12 | class CustomTemplateLogic extends BaseLogic |
| 14 | { | 13 | { |
| @@ -3,15 +3,10 @@ | @@ -3,15 +3,10 @@ | ||
| 3 | namespace App\Http\Logic\Bside; | 3 | namespace App\Http\Logic\Bside; |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | -use App\Enums\Common\Code; | ||
| 7 | use App\Enums\Common\Common; | 6 | use App\Enums\Common\Common; |
| 8 | use App\Exceptions\BsideGlobalException; | 7 | use App\Exceptions\BsideGlobalException; |
| 9 | -use App\Http\Controllers\File\ImageController; | ||
| 10 | -use App\Http\Logic\Aside\Project\ProjectLogic; | ||
| 11 | use App\Http\Logic\Logic; | 8 | use App\Http\Logic\Logic; |
| 12 | -use App\Models\File\Image as ImageModel; | ||
| 13 | -use App\Models\Project\Project; | ||
| 14 | -use App\Models\UpdateNotify; | 9 | +use App\Models\Com\UpdateNotify; |
| 15 | use Illuminate\Support\Facades\Cache; | 10 | use Illuminate\Support\Facades\Cache; |
| 16 | 11 | ||
| 17 | /** | 12 | /** |
| @@ -2,14 +2,10 @@ | @@ -2,14 +2,10 @@ | ||
| 2 | 2 | ||
| 3 | namespace App\Http\Logic\Bside\Blog; | 3 | namespace App\Http\Logic\Bside\Blog; |
| 4 | 4 | ||
| 5 | -use App\Enums\Common\Code; | ||
| 6 | -use App\Helper\Common; | ||
| 7 | use App\Http\Logic\Bside\BaseLogic; | 5 | use App\Http\Logic\Bside\BaseLogic; |
| 8 | -use App\Http\Logic\Bside\User\UserLogic; | ||
| 9 | -use App\Models\Blog\BlogCategory as BlogCategoryModel; | ||
| 10 | use App\Models\Blog\Blog as BlogModel; | 6 | use App\Models\Blog\Blog as BlogModel; |
| 11 | -use App\Models\News\NewsCategory as NewsCategoryModel; | ||
| 12 | -use App\Models\RouteMap; | 7 | +use App\Models\Blog\BlogCategory as BlogCategoryModel; |
| 8 | +use App\Models\RouteMap\RouteMap; | ||
| 13 | use Illuminate\Support\Facades\DB; | 9 | use Illuminate\Support\Facades\DB; |
| 14 | 10 | ||
| 15 | class BlogCategoryLogic extends BaseLogic | 11 | class BlogCategoryLogic extends BaseLogic |
| @@ -7,7 +7,7 @@ use App\Helper\Common; | @@ -7,7 +7,7 @@ use App\Helper\Common; | ||
| 7 | use App\Http\Logic\Bside\BaseLogic; | 7 | use App\Http\Logic\Bside\BaseLogic; |
| 8 | use App\Models\Blog\Blog; | 8 | use App\Models\Blog\Blog; |
| 9 | use App\Models\Blog\BlogCategory as BlogCategoryModel; | 9 | use App\Models\Blog\BlogCategory as BlogCategoryModel; |
| 10 | -use App\Models\RouteMap; | 10 | +use App\Models\RouteMap\RouteMap; |
| 11 | use Illuminate\Support\Facades\DB; | 11 | use Illuminate\Support\Facades\DB; |
| 12 | 12 | ||
| 13 | class BlogLogic extends BaseLogic | 13 | class BlogLogic extends BaseLogic |
| @@ -2,12 +2,10 @@ | @@ -2,12 +2,10 @@ | ||
| 2 | 2 | ||
| 3 | namespace App\Http\Logic\Bside\News; | 3 | namespace App\Http\Logic\Bside\News; |
| 4 | 4 | ||
| 5 | -use App\Enums\Common\Code; | ||
| 6 | -use App\Helper\Common; | ||
| 7 | use App\Http\Logic\Bside\BaseLogic; | 5 | use App\Http\Logic\Bside\BaseLogic; |
| 8 | use App\Models\News\News as NewsModel; | 6 | use App\Models\News\News as NewsModel; |
| 9 | use App\Models\News\NewsCategory as NewsCategoryModel; | 7 | use App\Models\News\NewsCategory as NewsCategoryModel; |
| 10 | -use App\Models\RouteMap; | 8 | +use App\Models\RouteMap\RouteMap; |
| 11 | use Illuminate\Support\Facades\DB; | 9 | use Illuminate\Support\Facades\DB; |
| 12 | 10 | ||
| 13 | class NewsCategoryLogic extends BaseLogic | 11 | class NewsCategoryLogic extends BaseLogic |
| @@ -7,7 +7,7 @@ use App\Helper\Common; | @@ -7,7 +7,7 @@ use App\Helper\Common; | ||
| 7 | use App\Http\Logic\Bside\BaseLogic; | 7 | use App\Http\Logic\Bside\BaseLogic; |
| 8 | use App\Models\News\News; | 8 | use App\Models\News\News; |
| 9 | use App\Models\News\NewsCategory as NewsCategoryModel; | 9 | use App\Models\News\NewsCategory as NewsCategoryModel; |
| 10 | -use App\Models\RouteMap; | 10 | +use App\Models\RouteMap\RouteMap; |
| 11 | use Illuminate\Support\Facades\DB; | 11 | use Illuminate\Support\Facades\DB; |
| 12 | use mysql_xdevapi\Exception; | 12 | use mysql_xdevapi\Exception; |
| 13 | 13 |
| @@ -7,9 +7,8 @@ use App\Helper\Arr; | @@ -7,9 +7,8 @@ use App\Helper\Arr; | ||
| 7 | use App\Http\Logic\Bside\BaseLogic; | 7 | use App\Http\Logic\Bside\BaseLogic; |
| 8 | use App\Models\Product\Category; | 8 | use App\Models\Product\Category; |
| 9 | use App\Models\Product\CategoryRelated; | 9 | use App\Models\Product\CategoryRelated; |
| 10 | -use App\Models\Product\KeywordRelated; | ||
| 11 | use App\Models\Product\Product; | 10 | use App\Models\Product\Product; |
| 12 | -use App\Models\RouteMap; | 11 | +use App\Models\RouteMap\RouteMap; |
| 13 | use Illuminate\Support\Facades\DB; | 12 | use Illuminate\Support\Facades\DB; |
| 14 | 13 | ||
| 15 | /** | 14 | /** |
| @@ -5,9 +5,9 @@ namespace App\Http\Logic\Bside\Product; | @@ -5,9 +5,9 @@ namespace App\Http\Logic\Bside\Product; | ||
| 5 | use App\Exceptions\BsideGlobalException; | 5 | use App\Exceptions\BsideGlobalException; |
| 6 | use App\Helper\Arr; | 6 | use App\Helper\Arr; |
| 7 | use App\Http\Logic\Bside\BaseLogic; | 7 | use App\Http\Logic\Bside\BaseLogic; |
| 8 | -use App\Models\Product\KeywordRelated; | ||
| 9 | -use App\Models\RouteMap; | ||
| 10 | use App\Models\Product\Keyword; | 8 | use App\Models\Product\Keyword; |
| 9 | +use App\Models\Product\KeywordRelated; | ||
| 10 | +use App\Models\RouteMap\RouteMap; | ||
| 11 | use Illuminate\Support\Facades\DB; | 11 | use Illuminate\Support\Facades\DB; |
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| @@ -4,11 +4,9 @@ namespace App\Http\Logic\Bside\Product; | @@ -4,11 +4,9 @@ namespace App\Http\Logic\Bside\Product; | ||
| 4 | 4 | ||
| 5 | use App\Helper\Arr; | 5 | use App\Helper\Arr; |
| 6 | use App\Http\Logic\Bside\BaseLogic; | 6 | use App\Http\Logic\Bside\BaseLogic; |
| 7 | -use App\Http\Logic\Bside\User\UserLogic; | ||
| 8 | use App\Models\Product\CategoryRelated; | 7 | use App\Models\Product\CategoryRelated; |
| 9 | -use App\Models\Product\KeywordRelated; | ||
| 10 | use App\Models\Product\Product; | 8 | use App\Models\Product\Product; |
| 11 | -use App\Models\RouteMap; | 9 | +use App\Models\RouteMap\RouteMap; |
| 12 | use App\Models\Template\BTemplate; | 10 | use App\Models\Template\BTemplate; |
| 13 | use Illuminate\Support\Facades\DB; | 11 | use Illuminate\Support\Facades\DB; |
| 14 | 12 |
| @@ -4,7 +4,7 @@ namespace App\Http\Logic\Bside\Setting; | @@ -4,7 +4,7 @@ namespace App\Http\Logic\Bside\Setting; | ||
| 4 | 4 | ||
| 5 | use App\Helper\Common as CommonHelper; | 5 | use App\Helper\Common as CommonHelper; |
| 6 | use App\Http\Logic\Bside\BaseLogic; | 6 | use App\Http\Logic\Bside\BaseLogic; |
| 7 | -use App\Models\UpdateNotify; | 7 | +use App\Models\Com\UpdateNotify; |
| 8 | use App\Models\WebSetting\WebSetting; | 8 | use App\Models\WebSetting\WebSetting; |
| 9 | 9 | ||
| 10 | class WebSettingLogic extends BaseLogic | 10 | class WebSettingLogic extends BaseLogic |
| @@ -3,11 +3,7 @@ | @@ -3,11 +3,7 @@ | ||
| 3 | namespace App\Http\Logic\Bside\User; | 3 | namespace App\Http\Logic\Bside\User; |
| 4 | 4 | ||
| 5 | use App\Enums\Common\Code; | 5 | use App\Enums\Common\Code; |
| 6 | -use App\Helper\Common; | ||
| 7 | -use App\Http\Logic\Aside\Project\ProjectLogic; | ||
| 8 | use App\Http\Logic\Bside\BaseLogic; | 6 | use App\Http\Logic\Bside\BaseLogic; |
| 9 | -use App\Models\SmsLog; | ||
| 10 | -use App\Models\User\ProjectRole as ProjectRoleModel; | ||
| 11 | use App\Models\User\User; | 7 | use App\Models\User\User; |
| 12 | use Illuminate\Support\Facades\Cache; | 8 | use Illuminate\Support\Facades\Cache; |
| 13 | 9 |
| @@ -6,9 +6,8 @@ use App\Enums\Common\Code; | @@ -6,9 +6,8 @@ use App\Enums\Common\Code; | ||
| 6 | use App\Exceptions\AsideGlobalException; | 6 | use App\Exceptions\AsideGlobalException; |
| 7 | use App\Exceptions\BsideGlobalException; | 7 | use App\Exceptions\BsideGlobalException; |
| 8 | use App\Helper\Common; | 8 | use App\Helper\Common; |
| 9 | -use App\Http\Logic\Aside\Project\ProjectLogic; | ||
| 10 | use App\Models\Project\Project; | 9 | use App\Models\Project\Project; |
| 11 | -use App\Models\SmsLog; | 10 | +use App\Models\Sms\SmsLog; |
| 12 | use App\Models\User\ProjectRole as ProjectRoleModel; | 11 | use App\Models\User\ProjectRole as ProjectRoleModel; |
| 13 | use App\Models\User\User; | 12 | use App\Models\User\User; |
| 14 | use Illuminate\Support\Facades\Cache; | 13 | use Illuminate\Support\Facades\Cache; |
| @@ -43,10 +43,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | @@ -43,10 +43,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | ||
| 43 | class CustomerVisit extends Base | 43 | class CustomerVisit extends Base |
| 44 | { | 44 | { |
| 45 | use HasFactory; | 45 | use HasFactory; |
| 46 | - | ||
| 47 | protected $table = 'gl_customer_visit'; | 46 | protected $table = 'gl_customer_visit'; |
| 48 | - //连接数据库 | ||
| 49 | - protected $connection = 'custom_mysql'; | ||
| 50 | const LIMIT = 15; | 47 | const LIMIT = 15; |
| 51 | 48 | ||
| 52 | /** @var int PC端 */ | 49 | /** @var int PC端 */ |
| @@ -7,6 +7,4 @@ use App\Models\Base; | @@ -7,6 +7,4 @@ use App\Models\Base; | ||
| 7 | class CustomerVisitItem extends Base | 7 | class CustomerVisitItem extends Base |
| 8 | { | 8 | { |
| 9 | protected $table = 'gl_customer_visit_item'; | 9 | protected $table = 'gl_customer_visit_item'; |
| 10 | - //连接数据库 | ||
| 11 | - protected $connection = 'custom_mysql'; | ||
| 12 | } | 10 | } |
| @@ -4,8 +4,6 @@ namespace App\Models\Product; | @@ -4,8 +4,6 @@ namespace App\Models\Product; | ||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | use App\Models\Base; | 6 | use App\Models\Base; |
| 7 | -use App\Models\RouteMap; | ||
| 8 | -use App\Services\Facades\Upload; | ||
| 9 | use Illuminate\Database\Eloquent\SoftDeletes; | 7 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 10 | 8 | ||
| 11 | /** | 9 | /** |
| @@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
| 3 | namespace App\Models\Product; | 3 | namespace App\Models\Product; |
| 4 | 4 | ||
| 5 | use App\Models\Base; | 5 | use App\Models\Base; |
| 6 | -use App\Models\RouteMap; | ||
| 7 | use Illuminate\Database\Eloquent\SoftDeletes; | 6 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 8 | 7 | ||
| 9 | class Keyword extends Base | 8 | class Keyword extends Base |
| @@ -4,11 +4,7 @@ namespace App\Models\Product; | @@ -4,11 +4,7 @@ namespace App\Models\Product; | ||
| 4 | 4 | ||
| 5 | use App\Helper\Arr; | 5 | use App\Helper\Arr; |
| 6 | use App\Models\Base; | 6 | use App\Models\Base; |
| 7 | -use App\Models\RouteMap; | ||
| 8 | -use App\Services\Facades\Upload; | ||
| 9 | -use App\Services\ProjectServer; | ||
| 10 | use Illuminate\Database\Eloquent\SoftDeletes; | 7 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 11 | -use Illuminate\Support\Facades\DB; | ||
| 12 | 8 | ||
| 13 | /** | 9 | /** |
| 14 | * @method static get() | 10 | * @method static get() |
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | -namespace App\Models; | 3 | +namespace App\Models\RouteMap; |
| 4 | 4 | ||
| 5 | use App\Helper\Translate; | 5 | use App\Helper\Translate; |
| 6 | -use Illuminate\Database\Eloquent\Model; | ||
| 7 | -use Illuminate\Support\Facades\Log; | ||
| 8 | -use Illuminate\Support\Str; | ||
| 9 | -use function MongoDB\select_server; | 6 | +use App\Models\Base; |
| 10 | 7 | ||
| 11 | /** | 8 | /** |
| 12 | * 路由映射表 | 9 | * 路由映射表 |
| @@ -3,14 +3,7 @@ | @@ -3,14 +3,7 @@ | ||
| 3 | namespace App\Models\User; | 3 | namespace App\Models\User; |
| 4 | 4 | ||
| 5 | //use Illuminate\Contracts\Auth\MustVerifyEmail; | 5 | //use Illuminate\Contracts\Auth\MustVerifyEmail; |
| 6 | -use App\Helper\Common; | ||
| 7 | use App\Models\Base; | 6 | use App\Models\Base; |
| 8 | -use App\Models\SmsLog; | ||
| 9 | -use App\Models\User\ProjectRole as ProjectRoleModel; | ||
| 10 | -use Illuminate\Database\Eloquent\Factories\HasFactory; | ||
| 11 | -use Illuminate\Notifications\Notifiable; | ||
| 12 | -use Illuminate\Support\Facades\Cache; | ||
| 13 | -use Laravel\Sanctum\HasApiTokens; | ||
| 14 | 7 | ||
| 15 | //use Illuminate\Foundation\Auth\User as Authenticatable; | 8 | //use Illuminate\Foundation\Auth\User as Authenticatable; |
| 16 | 9 |
-
请 注册 或 登录 后发表评论