周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 15eb422649ec3bb1af5081533074687a4dd34bf7 1 个父辈 7985d271

gx

内嵌 并排对比
正在显示 6 个修改的文件 包含 180 行增加 和 14 行删除
@@ -13,6 +13,8 @@ use App\Models\RouteMap\RouteMap; @@ -13,6 +13,8 @@ use App\Models\RouteMap\RouteMap;
13 use App\Models\Template\BTemplate; 13 use App\Models\Template\BTemplate;
14 use App\Models\Template\Setting; 14 use App\Models\Template\Setting;
15 use App\Models\User\User; 15 use App\Models\User\User;
  16 +use App\Models\WebSetting\SettingNum;
  17 +use Illuminate\Support\Facades\Log;
16 18
17 class BlogController extends BaseController 19 class BlogController extends BaseController
18 { 20 {
@@ -323,4 +325,54 @@ class BlogController extends BaseController @@ -323,4 +325,54 @@ class BlogController extends BaseController
323 $data = $blog->copyBlogInfo(); 325 $data = $blog->copyBlogInfo();
324 $this->response('success',Code::SUCCESS,$data); 326 $this->response('success',Code::SUCCESS,$data);
325 } 327 }
  328 +
  329 + /**
  330 + * @remark :设置排序
  331 + * @name :setProductSort
  332 + * @author :lyh
  333 + * @method :post
  334 + * @time :2024/1/31 10:14
  335 + */
  336 + public function setBlogSort(){
  337 + $setNumModel = new SettingNum();
  338 + try {
  339 + if(isset($this->param['id']) && !empty($this->param['id'])){
  340 + //执行编辑
  341 + $param = [
  342 + 'data'=>json_encode($this->param['data']),
  343 + ];
  344 + $setNumModel->edit($param,['id'=>$this->param['id']]);
  345 + }else{
  346 + //执行新增
  347 + $param = [
  348 + 'type'=>$setNumModel::TYPE_BLOG_SORT,
  349 + 'project_id'=>$this->user['project_id'],
  350 + 'data'=>json_encode($this->param['data']),
  351 + ];
  352 + $setNumModel->add($param);
  353 + }
  354 + }catch (\Exception $e){
  355 + Log::info('error file: ' . __CLASS__ . __FUNCTION__ . $e->getMessage());
  356 + $this->response('设置排序失败，请稍后重试',Code::SYSTEM_ERROR);
  357 + }
  358 + $this->response('success');
  359 + }
  360 +
  361 + /**
  362 + * @remark :获取排序
  363 + * @name :getProductSort
  364 + * @author :lyh
  365 + * @method :post
  366 + * @time :2024/1/31 10:24
  367 + */
  368 + public function getBlogSort(){
  369 + $setNumModel = new SettingNum();
  370 + $info = $setNumModel->read(['type'=>$setNumModel::TYPE_BLOG_SORT]);
  371 + if($info === false){
  372 + $info = [];
  373 + }else{
  374 + $info['data'] = json_decode($info['data']);
  375 + }
  376 + $this->response('success',Code::SUCCESS,$info);
  377 + }
326 } 378 }
@@ -19,6 +19,8 @@ use App\Models\RouteMap\RouteMap; @@ -19,6 +19,8 @@ use App\Models\RouteMap\RouteMap;
19 use App\Models\Template\BTemplate; 19 use App\Models\Template\BTemplate;
20 use App\Models\Template\Setting; 20 use App\Models\Template\Setting;
21 use App\Models\User\User; 21 use App\Models\User\User;
  22 +use App\Models\WebSetting\SettingNum;
  23 +use Illuminate\Support\Facades\Log;
22 24
23 class CustomModuleContentController extends BaseController 25 class CustomModuleContentController extends BaseController
24 { 26 {
@@ -267,4 +269,55 @@ class CustomModuleContentController extends BaseController @@ -267,4 +269,55 @@ class CustomModuleContentController extends BaseController
267 $data = $logic->copyModuleContentInfo(); 269 $data = $logic->copyModuleContentInfo();
268 $this->response('success',Code::SUCCESS,$data); 270 $this->response('success',Code::SUCCESS,$data);
269 } 271 }
  272 +
  273 + /**
  274 + * @remark :设置排序
  275 + * @name :setProductSort
  276 + * @author :lyh
  277 + * @method :post
  278 + * @time :2024/1/31 10:14
  279 + */
  280 + public function setCustomSort(){
  281 + $setNumModel = new SettingNum();
  282 + try {
  283 + if(isset($this->param['id']) && !empty($this->param['id'])){
  284 + //执行编辑
  285 + $param = [
  286 + 'data'=>json_encode($this->param['data']),
  287 + ];
  288 + $setNumModel->edit($param,['id'=>$this->param['id']]);
  289 + }else{
  290 + //执行新增
  291 + $param = [
  292 + 'type'=>$setNumModel::TYPE_CUSTOM_SORT,
  293 + 'num'=>$this->param['module_id'],
  294 + 'project_id'=>$this->user['project_id'],
  295 + 'data'=>json_encode($this->param['data']),
  296 + ];
  297 + $setNumModel->add($param);
  298 + }
  299 + }catch (\Exception $e){
  300 + Log::info('error file: ' . __CLASS__ . __FUNCTION__ . $e->getMessage());
  301 + $this->response('设置排序失败，请稍后重试',Code::SYSTEM_ERROR);
  302 + }
  303 + $this->response('success');
  304 + }
  305 +
  306 + /**
  307 + * @remark :获取排序
  308 + * @name :getProductSort
  309 + * @author :lyh
  310 + * @method :post
  311 + * @time :2024/1/31 10:24
  312 + */
  313 + public function getCustomSort(){
  314 + $setNumModel = new SettingNum();
  315 + $info = $setNumModel->read(['type'=>$setNumModel::TYPE_CUSTOM_SORT,'num'=>$this->param['module_id']]);
  316 + if($info === false){
  317 + $info = [];
  318 + }else{
  319 + $info['data'] = json_decode($info['data']);
  320 + }
  321 + $this->response('success',Code::SUCCESS,$info);
  322 + }
270 } 323 }
@@ -13,6 +13,8 @@ use App\Models\RouteMap\RouteMap; @@ -13,6 +13,8 @@ use App\Models\RouteMap\RouteMap;
13 use App\Models\Template\BTemplate; 13 use App\Models\Template\BTemplate;
14 use App\Models\Template\Setting; 14 use App\Models\Template\Setting;
15 use App\Models\User\User; 15 use App\Models\User\User;
  16 +use App\Models\WebSetting\SettingNum;
  17 +use Illuminate\Support\Facades\Log;
16 18
17 19
18 /** 20 /**
@@ -346,4 +348,55 @@ class NewsController extends BaseController @@ -346,4 +348,55 @@ class NewsController extends BaseController
346 $data = $news->copyNewsInfo(); 348 $data = $news->copyNewsInfo();
347 $this->response('success',Code::SUCCESS,$data); 349 $this->response('success',Code::SUCCESS,$data);
348 } 350 }
  351 +
  352 + /**
  353 + * @remark :设置排序
  354 + * @name :setProductSort
  355 + * @author :lyh
  356 + * @method :post
  357 + * @time :2024/1/31 10:14
  358 + */
  359 + public function setNewsSort(){
  360 + $setNumModel = new SettingNum();
  361 + try {
  362 + if(isset($this->param['id']) && !empty($this->param['id'])){
  363 + //执行编辑
  364 + $param = [
  365 + 'data'=>json_encode($this->param['data']),
  366 + ];
  367 + $setNumModel->edit($param,['id'=>$this->param['id']]);
  368 + }else{
  369 + //执行新增
  370 + $param = [
  371 + 'type'=>$setNumModel::TYPE_NEWS_SORT,
  372 + 'project_id'=>$this->user['project_id'],
  373 + 'data'=>json_encode($this->param['data']),
  374 + ];
  375 + $setNumModel->add($param);
  376 + }
  377 + }catch (\Exception $e){
  378 + Log::info('error file: ' . __CLASS__ . __FUNCTION__ . $e->getMessage());
  379 + $this->response('设置排序失败，请稍后重试',Code::SYSTEM_ERROR);
  380 + }
  381 + $this->response('success');
  382 + }
  383 +
  384 + /**
  385 + * @remark :获取排序
  386 + * @name :getProductSort
  387 + * @author :lyh
  388 + * @method :post
  389 + * @time :2024/1/31 10:24
  390 + */
  391 + public function getNewsSort(){
  392 + $setNumModel = new SettingNum();
  393 + $info = $setNumModel->read(['type'=>$setNumModel::TYPE_NEWS_SORT]);
  394 + if($info === false){
  395 + $info = [];
  396 + }else{
  397 + $info['data'] = json_decode($info['data']);
  398 + }
  399 + $this->response('success',Code::SUCCESS,$info);
  400 + }
  401 +
349 } 402 }
@@ -105,7 +105,7 @@ class RankDataLogic extends BaseLogic @@ -105,7 +105,7 @@ class RankDataLogic extends BaseLogic
105 'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day, 105 'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day,
106 'type' => $lang['type'] ?? 1, 106 'type' => $lang['type'] ?? 1,
107 'dabiao_day'=>$remain_day, 107 'dabiao_day'=>$remain_day,
108 - 'service_day' => $lang['service_day'] ?? 0, 108 + 'service_day' => $lang['service_day'] ?? 0,
109 ]; 109 ];
110 } 110 }
111 } 111 }
@@ -20,8 +20,10 @@ use App\Models\Base; @@ -20,8 +20,10 @@ use App\Models\Base;
20 */ 20 */
21 class SettingNum extends Base 21 class SettingNum extends Base
22 { 22 {
23 - const TYPE_PRODUCT_SORT = 10;//c端显示排序  
24 - 23 + const TYPE_PRODUCT_SORT = 10;//c端产品显示排序
  24 + const TYPE_NEWS_SORT = 11;//c端新闻显示排序
  25 + const TYPE_BLOG_SORT = 12;//c端博客显示排序
  26 + const TYPE_CUSTOM_SORT = 13;//c端扩展模块显示排序
25 protected $table = 'gl_setting_num'; 27 protected $table = 'gl_setting_num';
26 //连接数据库 28 //连接数据库
27 protected $connection = 'custom_mysql'; 29 protected $connection = 'custom_mysql';
@@ -71,17 +71,6 @@ Route::middleware(['bloginauth'])->group(function () { @@ -71,17 +71,6 @@ Route::middleware(['bloginauth'])->group(function () {
71 71
72 //新闻相关路由 72 //新闻相关路由
73 Route::prefix('news')->group(function () { 73 Route::prefix('news')->group(function () {
74 - //分类  
75 - Route::any('/category/', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');  
76 - Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'save'])->name('news_category_add');  
77 - Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('news_category_info');  
78 - Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'save'])->name('news_category_edit');  
79 - Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');  
80 - Route::any('/category/allSort', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'allSort'])->name('news_category_allSort');  
81 - Route::any('/category/copyCategory', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'copyCategory'])->name('news_category_copyCategory');  
82 - Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('news_category_status');  
83 - Route::any('/category/sort', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'sort'])->name('news_category_sort');  
84 - Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'categoryTopList'])->name('news_category_categoryTopList');  
85 //新闻 74 //新闻
86 Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists'); 75 Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists');
87 Route::any('/newsNoPage', [\App\Http\Controllers\Bside\News\NewsController::class, 'newsNoPage'])->name('news_newsNoPage'); 76 Route::any('/newsNoPage', [\App\Http\Controllers\Bside\News\NewsController::class, 'newsNoPage'])->name('news_newsNoPage');
@@ -98,6 +87,19 @@ Route::middleware(['bloginauth'])->group(function () { @@ -98,6 +87,19 @@ Route::middleware(['bloginauth'])->group(function () {
98 Route::any('/allSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'allSort'])->name('news_allSort'); 87 Route::any('/allSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'allSort'])->name('news_allSort');
99 Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\News\NewsController::class, 'batchSetCategory'])->name('news_batchSetCategory'); 88 Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\News\NewsController::class, 'batchSetCategory'])->name('news_batchSetCategory');
100 Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum'); 89 Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
  90 + Route::any('/setNewsSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'setNewsSort'])->name('news_setNewsSort');
  91 + Route::any('/getNewsSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'getNewsSort'])->name('news_getNewsSort');
  92 + //分类
  93 + Route::any('/category/', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
  94 + Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'save'])->name('news_category_add');
  95 + Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('news_category_info');
  96 + Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'save'])->name('news_category_edit');
  97 + Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
  98 + Route::any('/category/allSort', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'allSort'])->name('news_category_allSort');
  99 + Route::any('/category/copyCategory', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'copyCategory'])->name('news_category_copyCategory');
  100 + Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('news_category_status');
  101 + Route::any('/category/sort', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'sort'])->name('news_category_sort');
  102 + Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'categoryTopList'])->name('news_category_categoryTopList');
101 }); 103 });
102 104
103 //博客相关路由 105 //博客相关路由
@@ -116,6 +118,8 @@ Route::middleware(['bloginauth'])->group(function () { @@ -116,6 +118,8 @@ Route::middleware(['bloginauth'])->group(function () {
116 Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'batchSetCategory'])->name('blog_batchSetCategory'); 118 Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'batchSetCategory'])->name('blog_batchSetCategory');
117 Route::any('/copyBlog', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'copyBlog'])->name('blog_copyBlog'); 119 Route::any('/copyBlog', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'copyBlog'])->name('blog_copyBlog');
118 Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum'); 120 Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
  121 + Route::any('/setBlogSort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'setBlogSort'])->name('blog_setBlogSort');
  122 + Route::any('/getBlogSort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getBlogSort'])->name('blog_getBlogSort');
119 //分类 123 //分类
120 Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists'); 124 Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
121 Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_add'); 125 Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_add');
@@ -512,6 +516,8 @@ Route::middleware(['bloginauth'])->group(function () { @@ -512,6 +516,8 @@ Route::middleware(['bloginauth'])->group(function () {
512 Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'del'])->name('custom_content_del'); 516 Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'del'])->name('custom_content_del');
513 Route::any('/allSort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'allSort'])->name('custom_content_allSort'); 517 Route::any('/allSort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'allSort'])->name('custom_content_allSort');
514 Route::any('/copyModuleContent', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'copyModuleContent'])->name('custom_content_copyModuleContent'); 518 Route::any('/copyModuleContent', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'copyModuleContent'])->name('custom_content_copyModuleContent');
  519 + Route::any('/setCustomSort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'setCustomSort'])->name('custom_content_setCustomSort');
  520 + Route::any('/getCustomSort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'getCustomSort'])->name('custom_content_getCustomSort');
515 }); 521 });
516 522
517 Route::prefix('extend')->group(function () { 523 Route::prefix('extend')->group(function () {