gx

@@ -525,11 +525,13 @@ class ImageController extends Controller
     public function setWatermark(){
     public function setWatermark(){
         $this->request->validate([
         $this->request->validate([
             'url'=>['required'],
             'url'=>['required'],
+            'is_image'=>['required'],
         ],[
         ],[
             'url.required'=>'请填写需要处理图片的相对路径',
             'url.required'=>'请填写需要处理图片的相对路径',
+            'is_image.required'=>'请设置文本水印还是图片水印',
         ]);
         ]);
         $cos = new CosService();
         $cos = new CosService();
-        $url = $cos->addFieldImage($this->param['url'], $this->param['data'],true);
+        $url = $cos->setWatermark($this->param['url'], $this->param['data'],true);
         $this->response('success',Code::SUCCESS,['url'=>$url]);
         $this->response('success',Code::SUCCESS,['url'=>$url]);
     }
     }
 
 

@@ -57,6 +57,7 @@ class InitHtmlLogic extends BaseLogic
         $html = $commonInfo['head_style'].$main_style.$commonInfo['footer_style'].$commonInfo['other'].$commonInfo['head_html'].$main_html.$commonInfo['footer_html'];
         $html = $commonInfo['head_style'].$main_style.$commonInfo['footer_style'].$commonInfo['other'].$commonInfo['head_html'].$main_html.$commonInfo['footer_html'];
         $html = $this->getHeadFooter($html);//组装数据
         $html = $this->getHeadFooter($html);//组装数据
         $data['html'] = $html;
         $data['html'] = $html;
+        $data['template_id'] = $template_id;
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
@@ -96,7 +97,7 @@ class InitHtmlLogic extends BaseLogic
         $headComInfo = $bTemplateComModel->read($condition);
         $headComInfo = $bTemplateComModel->read($condition);
         if($headComInfo === false){
         if($headComInfo === false){
             //取默认公共的
             //取默认公共的
-            $headComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_HEAD]);
+            $headComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_HEAD,'template_id'=>$template_id]);
             if($headComInfo === false){
             if($headComInfo === false){
                 $this->fail('获取失败，请联系管理员1');
                 $this->fail('获取失败，请联系管理员1');
             }
             }
@@ -117,7 +118,7 @@ class InitHtmlLogic extends BaseLogic
         $footerComInfo = $bTemplateComModel->read($condition);
         $footerComInfo = $bTemplateComModel->read($condition);
         if($footerComInfo === false){
         if($footerComInfo === false){
             //取默认首页的
             //取默认首页的
-            $footerComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_FOOTER]);
+            $footerComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_FOOTER,'template_id'=>$template_id]);
             if($footerComInfo === false){
             if($footerComInfo === false){
                 $this->fail('获取失败，请联系管理员3');
                 $this->fail('获取失败，请联系管理员3');
             }
             }

@@ -182,7 +182,7 @@ class CosService
             South：底部中间
             South：底部中间
             SouthEast：右下角
             SouthEast：右下角
      */
      */
-    public function addFieldImage($cdnUrl = '',$data = [],$is_image = false){
+    public function setWatermark($cdnUrl = '',$data = [],$is_image = false){
         $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
         $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
         $url = $domain . $cdnUrl;
         $url = $domain . $cdnUrl;
         if($is_image){
         if($is_image){

@@ -318,6 +318,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('/upload', [\App\Http\Controllers\File\ImageController::class, 'upload'])->name('image_upload');
         Route::post('/upload', [\App\Http\Controllers\File\ImageController::class, 'upload'])->name('image_upload');
         Route::post('/getFont', [\App\Http\Controllers\File\ImageController::class, 'getFont'])->name('images_getFont');
         Route::post('/getFont', [\App\Http\Controllers\File\ImageController::class, 'getFont'])->name('images_getFont');
         Route::post('/getPosition', [\App\Http\Controllers\File\ImageController::class, 'getPosition'])->name('images_getPosition');
         Route::post('/getPosition', [\App\Http\Controllers\File\ImageController::class, 'getPosition'])->name('images_getPosition');
+        Route::post('/setWatermark', [\App\Http\Controllers\File\ImageController::class, 'setWatermark'])->name('images_setWatermark');
         Route::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList');
         Route::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList');
     });
     });
     //文件操作
     //文件操作