Merge branch 'wx-kw' into test

modules/WechatPlatform/Services/WechatCommonService.php

@@ -43,34 +43,25 @@ class WechatCommonService extends BaseService
     {
         switch ($message['MsgType']) {
             case 'event':
-                return '收到事件消息';
-                break;
+                return self::handleEvent($app, $wechatInfoId, $appid, $message);
             case 'text':
                 // 更新用户活跃时间
                 self::updateUserActivityTime($app, $appid, $message['FromUserName']);
                 return self::handleTextMessage($wechatInfoId, $message);
             case 'image':
                 return '收到图片消息';
-                break;
             case 'voice':
                 return '收到语音消息';
-                break;
             case 'video':
                 return '收到视频消息';
-                break;
             case 'location':
                 return '收到坐标消息';
-                break;
-            case 'unsubscribe':
-                self::updateUserInfo($app, $appid, $message['FromUserName'], false);
-                return '取消关注';
-                break;
-            case 'subscribe':
-                self::updateUserInfo($app, $appid, $message['FromUserName'], true);
-                return self::handleSubscribeMessage($wechatInfoId, $message);
+            case 'link':
+                return '收到链接消息';
+            case 'file':
+                return '收到文件消息';
             default:
                 return '收到其它消息';
-                break;
         }
         return "";
     }
@@ -121,7 +112,7 @@ class WechatCommonService extends BaseService
     }
 
     /**
-     *  更新用户时间
+     *  关注取消关注更新用户信息
      * name: updateUserInfo
      * @param $app
      * @param $appid
@@ -186,11 +177,37 @@ class WechatCommonService extends BaseService
         ];
     }
 
+    //
     private static function handleSubscribeMessage($wechatAppId)
     {
         $back = WechatSubscribeService::getContent($wechatAppId);
         return $back ?: "";
     }
 
+    /**
+     *  处理事件消息
+     * name: handleEvent
+     * @param $app
+     * @param $wechatInfoId
+     * @param $appid
+     * @param $message
+     * @return mixed|string
+     * date 2023/07/11 09:15
+     */
+    private static function handleEvent($app,  $wechatInfoId, $appid, $message)
+    {
+        switch ($message['Event']) {
+            case 'unsubscribe':
+                self::updateUserInfo($app, $appid, $message['FromUserName'], false);
+                return '取消关注';
+            case 'subscribe':
+                self::updateUserInfo($app, $appid, $message['FromUserName'], true);
+                return WechatSubscribeService::getContent($wechatInfoId);
+            default:
+                return '收到其它消息';
+        }
+        return  '';
+    }
+
 
 }