From c8a74fc3c4a2e36b514d0ac516885f42d0e77bec Mon Sep 17 00:00:00 2001
From: xx <a1585346868@hotmail.com>
Date: Sun, 26 May 2024 23:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96HTTP=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/net/http_interceptor.cpp |  4 ++--
 src/net/http_response.cpp    | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/net/http_interceptor.cpp b/src/net/http_interceptor.cpp
index 3a47fa5..fe74946 100644
--- a/src/net/http_interceptor.cpp
+++ b/src/net/http_interceptor.cpp
@@ -13,7 +13,7 @@ network::http::interceptor::~interceptor()
 {
 
 }
-size_t network::http::interceptor::add(const std::string& express, std::function<bool(network::http::reqpack* rp)> callback)
+size_t network::http::interceptor::add(const std::string& express, std::function<bool(network::http::reqpack* rp,const std::string&)> callback)
 {
     network::http::interceptor_info *info = new network::http::interceptor_info;
     info->express = std::regex(express.c_str());
@@ -29,7 +29,7 @@ bool network::http::interceptor::trigger(const std::string& url, network::http::
 	{
         auto info = m_array.get(i);
         if(std::regex_match(url.c_str(),info->express)){
-            bool result = info->callback(rp);
+            bool result = info->callback(rp,info->express_string);
             if(result == false){
 #if HTTP_INTERCEPTOR_PRINT == 1
                 ylib::log->warn("["+rp->exec_msec()+" ms] false url:"+url+"\t"+" express:"+info->express_string+" ip:"+rp->request()->remote_ipaddress(true),"interceptor");
diff --git a/src/net/http_response.cpp b/src/net/http_response.cpp
index efd1c7f..67f9289 100644
--- a/src/net/http_response.cpp
+++ b/src/net/http_response.cpp
@@ -74,6 +74,18 @@ bool ylib::network::http::response::send(const char* buf, size_t buf_len, ushort
     {
         HEADER_SET("Content-Type", "text/html");
         HEADER_SET("Content-Length", std::to_string((uint64)view.length()));
+        // 设置默认编码
+        {
+            std::string value;
+            auto iter = m_headers.find("Content-Type");
+            if (iter == m_headers.end() && iter->second.empty())
+                iter->second = "charset=utf8";
+            else
+            {
+                if (value.find("charset") == -1)
+                    iter->second += "; charset=utf8";
+            }
+        }
     }