周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 33af60525a73dd2b09690c360d8283e628d77e60 2 个父辈 c7ba33fc 850b9ddb

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

内嵌 并排对比
正在显示 5 个修改的文件 包含 18 行增加 和 19 行删除
... ... @@ -69,7 +69,7 @@ class ReplaceHtml extends Command
foreach ($replaceHtmlList as $v){
ProjectServer::useProject($v['project_id']);
echo '开始,任务id:'.$v['id'].PHP_EOL;
if($v['source'] == 9){//单页面
if(($v['source'] == 9) && ($v['is_custom'] == 0)){//单页面
$count = $this->createReplacePageHtmlLog($v);
}else{
$count = $this->createReplaceHtmlLog($v);
... ... @@ -334,7 +334,7 @@ class ReplaceHtml extends Command
}
if($is_list == BTemplate::IS_LIST){
$categoryModel = new CustomModuleCategory();
$cateInfo = $categoryModel->read(['id'=>$source_id],['id','name']);
$cateInfo = $categoryModel->read(['id'=>$source_id],['id','name','route']);
if($cateInfo === false){
return false;
}
... ... @@ -342,7 +342,7 @@ class ReplaceHtml extends Command
$route = $cateInfo['route'];
}else{
$contentModel = new CustomModuleContent();
$contentInfo = $contentModel->read(['id'=>$source_id],['id','name']);
$contentInfo = $contentModel->read(['id'=>$source_id],['id','name','route']);
if($contentInfo === false){
return false;
}
... ...
... ... @@ -33,30 +33,26 @@ class SyncImage extends Command
// public function handle(){
// $str = $this->getProjectConfig(501);
// $str = $this->getProjectConfig(1808);
// $imageModel = new Image();
// $lists = $imageModel->list(['project_id'=>501]);
// $str_image = '/upload/p/1808/image_product/2024-09/ppp.png,/upload/p/1808/image_product/2024-09/86e4866b-7432-40c1-8c06-d335cd736e29.png,/upload/p/1808/image_product/2024-09/7fd109cc-56f4-457c-a9c4-c3fa8d8195b2.png,/upload/p/1808/image_product/2024-09/1.png,/upload/p/1808/image_product/2024-08/bxb12501-3-1.png,/upload/p/1808/image_product/2024-08/bxa10801-3-1.png,/upload/p/1808/image_product/2024-08/bxa007-3-1.png,/upload/p/1808/image_product/2024-08/auto-parts-rectifier-bxf1070-for-alternator-1-1.png,/upload/p/1808/image_product/2024-08/auto-parts-rectifier-bxd1102-for-alternator-2-1.png,/upload/p/1808/image_product/2024-08/11407-3-1.png,/upload/p/1808/image_product/2024-07/gfjty.jpg,/upload/p/1808/image_product/2024-07/bxn11508-g1-2.png,/upload/p/1808/image_product/2024-07/bxn11508-g1-1.png,/upload/p/1808/image_product/2024-07/bxb12501-2.png,/upload/p/1808/image_product/2024-07/bxb12501-1.png,/upload/p/1808/image_product/2024-07/bxb1209-2.png,/upload/p/1808/image_product/2024-07/bxb1209-1.png,/upload/p/1808/image_product/2024-07/bxa10801-2.png,/upload/p/1808/image_product/2024-07/bxa10801-1.png,/upload/p/1808/image_product/2024-07/bxa007-2.png,/upload/p/1808/image_product/2024-07/bxa007-1.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxf6102-for-alternator-2.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxf1070-for-alternator-3.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxf1070-for-alternator-2.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxd9410-for-alternator-1.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxd1102-for-alternator-3.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxd1102-for-alternator-1.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxb12807-for-alternator-2.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxb12807-for-alternator-1.png,/upload/p/1808/image_product/2024-07/11407-2.png,/upload/p/1808/image_product/2024-07/11407-1.png';
// $lists = explode(',',$str_image);
// $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
// foreach ($lists as $k => $v){
// if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){
// continue;
// }
// $url = $domain . $v['path'].'?'.$str;
// echo date('Y-m-d H:i:s') . '水印路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
// $this->coverOriginalImage($url,$v['path']);
// foreach ($lists as $v){
// $url = $domain . $v.'?'.$str;
// echo date('Y-m-d H:i:s') . '水印路径:'. $url . PHP_EOL;
// $cdu_url = $this->coverOriginalImage($url,$v);
// echo date('Y-m-d H:i:s') . '返回的url:'. $cdu_url . PHP_EOL;
// }
// return true;
// }
public function handle(){
$data = [];
$domain = 'https://ecdn6-nc.globalso.com/';
$domain = 'https://ecdn6.globalso.com/';
$imageModel = new Image();
$lists = $imageModel->list(['project_id'=>501]);
$lists = $imageModel->list(['project_id'=>1808]);
foreach ($lists as $k => $v){
if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){
continue;
}
$url = $domain . $v['path'];
echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
$data[] = $url;
... ...
... ... @@ -84,7 +84,7 @@ class OperationHeartbeatController extends BaseController
if($info === false){
$info = [];
}else{
$date_time = strtotime($info['updated_at']) + 7200;
$date_time = strtotime($info['updated_at']) + 120;
if($date_time < time()){
$operationHeartbeatModel->edit(['status'=>0,'ip'=>'127.0.0.1'],$condition);
$info['status'] = 0;
... ...
... ... @@ -69,7 +69,7 @@ class ReplaceHtmlLogic extends BaseLogic
*/
public function getCustomTemplateId($typeInfo,$template_id){
$customModuleModel = new CustomModule();
$moduleInfo = $customModuleModel->read(['id'=>$typeInfo['type']],['list_customized','detail_customized']);
$moduleInfo = $customModuleModel->read(['id'=>$typeInfo['source']],['list_customized','detail_customized']);
if($moduleInfo === false){
$this->fail('当前扩展模块不存在或已被删除');
}
... ...
... ... @@ -350,6 +350,8 @@ class ProductLogic extends BaseLogic
DB::connection('custom_mysql')->beginTransaction();
try {
$cateRelate = new CategoryRelated();
//删除扩展字段
$extendInfoModel = new ExtendInfo();
foreach ($this->param['ids'] as $id) {
$info = $this->model->read(['id'=>$id],['id','status']);
if($info['status'] == Product::STATUS_RECYCLE){
... ... @@ -359,6 +361,7 @@ class ProductLogic extends BaseLogic
$this->model->del(['id'=>$id]);
//删除关联表
$cateRelate->del(['product_id'=>$id]);
$extendInfoModel->del(['product_id'=>$id]);
}else{
//回收站
$this->model->edit(['status'=>Product::STATUS_RECYCLE],['id'=>$id]);
... ...