合并分支 'lyh-server' 到 'master'

Lyh server 查看合并请求 !3330

合并分支 'lyh-server' 到 'master'
Lyh server 查看合并请求 !3330
李宇航
app/Http/Controllers/Api/GeoController.php
app/Http/Logic/Aside/Geo/GeoConfirmLogic.php
app/Services/DingService.php
--- a/app/Http/Controllers/Api/GeoController.php
查看文件 @57aaf2c
+++ b/app/Http/Controllers/Api/GeoController.php
查看文件 @57aaf2c
@@ -107,7 +107,7 @@ class GeoController extends BaseController
                 'keyword' => '项目数据确认',
                 'msg' =>
                     'cm：文章确认完成' . PHP_EOL .
-                    '项目名称：'.$confInfo['company'] ?? '' . PHP_EOL .
+                    '项目名称：'.($confInfo['company'] ?? '') . PHP_EOL .
                     '负责人：'.$manage_name . PHP_EOL,
                 'isAtAll' => false, // 是否@所有人
             ], 'https://oapi.dingtalk.com/robot/send?access_token=4effe85882009a8a1617dbeadc38c350f832deef7431ce10f5fda751b4c82fb9');
@@ -176,7 +176,7 @@ class GeoController extends BaseController
                 'keyword' => '项目数据确认',
                 'msg' =>
                     'cm：'.(($info['type'] == 1) ? '标题确认' : '关键词确认'). PHP_EOL .
-                    '项目名称：'.$confInfo['company'] ?? '' . PHP_EOL .
+                    '项目名称：'.($confInfo['company'] ?? '') . PHP_EOL .
                     '负责人：'.$manage_name . PHP_EOL,
                 'isAtAll' => false, // 是否@所有人
             ], 'https://oapi.dingtalk.com/robot/send?access_token=4effe85882009a8a1617dbeadc38c350f832deef7431ce10f5fda751b4c82fb9');
--- a/app/Http/Logic/Aside/Geo/GeoConfirmLogic.php
查看文件 @57aaf2c
+++ b/app/Http/Logic/Aside/Geo/GeoConfirmLogic.php
查看文件 @57aaf2c
@@ -104,7 +104,7 @@ class GeoConfirmLogic extends BaseLogic
                 'keyword' => '项目数据确认',
                 'msg' =>
                     'cm：'.(($info['type'] == 1) ? '标题确认' : '关键词确认'). PHP_EOL .
-                    '项目名称：'.$confInfo['company'] ?? '' . PHP_EOL .
+                    '项目名称：'.($confInfo['company'] ?? '') . PHP_EOL .
                     '负责人：'.$manage_name . PHP_EOL,
                 'isAtAll' => false, // 是否@所有人
             ], 'https://oapi.dingtalk.com/robot/send?access_token=4effe85882009a8a1617dbeadc38c350f832deef7431ce10f5fda751b4c82fb9');
--- a/app/Services/DingService.php
查看文件 @57aaf2c
+++ b/app/Services/DingService.php
查看文件 @57aaf2c
@@ -31,7 +31,7 @@ class DingService
     public function handle(array $body, $link = '')
     {
         $link = $link ?: self::LINK;
-        $msgKey = mb_substr($body['msg'], 50);
+        $msgKey = mb_substr($body['msg'], 100);
         if (!$this->getData(RedisKey::DING_MSG . $msgKey)) {
             $arr = [
                 'msgtype' => 'text',