周海龙 / globalso · 提交

转到一个项目

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

gx

内嵌 并排对比
正在显示 7 个修改的文件 包含 64 行增加 和 11 行删除
@@ -96,12 +96,30 @@ class UpdateController extends BaseController @@ -96,12 +96,30 @@ class UpdateController extends BaseController
96 try { 96 try {
97 if($this->param['old_collect'] == 1){ 97 if($this->param['old_collect'] == 1){
98 //现有数据需要重新采集页面 98 //现有数据需要重新采集页面
  99 + $collect_routes = '';
  100 + if(isset($this->param['collect_routes'])){
  101 + //填写了采集路由
  102 + $routes_arr = explode(',',$this->param['collect_routes']);
  103 + foreach ($routes_arr as &$route){
  104 + $route = "'".$route."'";
  105 + }
  106 + $collect_routes = implode(',',$routes_arr);
  107 + }
  108 +
99 DB::connection('custom_mysql')->statement("DELETE FROM `gl_collect_source` WHERE `origin` LIKE '%.css%' OR `origin` LIKE '%.js%'"); 109 DB::connection('custom_mysql')->statement("DELETE FROM `gl_collect_source` WHERE `origin` LIKE '%.css%' OR `origin` LIKE '%.js%'");
100 if ($domain_info) { 110 if ($domain_info) {
101 //已上线项目 111 //已上线项目
102 - DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $test_domain . "' WHERE `language` = ''"); 112 + if($collect_routes){
  113 + DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $test_domain . "' WHERE `language` = '' AND `route` IN (".$collect_routes.")");
  114 + }else{
  115 + DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $test_domain . "' WHERE `language` = ''");
  116 + }
103 } else { 117 } else {
104 - DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''"); 118 + if($collect_routes){
  119 + DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = '' AND `route` IN (".$collect_routes.")");
  120 + }else{
  121 + DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''");
  122 + }
105 } 123 }
106 } 124 }
107 125
@@ -170,4 +170,29 @@ class BTemplateController extends BaseController @@ -170,4 +170,29 @@ class BTemplateController extends BaseController
170 $info = $bTemplateModel->sourceMap(); 170 $info = $bTemplateModel->sourceMap();
171 $this->response('success',Code::SUCCESS,$info); 171 $this->response('success',Code::SUCCESS,$info);
172 } 172 }
  173 +
  174 + /**
  175 + * @remark :替换同一种类型的html代码
  176 + * @name :replaceTemplateMainHtml
  177 + * @author :lyh
  178 + * @method :post
  179 + * @time :2024/5/7 14:39
  180 + */
  181 + public function replaceTemplateMainHtml(BTemplateLogic $BTemplateLogic){
  182 + $this->request->validate([
  183 + 'old_html'=>'required',
  184 + 'html'=>'required',
  185 + 'type'=>'required',
  186 + 'is_custom'=>'required',
  187 + 'is_list'=>'required',
  188 + ],[
  189 + 'old_html.required' => '需替换的html不能为空',
  190 + 'html.required' => 'html不能为空',
  191 + 'type.required' => '类型type不能为空',
  192 + 'is_custom.required' => '类型is_custom不能为空',
  193 + 'is_list.required' => '类型is_list不能为空',
  194 + ]);
  195 + $BTemplateLogic->replaceHtml();
  196 + $this->response('success');
  197 + }
173 } 198 }
@@ -165,14 +165,16 @@ class FileController @@ -165,14 +165,16 @@ class FileController
165 */ 165 */
166 public function getOnlyFilename($name,$project_id = 0){ 166 public function getOnlyFilename($name,$project_id = 0){
167 $nameArr = explode('.',$name); 167 $nameArr = explode('.',$name);
168 - $enName = generateRoute(Translate::tran($nameArr[0], 'en')); 168 + $suffix = array_pop($nameArr) ?? 'jpg';
  169 + $nameStr = implode('-', $nameArr);
  170 + $enName = generateRoute(Translate::tran($nameStr, 'en'));
169 $fileName = $enName; 171 $fileName = $enName;
170 $i=1; 172 $i=1;
171 - while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){ 173 + while($this->onlyName($enName.'.'.$suffix,$project_id)){
172 $enName = $fileName .'-'.$i; 174 $enName = $fileName .'-'.$i;
173 $i++; 175 $i++;
174 } 176 }
175 - return $enName.'.'.$nameArr[1]; 177 + return $enName.'.'.$suffix;
176 } 178 }
177 179
178 /** 180 /**
@@ -224,15 +224,18 @@ class ImageController extends Controller @@ -224,15 +224,18 @@ class ImageController extends Controller
224 * @time :2024/4/26 16:10 224 * @time :2024/4/26 16:10
225 */ 225 */
226 public function getOnlyFilename($name,$project_id = 0){ 226 public function getOnlyFilename($name,$project_id = 0){
  227 +
227 $nameArr = explode('.',$name); 228 $nameArr = explode('.',$name);
228 - $enName = generateRoute(Translate::tran($nameArr[0], 'en')); 229 + $suffix = array_pop($nameArr) ?? 'jpg';
  230 + $nameStr = implode('-', $nameArr);
  231 + $enName = generateRoute(Translate::tran($nameStr, 'en'));
229 $fileName = $enName; 232 $fileName = $enName;
230 $i=1; 233 $i=1;
231 - while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){ 234 + while($this->onlyName($enName.'.'.$suffix,$project_id)){
232 $enName = $fileName .'-'.$i; 235 $enName = $fileName .'-'.$i;
233 $i++; 236 $i++;
234 } 237 }
235 - return $enName.'.'.$nameArr[1]; 238 + return $enName.'.'.$suffix;
236 } 239 }
237 240
238 /** 241 /**
@@ -917,6 +917,7 @@ class BTemplateLogic extends BaseLogic @@ -917,6 +917,7 @@ class BTemplateLogic extends BaseLogic
917 } 917 }
918 918
919 /** 919 /**
  920 +<<<<<<< HEAD
920 * @remark :定制页面头部类型---根据source获取type类型 921 * @remark :定制页面头部类型---根据source获取type类型
921 * @name :getType 922 * @name :getType
922 * @author :lyh 923 * @author :lyh
@@ -158,7 +158,9 @@ class UserLoginLogic @@ -158,7 +158,9 @@ class UserLoginLogic
158 $info['aicc'] = $project['aicc'] ?? ''; 158 $info['aicc'] = $project['aicc'] ?? '';
159 $info['hagro'] = $project['hagro'] ?? ''; 159 $info['hagro'] = $project['hagro'] ?? '';
160 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 160 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
161 - $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 161 + $info['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
  162 + $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
  163 + ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
162 $info['is_customized'] = $project['is_customized']; 164 $info['is_customized'] = $project['is_customized'];
163 $info['is_upload_manage'] = $project['is_upload_manage']; 165 $info['is_upload_manage'] = $project['is_upload_manage'];
164 $info['is_upgrade'] = $project['is_upgrade']; 166 $info['is_upgrade'] = $project['is_upgrade'];
@@ -258,8 +260,9 @@ class UserLoginLogic @@ -258,8 +260,9 @@ class UserLoginLogic
258 $info['hagro'] = $project['hagro'] ?? ''; 260 $info['hagro'] = $project['hagro'] ?? '';
259 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 261 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
260 $info['is_domain'] = empty($project['deploy_optimize']['domain']) ? 0 : 1; 262 $info['is_domain'] = empty($project['deploy_optimize']['domain']) ? 0 : 1;
  263 + $info['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
261 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? 264 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
262 - ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 265 + ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
263 $info['is_customized'] = $project['is_customized']; 266 $info['is_customized'] = $project['is_customized'];
264 $info['is_upgrade'] = $project['is_upgrade']; 267 $info['is_upgrade'] = $project['is_upgrade'];
265 $info['is_upload_manage'] = $project['is_upload_manage']; 268 $info['is_upload_manage'] = $project['is_upload_manage'];
@@ -52,7 +52,8 @@ class NavRequest extends FormRequest @@ -52,7 +52,8 @@ class NavRequest extends FormRequest
52 'name.required' => '名称必须', 52 'name.required' => '名称必须',
53 'name.max' => '名称不能超过100个字符', 53 'name.max' => '名称不能超过100个字符',
54 'url.required' => '链接不能为空', 54 'url.required' => '链接不能为空',
55 - 'remark.max' => '描述最长为500字符', 55 + 'remark.max' => '描述超过最长500字符',
  56 +
56 ]; 57 ];
57 } 58 }
58 } 59 }