diff --git a/docker/mysql/my.cnf b/docker/mysql/my.cnf index d3d42fb8d..79c61f619 100644 --- a/docker/mysql/my.cnf +++ b/docker/mysql/my.cnf @@ -1,27 +1,26 @@ -[mysqld] -# 字符集设置 -character-set-server=utf8mb4 -collation-server=utf8mb4_unicode_ci - -# 连接设置 -max_connections=100 -wait_timeout=28800 -interactive_timeout=28800 - -# 缓冲区设置 -innodb_buffer_pool_size=256M -key_buffer_size=64M - -# 日志设置 -slow_query_log=1 -slow_query_log_file=/var/lib/mysql/slow.log -long_query_time=2 - -# 其他设置 -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -[client] -default-character-set=utf8mb4 - -[mysql] -default-character-set=utf8mb4 \ No newline at end of file +[mysqld] +# 字符集设置 +character-set-server=utf8mb4 +collation-server=utf8mb4_unicode_ci +init_connect='SET NAMES utf8mb4' + + +# 连接设置 +max_connections=100 +wait_timeout=28800 +interactive_timeout=28800 + +# 缓冲区设置 +innodb_buffer_pool_size=256M +key_buffer_size=64M + +# 日志设置 +slow_query_log=1 +slow_query_log_file=/var/lib/mysql/slow.log +long_query_time=2 + +# 其他设置 +sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +[client] +default-character-set=utf8mb4 diff --git a/src/.env.development b/src/.env.development index 8e17ceedb..f85fa5e10 100644 --- a/src/.env.development +++ b/src/.env.development @@ -11,7 +11,7 @@ DATABASE = shop_mallnew USERNAME = shop_mallnew PASSWORD = shop_mallnew HOSTPORT = 3306 -CHARSET = utf8 +CHARSET = utf8mb4 DEBUG = true [RRDATABASE] HOSTNAME = host.docker.internal diff --git a/src/.env.local b/src/.env.local index 3afee75f3..3951db31b 100644 --- a/src/.env.local +++ b/src/.env.local @@ -11,7 +11,7 @@ DATABASE = shop_dev USERNAME = shop_mallnew PASSWORD = shop_mallnew HOSTPORT = 3306 -CHARSET = utf8 +CHARSET = utf8mb4 DEBUG = true [RRDATABASE] HOSTNAME = redis diff --git a/src/.env.production b/src/.env.production index 458bde428..15c7f9e0d 100644 --- a/src/.env.production +++ b/src/.env.production @@ -15,7 +15,7 @@ DATABASE = shop_mallnew_prod USERNAME = prod_user PASSWORD = prod_password HOSTPORT = 3306 -CHARSET = utf8 +CHARSET = utf8mb4 DEBUG = false [redis] diff --git a/src/addon/aikefu/api/controller/Kefu.php b/src/addon/aikefu/api/controller/Kefu.php index 7e0272951..6feecd327 100644 --- a/src/addon/aikefu/api/controller/Kefu.php +++ b/src/addon/aikefu/api/controller/Kefu.php @@ -159,7 +159,7 @@ class Kefu extends BaseApi 'conversation_id' => $result['conversation_id'] ?? $conversation_id, 'message_id' => $result['message_id'] ?? '', 'role' => 'user', - 'content' => json_encode($message), + 'content' => $message ?? '', ]); // 保存机器人回复 @@ -169,7 +169,7 @@ class Kefu extends BaseApi 'conversation_id' => $result['conversation_id'] ?? $conversation_id, 'message_id' => $result['id'] ?? '', 'role' => 'assistant', - 'content' => json_encode($result['answer'] ?? ''), + 'content' => $result['answer'] ?? '', ]); // 更新会话状态或创建新会话 diff --git a/src/addon/aikefu/shop/view/kefu/conversation.html b/src/addon/aikefu/shop/view/kefu/conversation.html index 3cf4d09c1..0709e1ba9 100644 --- a/src/addon/aikefu/shop/view/kefu/conversation.html +++ b/src/addon/aikefu/shop/view/kefu/conversation.html @@ -1,26 +1,10 @@