gx

@@ -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;
     }
 
     /**

@@ -956,4 +956,16 @@ class BTemplateLogic extends BaseLogic
         }
         return $this->success();
     }
+
+    /**
+     * @remark :替换可视化的html代码（按类型）
+     * @name   :replaceHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/7 15:52
+     */
+    public function replaceHtml(){
+        //查询当前所有装修的
+        $this->model->list(['']);
+    }
 }