From 273e1ec0f456e9b09364d84d1e2d8a2a0a832abd Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Fri, 22 Nov 2019 18:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=A2=E6=9C=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=96=E6=B6=88HTML=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/controller/wechat/WechatController.php        | 2 +-
 crmeb/crmeb/services/workerman/chat/ChatHandle.php          | 2 +-
 crmeb/vendor/overtrue/wechat/src/Foundation/Application.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/api/controller/wechat/WechatController.php b/crmeb/app/api/controller/wechat/WechatController.php
index f024a3ac..608e33bc 100644
--- a/crmeb/app/api/controller/wechat/WechatController.php
+++ b/crmeb/app/api/controller/wechat/WechatController.php
@@ -8,7 +8,7 @@ use app\models\user\User;
 use app\models\user\UserToken;
 use app\models\user\WechatUser;
 use app\Request;
-use crmeb\services\CanvasService;
+use crmeb\utils\CanvasService;
 use crmeb\services\WechatService;
 use think\facade\Cookie;
 
diff --git a/crmeb/crmeb/services/workerman/chat/ChatHandle.php b/crmeb/crmeb/services/workerman/chat/ChatHandle.php
index 7f60a007..db940a39 100644
--- a/crmeb/crmeb/services/workerman/chat/ChatHandle.php
+++ b/crmeb/crmeb/services/workerman/chat/ChatHandle.php
@@ -64,7 +64,7 @@ class ChatHandle
         if (!$to_uid) return $response->send('err_tip', ['msg' => '用户不存在']);
         if ($to_uid == $uid) return $response->send('err_tip', ['msg' => '不能和自己聊天']);
         if (!in_array($msn_type, [1, 2, 3, 4])) return $response->send('err_tip', ['msg' => '格式错误']);
-        $msn = htmlspecialchars($msn);
+        $msn = trim(strip_tags(str_replace(["\n", "\t", "\r", " ", "&nbsp;"], '', htmlspecialchars_decode($msn))));
         $data = compact('to_uid', 'msn_type', 'msn', 'uid');
         $data['add_time'] = time();
         $connections = $this->service->user();
diff --git a/crmeb/vendor/overtrue/wechat/src/Foundation/Application.php b/crmeb/vendor/overtrue/wechat/src/Foundation/Application.php
index d0a5d7af..95c8843c 100644
--- a/crmeb/vendor/overtrue/wechat/src/Foundation/Application.php
+++ b/crmeb/vendor/overtrue/wechat/src/Foundation/Application.php
@@ -106,7 +106,7 @@ class Application extends Container
         ServiceProviders\OpenPlatformServiceProvider::class,
         ServiceProviders\MiniProgramServiceProvider::class,
         ServiceProviders\CommentServiceProvider::class,
-        \crmeb\services\ProgramServiceProvider::class,
+        \crmeb\utils\ProgramServiceProvider::class,
     ];
 
     /**