正在显示
7 个修改的文件
包含
30 行增加
和
13 行删除
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | use App\Models\File\Image; | 3 | use App\Models\File\Image; |
| 4 | +use App\Models\RouteMap\RouteMap; | ||
| 4 | use App\Services\CosService; | 5 | use App\Services\CosService; |
| 5 | use App\Utils\EncryptUtils; | 6 | use App\Utils\EncryptUtils; |
| 6 | use App\Utils\LogUtils; | 7 | use App\Utils\LogUtils; |
| @@ -560,3 +561,24 @@ function ends_with($string, $suffix) | @@ -560,3 +561,24 @@ function ends_with($string, $suffix) | ||
| 560 | { | 561 | { |
| 561 | return substr($string, -strlen($suffix)) === $suffix; | 562 | return substr($string, -strlen($suffix)) === $suffix; |
| 562 | } | 563 | } |
| 564 | + | ||
| 565 | +/** | ||
| 566 | + * @remark :获取二级路由 | ||
| 567 | + * @name :getRouteMap | ||
| 568 | + * @author :lyh | ||
| 569 | + * @method :post | ||
| 570 | + * @time :2023/11/10 14:29 | ||
| 571 | + */ | ||
| 572 | +function getRouteMap($source,$source_id){ | ||
| 573 | + $route = ''; | ||
| 574 | + $routeMapModel = new RouteMap(); | ||
| 575 | + $info = $routeMapModel->read(['source'=>$source,'source_id'=>$source_id]); | ||
| 576 | + if($info !== false){ | ||
| 577 | + if(!empty($info['path'])){ | ||
| 578 | + $route = $info['path'].'/'.$info['route']; | ||
| 579 | + }else{ | ||
| 580 | + $route = $info['route']; | ||
| 581 | + } | ||
| 582 | + } | ||
| 583 | + return $route; | ||
| 584 | +} |
| @@ -27,7 +27,7 @@ class BlogCategoryController extends BaseController | @@ -27,7 +27,7 @@ class BlogCategoryController extends BaseController | ||
| 27 | $blogModel = new BlogModel(); | 27 | $blogModel = new BlogModel(); |
| 28 | foreach ($lists as $k => $v){ | 28 | foreach ($lists as $k => $v){ |
| 29 | $v['num'] = $blogModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count(); | 29 | $v['num'] = $blogModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count(); |
| 30 | - $v['url'] = $this->user['domain'] . $v['alias'].'/'; | 30 | + $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_BLOG_CATE,$v['id']); |
| 31 | $lists[$k] = $v; | 31 | $lists[$k] = $v; |
| 32 | } | 32 | } |
| 33 | if(!isset($this->map['name'])){ | 33 | if(!isset($this->map['name'])){ |
| @@ -81,7 +81,6 @@ class BlogCategoryController extends BaseController | @@ -81,7 +81,6 @@ class BlogCategoryController extends BaseController | ||
| 81 | 'id.required' => 'ID不能为空' | 81 | 'id.required' => 'ID不能为空' |
| 82 | ]); | 82 | ]); |
| 83 | $info = $blogCategoryLogic->info_blog_category(); | 83 | $info = $blogCategoryLogic->info_blog_category(); |
| 84 | - $info['url'] = $this->user['domain'] . $info['alias']; | ||
| 85 | $this->response('success',Code::SUCCESS,$info); | 84 | $this->response('success',Code::SUCCESS,$info); |
| 86 | } | 85 | } |
| 87 | 86 |
| @@ -10,6 +10,7 @@ use App\Models\Blog\Blog as BlogModel; | @@ -10,6 +10,7 @@ use App\Models\Blog\Blog as BlogModel; | ||
| 10 | use App\Models\Blog\BlogCategory; | 10 | use App\Models\Blog\BlogCategory; |
| 11 | use App\Models\Blog\BlogCategory as BlogCategoryModel; | 11 | use App\Models\Blog\BlogCategory as BlogCategoryModel; |
| 12 | use App\Models\Product\Category; | 12 | use App\Models\Product\Category; |
| 13 | +use App\Models\RouteMap\RouteMap; | ||
| 13 | use App\Models\User\User; | 14 | use App\Models\User\User; |
| 14 | 15 | ||
| 15 | class BlogController extends BaseController | 16 | class BlogController extends BaseController |
| @@ -35,7 +36,7 @@ class BlogController extends BaseController | @@ -35,7 +36,7 @@ class BlogController extends BaseController | ||
| 35 | $user = new User(); | 36 | $user = new User(); |
| 36 | foreach ($lists['list'] as $k => $v){ | 37 | foreach ($lists['list'] as $k => $v){ |
| 37 | $v['category_name'] = $this->categoryName($v['category_id'],$data); | 38 | $v['category_name'] = $this->categoryName($v['category_id'],$data); |
| 38 | - $v['url'] = $this->user['domain'] .$v['url'].'/'; | 39 | + $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_BLOG,$v['id']); |
| 39 | $v['image_link'] = getImageUrl($v['image']); | 40 | $v['image_link'] = getImageUrl($v['image']); |
| 40 | $v['operator_name'] = $user->getName($v['operator_id']); | 41 | $v['operator_name'] = $user->getName($v['operator_id']); |
| 41 | $lists['list'][$k] = $v; | 42 | $lists['list'][$k] = $v; |
| @@ -27,7 +27,7 @@ class NewsCategoryController extends BaseController | @@ -27,7 +27,7 @@ class NewsCategoryController extends BaseController | ||
| 27 | $newsModel = new NewsModel(); | 27 | $newsModel = new NewsModel(); |
| 28 | foreach ($lists as $k => $v){ | 28 | foreach ($lists as $k => $v){ |
| 29 | $v['num'] = $newsModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count(); | 29 | $v['num'] = $newsModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count(); |
| 30 | - $v['url'] = $this->user['domain'] . $v['alias'].'/'; | 30 | + $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS_CATE,$v['id']); |
| 31 | $lists[$k] = $v; | 31 | $lists[$k] = $v; |
| 32 | } | 32 | } |
| 33 | if(!isset($this->map['name'])){ | 33 | if(!isset($this->map['name'])){ |
| @@ -8,6 +8,7 @@ use App\Http\Logic\Bside\News\NewsLogic; | @@ -8,6 +8,7 @@ use App\Http\Logic\Bside\News\NewsLogic; | ||
| 8 | use App\Http\Requests\Bside\News\NewsRequest; | 8 | use App\Http\Requests\Bside\News\NewsRequest; |
| 9 | use App\Models\News\News as NewsModel; | 9 | use App\Models\News\News as NewsModel; |
| 10 | use App\Models\News\NewsCategory; | 10 | use App\Models\News\NewsCategory; |
| 11 | +use App\Models\RouteMap\RouteMap; | ||
| 11 | use App\Models\User\User; | 12 | use App\Models\User\User; |
| 12 | 13 | ||
| 13 | 14 | ||
| @@ -35,7 +36,7 @@ class NewsController extends BaseController | @@ -35,7 +36,7 @@ class NewsController extends BaseController | ||
| 35 | $user = new User(); | 36 | $user = new User(); |
| 36 | foreach ($lists['list'] as $k => $v){ | 37 | foreach ($lists['list'] as $k => $v){ |
| 37 | $v['category_name'] = $this->categoryName($v['category_id'],$data); | 38 | $v['category_name'] = $this->categoryName($v['category_id'],$data); |
| 38 | - $v['url'] = $this->user['domain'] .$v['url'].'/'; | 39 | + $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']); |
| 39 | $v['image_link'] = getImageUrl($v['image']); | 40 | $v['image_link'] = getImageUrl($v['image']); |
| 40 | $v['operator_name'] = $user->getName($v['operator_id']); | 41 | $v['operator_name'] = $user->getName($v['operator_id']); |
| 41 | $lists['list'][$k] = $v; | 42 | $lists['list'][$k] = $v; |
| @@ -44,6 +45,8 @@ class NewsController extends BaseController | @@ -44,6 +45,8 @@ class NewsController extends BaseController | ||
| 44 | $this->response('success',Code::SUCCESS,$lists); | 45 | $this->response('success',Code::SUCCESS,$lists); |
| 45 | } | 46 | } |
| 46 | 47 | ||
| 48 | + | ||
| 49 | + | ||
| 47 | /** | 50 | /** |
| 48 | * @remark :处理列表返回参数 | 51 | * @remark :处理列表返回参数 |
| 49 | * @name :handleReturnParam | 52 | * @name :handleReturnParam |
| @@ -181,10 +181,6 @@ class CustomTemplateLogic extends BaseLogic | @@ -181,10 +181,6 @@ class CustomTemplateLogic extends BaseLogic | ||
| 181 | 'route'=>$info['url'], | 181 | 'route'=>$info['url'], |
| 182 | ]; | 182 | ]; |
| 183 | $this->setRouteDeleteSave($data); | 183 | $this->setRouteDeleteSave($data); |
| 184 | - //"字符串以\"-product\"结尾" | ||
| 185 | - if (!ends_with($route, "-tag")) { | ||
| 186 | - $route = $route."-tag"; | ||
| 187 | - } | ||
| 188 | } | 184 | } |
| 189 | return $route; | 185 | return $route; |
| 190 | } | 186 | } |
| @@ -215,10 +215,6 @@ class ProductLogic extends BaseLogic | @@ -215,10 +215,6 @@ class ProductLogic extends BaseLogic | ||
| 215 | 'route'=>$route, | 215 | 'route'=>$route, |
| 216 | ]; | 216 | ]; |
| 217 | $this->setRouteDeleteSave($data); | 217 | $this->setRouteDeleteSave($data); |
| 218 | - //"字符串以\"-product\"结尾" | ||
| 219 | - if (!ends_with($route, "-product")) { | ||
| 220 | - $route = $route."-product"; | ||
| 221 | - } | ||
| 222 | } | 218 | } |
| 223 | return $route; | 219 | return $route; |
| 224 | } | 220 | } |
-
请 注册 或 登录 后发表评论