周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 1a4cf07268724ec378400c95ac233d67512dad6a 2 个父辈 190357f4 25a6120e

gx

内嵌 并排对比
正在显示 7 个修改的文件 包含 64 行增加 和 11 行删除
... ... @@ -96,12 +96,30 @@ class UpdateController extends BaseController
try {
if($this->param['old_collect'] == 1){
//现有数据需要重新采集页面
$collect_routes = '';
if(isset($this->param['collect_routes'])){
//填写了采集路由
$routes_arr = explode(',',$this->param['collect_routes']);
foreach ($routes_arr as &$route){
$route = "'".$route."'";
}
$collect_routes = implode(',',$routes_arr);
}
DB::connection('custom_mysql')->statement("DELETE FROM `gl_collect_source` WHERE `origin` LIKE '%.css%' OR `origin` LIKE '%.js%'");
if ($domain_info) {
//已上线项目
DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $test_domain . "' WHERE `language` = ''");
if($collect_routes){
DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $test_domain . "' WHERE `language` = '' AND `route` IN (".$collect_routes.")");
}else{
DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $test_domain . "' WHERE `language` = ''");
}
} else {
DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''");
if($collect_routes){
DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = '' AND `route` IN (".$collect_routes.")");
}else{
DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''");
}
}
}
... ...
... ... @@ -170,4 +170,29 @@ class BTemplateController extends BaseController
$info = $bTemplateModel->sourceMap();
$this->response('success',Code::SUCCESS,$info);
}
/**
* @remark :替换同一种类型的html代码
* @name :replaceTemplateMainHtml
* @author :lyh
* @method :post
* @time :2024/5/7 14:39
*/
public function replaceTemplateMainHtml(BTemplateLogic $BTemplateLogic){
$this->request->validate([
'old_html'=>'required',
'html'=>'required',
'type'=>'required',
'is_custom'=>'required',
'is_list'=>'required',
],[
'old_html.required' => '需替换的html不能为空',
'html.required' => 'html不能为空',
'type.required' => '类型type不能为空',
'is_custom.required' => '类型is_custom不能为空',
'is_list.required' => '类型is_list不能为空',
]);
$BTemplateLogic->replaceHtml();
$this->response('success');
}
}
... ...
... ... @@ -165,14 +165,16 @@ class FileController
*/
public function getOnlyFilename($name,$project_id = 0){
$nameArr = explode('.',$name);
$enName = generateRoute(Translate::tran($nameArr[0], 'en'));
$suffix = array_pop($nameArr) ?? 'jpg';
$nameStr = implode('-', $nameArr);
$enName = generateRoute(Translate::tran($nameStr, 'en'));
$fileName = $enName;
$i=1;
while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
while($this->onlyName($enName.'.'.$suffix,$project_id)){
$enName = $fileName .'-'.$i;
$i++;
}
return $enName.'.'.$nameArr[1];
return $enName.'.'.$suffix;
}
/**
... ...
... ... @@ -224,15 +224,18 @@ class ImageController extends Controller
* @time :2024/4/26 16:10
*/
public function getOnlyFilename($name,$project_id = 0){
$nameArr = explode('.',$name);
$enName = generateRoute(Translate::tran($nameArr[0], 'en'));
$suffix = array_pop($nameArr) ?? 'jpg';
$nameStr = implode('-', $nameArr);
$enName = generateRoute(Translate::tran($nameStr, 'en'));
$fileName = $enName;
$i=1;
while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
while($this->onlyName($enName.'.'.$suffix,$project_id)){
$enName = $fileName .'-'.$i;
$i++;
}
return $enName.'.'.$nameArr[1];
return $enName.'.'.$suffix;
}
/**
... ...
... ... @@ -917,6 +917,7 @@ class BTemplateLogic extends BaseLogic
}
/**
<<<<<<< HEAD
* @remark :定制页面头部类型---根据source获取type类型
* @name :getType
* @author :lyh
... ...
... ... @@ -158,7 +158,9 @@ class UserLoginLogic
$info['aicc'] = $project['aicc'] ?? '';
$info['hagro'] = $project['hagro'] ?? '';
$info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
$info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
$info['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
$info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
$info['is_customized'] = $project['is_customized'];
$info['is_upload_manage'] = $project['is_upload_manage'];
$info['is_upgrade'] = $project['is_upgrade'];
... ... @@ -258,8 +260,9 @@ class UserLoginLogic
$info['hagro'] = $project['hagro'] ?? '';
$info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
$info['is_domain'] = empty($project['deploy_optimize']['domain']) ? 0 : 1;
$info['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
$info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
$info['is_customized'] = $project['is_customized'];
$info['is_upgrade'] = $project['is_upgrade'];
$info['is_upload_manage'] = $project['is_upload_manage'];
... ...
... ... @@ -52,7 +52,8 @@ class NavRequest extends FormRequest
'name.required' => '名称必须',
'name.max' => '名称不能超过100个字符',
'url.required' => '链接不能为空',
'remark.max' => '描述最长为500字符',
'remark.max' => '描述超过最长500字符',
];
}
}
... ...