周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 4191e6c0cbb978abd2ef4b19dac232b4af78d4e9 2 个父辈 4bb808ab 3a5df90a

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

内嵌 并排对比
正在显示 5 个修改的文件 包含 86 行增加 和 34 行删除
... ... @@ -149,6 +149,11 @@ class ProjectUpdate extends Command
foreach ($items as $item) {
$route = $this->get_url_route($item['url'] ?? '');
if ($route) {
//判断路由是否存在
$route_info = RouteMap::where('project_id', $project_id)->where('route', $route)->where('path', '')->first();
if ($route_info) {
continue;
}
$keyword = $model->read(['route' => $route], 'id');
if (!$keyword) {
try {
... ...
... ... @@ -59,11 +59,11 @@ class UpdateMainHtml extends Command
*/
public function handle(){
$projectModel = new Project();
$list = $projectModel->list(['id'=>99]);
$list = $projectModel->list(['id'=>223]);
foreach ($list as $v){
echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
ProjectServer::useProject($v['id']);
$this->editRoute();
$this->setBlogCustomContent();
DB::disconnect('custom_mysql');
}
echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
... ... @@ -85,8 +85,8 @@ class UpdateMainHtml extends Command
$data[] = [
'name'=>$v['name'],
'route'=>$v['alias'],
'project_id'=>99,
'operator_id'=>366,
'project_id'=>223,
'operator_id'=>569,
'seo_title'=>$v['seo_title'],
'seo_keywords'=>$v['seo_keywords'],
'seo_description'=>$v['seo_des'],
... ... @@ -118,8 +118,8 @@ class UpdateMainHtml extends Command
'remark'=>$v['remark'],
'route'=>$v['url'],
'image'=>$v['image'],
'project_id'=>99,
'operator_id'=>366,
'project_id'=>223,
'operator_id'=>569,
'seo_title'=>$v['seo_title'],
'seo_keywords'=>$v['seo_keywords'],
'seo_description'=>$v['seo_description'],
... ...
... ... @@ -51,14 +51,14 @@ class UpdateRoute extends Command
*/
public function handle(){
$projectModel = new Project();
$list = $projectModel->list(['id'=>475]);
$list = $projectModel->list(['id'=>183]);
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();
$this->setProductKeyword();
// $this->getRouteMap();
$this->getProductCategory();
// $this->getProductCategory();
DB::disconnect('custom_mysql');
}
echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
... ... @@ -101,24 +101,24 @@ class UpdateRoute extends Command
* @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 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();
... ...
... ... @@ -49,12 +49,15 @@ class CustomModuleLogic extends BaseLogic
* @time :2023/12/4 15:47
*/
public function customModuleSave(){
ProjectServer::useProject($this->param['project_id']);
$this->param = $this->handleParam($this->param);
$this->checkIsName($this->param['name'],$this->param['id'] ?? 0);
if(isset($this->param['id']) && !empty($this->param['id'])){
$this->moduleEdit();
}else{
$this->moduleAdd();
}
DB::disconnect('custom_mysql');
return $this->success();
}
... ... @@ -81,12 +84,10 @@ class CustomModuleLogic extends BaseLogic
* @time :2023/12/5 9:39
*/
public function moduleAdd(){
ProjectServer::useProject($this->param['project_id']);
$rs = (new CustomModule())->add($this->param);
if($rs === false){
$this->fail('系统错误，请联系管理员');
}
DB::disconnect('custom_mysql');
return $this->success();
}
... ... @@ -98,16 +99,32 @@ class CustomModuleLogic extends BaseLogic
* @time :2023/12/5 9:39
*/
public function moduleEdit(){
ProjectServer::useProject($this->param['project_id']);
$rs = (new CustomModule())->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->fail('系统错误，请联系管理员');
}
DB::disconnect('custom_mysql');
return $this->success();
}
/**
* @remark :验证名称是否存在
* @name :checkIsName
* @author :lyh
* @method :post
* @time :2024/1/6 14:06
*/
public function checkIsName($name,$id = 0){
$param['name'] = $name;
if(!empty($id)){
$param['id'] = ['id'=>['!=',$id],];
}
$info = (new CustomModule())->read($param);
if($info !== false){
$this->fail('当前名称已存在');
}
return $this->success();
}
/**
* @remark :删除数据
* @name :ModuleDel
* @author :lyh
... ...
... ... @@ -148,14 +148,16 @@ class KeywordLogic extends BaseLogic
$this->model = new Keyword();
$info = $this->model->read(['title'=>$v]);
if($info === false){
$route = $this->specialRouteCheck($v);
$param['project_id'] = $this->user['project_id'];
$param['created_at'] = date('Y-m-d H:i:s');
$param['updated_at'] = $param['created_at'];
$param['title'] = $v;
$param['route'] = $route;
$id = $this->model->insertGetId($param);
$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]);
$route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
//// $this->curlDelRoute(['new_route'=>$route]);
// $this->model->edit(['route'=>$route],['id'=>$id]);
}
}
}catch (\Exception $e){
... ... @@ -165,6 +167,32 @@ class KeywordLogic extends BaseLogic
}
/**
* @remark :
* @name :specialRouteCheck
* @author :lyh
* @method :post
* @time :2024/1/6 14:50
*/
public function specialRouteCheck($title)
{
if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
$title = Translate::tran($title, 'en');
}
$suffix = '-tag';
$i = 1;
$sign = generateRoute($title);
$route = $sign . $suffix;
resetRoute:
$log = RouteMap::getRouteInfo($route, $this->user['project_id']);
if ($log) {
$route = $sign .'-'.$i.$suffix;
$i++;
goto resetRoute;
}
return $route;
}
/**
* @remark :删除标签
* @name :keywordDelete
* @author :lyh
... ... @@ -199,7 +227,9 @@ class KeywordLogic extends BaseLogic
RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
//生成一条删除路由记录
$info = $this->model->read(['id'=>$id],['id','route']);
if($info !== false){
$this->curlDelRoute(['route'=>$info['route']]);
}
return $this->success();
}
... ...