周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 c31687d1d888a2fb275fda8d86e397f97954912c 2 个父辈 09cbe497 5e37c473

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 7 个修改的文件 包含 113 行增加 和 54 行删除
... ... @@ -53,41 +53,73 @@ class UpdateRoute extends Command
* @time :2023/11/20 15:13
*/
public function handle(){
// $projectModel = new Project();
// $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]);
// foreach ($list as $v){
ProjectServer::useProject(197);
$projectModel = new Project();
$list = $projectModel->list(['id'=>['in',[518,241]],'is_upgrade'=>0]);
foreach ($list as $v){
echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
ProjectServer::useProject($v['id']);
$this->getProduct();
$this->setProductKeyword();
DB::disconnect('custom_mysql');
// }
}
echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
}
/**
* @remark :产品关键字
* @remark :写入
* @name :getProductKeyword
* @author :lyh
* @method :post
* @time :2023/12/8 11:13
* @time :2023/12/21 14:37
*/
public function getProductKeyword(){
public function setProductKeyword(){
$keywordModel = new Keyword();
$lists = $keywordModel->list(['status'=>1,'route'=>'']);
$lists = $keywordModel->list();
if(!empty($lists)){
foreach ($lists as $v){
if(!empty($v['route'])){
$tag = "-tag";
if (!(substr($v['route'], -strlen($tag)) === $tag)) {
echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
$route = $v['route'].$tag;
// 如果不是以 '-tag' 结尾，则拼接上 '-tag'
$routeModel = new RouteMap();
$routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
$route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
$keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
echo date('Y-m-d H:i:s') . 'end'.$v['id'] . PHP_EOL;
}
}else{
echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
$route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
$keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
}
echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
}
}
}
/**
* @remark :产品关键字
* @name :getProductKeyword
* @author :lyh
* @method :post
* @time :2023/12/8 11:13
*/
// public function getProductKeyword(){
// $keywordModel = new Keyword();
// $lists = $keywordModel->list(['status'=>1,'route'=>'']);
// if(!empty($lists)){
// foreach ($lists as $v){
// $tag = "-tag";
// if (!(substr($v['route'], -strlen($tag)) === $tag)) {
// echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
// $route = $v['route'].$tag;
// // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
// $routeModel = new RouteMap();
// $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
// echo date('Y-m-d H:i:s') . 'end'.$v['id'] . PHP_EOL;
// }
// }
// }
// }
public function getProduct(){
$productModel = new Product();
... ... @@ -106,35 +138,7 @@ class UpdateRoute extends Command
}
}
/**
* @remark :写入
* @name :getProductKeyword
* @author :lyh
* @method :post
* @time :2023/12/21 14:37
*/
public function setProductKeyword(){
$keywordModel = new Keyword();
$lists = $keywordModel->list();
if(!empty($lists)){
foreach ($lists as $v){
if(!empty($v['route'])){
$tag = "-tag";
if (!(substr($v['route'], -strlen($tag)) === $tag)) {
$route = $v['route'].$tag;
// 如果不是以 '-tag' 结尾，则拼接上 '-tag'
$route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
$keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
}
}else{
echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
$route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
$keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
}
echo date('Y-m-d H:i:s') . 'end :'.$route . PHP_EOL;
}
}
}
/**
* @remark :删除路由通知C端
... ...
... ... @@ -102,12 +102,12 @@ class MailController extends BaseController
$arr[] = $v['mail_id'];
}
$mailModel = new MailModel();
$mail_list = $mailModel->list(['id'=>['not in',$arr],'user_list'=>['like',','.$this->user['id'].',']]);
$mail_list = $mailModel->list(['id'=>['not in',$arr],'user_list'=>['like','%,'.$this->user['id'].',%']]);
$data = [];
foreach ($mail_list as $k => $v){
foreach ($mail_list as $k1 => $v1){
$data[] = [
'user_id'=>$this->user['id'],
'mail_id'=>$v['id'],
'mail_id'=>$v1['id'],
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
... ...
... ... @@ -69,6 +69,9 @@ class NavController extends BaseController
if (empty($detailsList[$val['id']])){
continue;
}
if(!empty($detailsList[$val['id']]['sub']) && is_array($detailsList[$val['id']]['sub'])){
$detailsList[$val['id']]['sub'] = $this->handleDetailsSub($detailsList[$val['id']]['sub']);
}
$result[] = $detailsList[$val['id']];
unset($detailsList[$val['id']]);
}
... ... @@ -76,6 +79,19 @@ class NavController extends BaseController
return $this->success($result);
}
/**
* @remark :处理子集
* @name :handleDetailsSub
* @author :lyh
* @method :post
* @time :2023/12/21 16:36
*/
public function handleDetailsSub($detailsList){
if(!empty($detailsList['sub']) && is_array($detailsList['sub'])){
$detailsList['sub'] = $this->handleDetailsSub($detailsList['sub']);
}
return array_merge($detailsList);
}
/**
* @remark :根据id组装数据
... ...
... ... @@ -32,11 +32,8 @@ class KeywordController extends BaseController
*/
public function index(Keyword $keyword)
{
if(!empty($this->map['title'])){
$this->map['title'] = ['like','%'.$this->map['title'].'%'];
}
$this->map['project_id'] = $this->user['project_id'];
$filed = ['id', 'project_id', 'title', 'seo_title', 'seo_keywords', 'seo_description', 'status', 'created_at','route'];
$this->map = $this->searchParam($this->map);
$filed = ['id', 'project_id', 'title', 'seo_title', 'seo_keywords', 'seo_description', 'status', 'created_at','route','keyword_title'];
$data = $keyword->lists($this->map,$this->page,$this->row,$this->order,$filed);
if(!empty($data)){
foreach ($data['list'] as &$v){
... ... @@ -53,6 +50,24 @@ class KeywordController extends BaseController
}
/**
* @remark :搜索
* @name :searchParam
* @author :lyh
* @method :post
* @time :2023/12/21 17:40
*/
public function searchParam($map){
if(!empty($map['title'])){
$map['title'] = ['like','%'.$map['title'].'%'];
}
if(!empty($map['keyword_title'])){
$map['keyword_title'] = ['like','%'.$map['keyword_title'].'%'];
}
$map['project_id'] = $this->user['project_id'];
return $this->success($map);
}
/**
* @remark :获取数据详情
* @name :info
* @author :lyh
... ...
... ... @@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\BTemplate;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\Blog\Blog;
use App\Models\Blog\BlogCategory;
use App\Models\CustomModule\CustomModule;
use App\Models\News\News;
use App\Models\News\NewsCategory;
use App\Models\Product\Category;
... ... @@ -690,10 +691,26 @@ class BTemplateLogic extends BaseLogic
if (!empty($blogCategory)){
foreach ($blogCategory as $item){$data["blogs"]["category"][] =$item;}
}
//返回
return $this->success($data);
}
public function getModuleTypes(){
$data['module'] = ['默认','产品','新闻','博客','产品分类'];
$data = [
['id'=>'0',"name"=>'默认','category'=>[["id"=>"all", "title"=>"全部"], ["id"=>"hot", "title"=>"热销产品",], ["id"=>"recommend", "title"=>"推荐产品",]]],
['id'=>'1',"name"=>'产品','category'=>[]],
['id'=>'2',"name"=>'新闻','category'=>[]],
['id'=>'3',"name"=>'博客','category'=>[]],
['id'=>'4','name'=>'产品分类','category'=>[]],
];
//获取当前项目的扩展模块
$moduleModel = new CustomModule();
$moduleList = $moduleModel->list(['status'=>0]);
foreach ($moduleList as $v){
$data[] = ['id'=>'custom-'.$v['id'],'name'=>$v['name'],'category'=>[]];
}
}
/**
* @remark :获取1级+2级
* @name :getCategoryList
... ...
... ... @@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\Product;
use App\Exceptions\BsideGlobalException;
use App\Helper\Arr;
use App\Helper\Common;
use App\Helper\Translate;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\News\News;
use App\Models\Product\Keyword;
... ... @@ -136,8 +137,12 @@ class KeywordLogic extends BaseLogic
* @time :2023/8/28 14:03
*/
public function batchAdd(){
$route_array = Translate::tran($this->param['title'], 'en');
if (empty($route_array)) {
$this->fail('路由生成失败，请稍后重试！');
}
try {
foreach ($this->param['title'] as $v){
foreach ($this->param['title'] as $k=>$v){
$this->model = new Keyword();
$info = $this->model->read(['title'=>$v]);
if($info === false){
... ... @@ -146,7 +151,7 @@ class KeywordLogic extends BaseLogic
$param['updated_at'] = $param['created_at'];
$param['title'] = $v;
$id = $this->model->insertGetId($param);
$route = RouteMap::setRoute($v, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
$route = RouteMap::setRoute($route_array[$k], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
// $this->curlDelRoute(['new_route'=>$route]);
$this->model->edit(['route'=>$route],['id'=>$id]);
}
... ...
... ... @@ -54,7 +54,9 @@ class RouteMap extends Base
* @date 2023/4/17
*/
public static function generateRoute($title, $source, $source_id, $project_id){
if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
$title = Translate::tran($title, 'en');
}
$i=1;
$sign = generateRoute($title);
$info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
... ... @@ -116,7 +118,7 @@ class RouteMap extends Base
public static function setRoute($title, $source, $source_id, $project_id = 0){
$route = self::generateRoute($title, $source, $source_id, $project_id);
if(!$route){
throw new \Exception('路由不能为空');
throw new \Exception('路由生成失败');
}
try {
$route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
... ...