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

@@ -769,7 +769,7 @@ class ImageController extends Controller
             $this->response('请先设置水印',Code::SYSTEM_ERROR);
             $this->response('请先设置水印',Code::SYSTEM_ERROR);
         }
         }
         if($info['status'] == 2 && empty($info['str_data'])){
         if($info['status'] == 2 && empty($info['str_data'])){
-            $this->response('请先设置水印',Code::SYSTEM_ERROR);
+            $this->response('请先设置文字水印',Code::SYSTEM_ERROR);
         }
         }
         $imageSetting->edit(['status'=>$this->param['status']],['project_id'=>$this->cache['project_id']]);
         $imageSetting->edit(['status'=>$this->param['status']],['project_id'=>$this->cache['project_id']]);
         $this->response('success');
         $this->response('success');

@@ -11,8 +11,11 @@ namespace App\Http\Logic\Aside\Geo;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Geo\GeoConf;
 use App\Models\Geo\GeoConfirm;
 use App\Models\Geo\GeoConfirm;
+use App\Models\Manage\ManageHr;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
+use App\Services\DingService;
 
 
 /**
 /**
  * @remark :用户确认信息
  * @remark :用户确认信息
@@ -92,6 +95,19 @@ class GeoConfirmLogic extends BaseLogic
         }else{
         }else{
             $id  = $info['id'];
             $id  = $info['id'];
             $this->model->edit($this->param,['id'=>$info['id']]);
             $this->model->edit($this->param,['id'=>$info['id']]);
+            $geoConfModel = new GeoConf();
+            $confInfo = $geoConfModel->read(['project_id'=>$info['project_id']]);
+            $hrModel = new ManageHr();
+            $manage_name = $hrModel->getName($confInfo['manager_id'] ??'');
+            $dingService = new DingService();
+            $dingService->handle([
+                'keyword' => '项目数据确认',
+                'msg' =>
+                    'cm：'.(($info['type'] == 1) ? '标题确认' : '关键词确认'). PHP_EOL .
+                    '项目名称：'.$confInfo['company'] ?? '' . PHP_EOL .
+                    '负责人：'.$manage_name . PHP_EOL,
+                'isAtAll' => false, // 是否@所有人
+            ], 'https://oapi.dingtalk.com/robot/send?access_token=4effe85882009a8a1617dbeadc38c350f832deef7431ce10f5fda751b4c82fb9');
         }
         }
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }