diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java
index 982f40aa..e8167e81 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java
@@ -55,6 +55,6 @@ public class OpenAiConfigProperties {
     private String systemRule = "是与AI助手的对话。助手乐于助人，富有创造力，聪明限制每次回答在120字以内不得超过120字。";
 
     /** Context Window Max */
-    private String contextMessageMaxCount = "15";
+    private String contextMessageMaxCount = "14";
 
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java
index cdb155b8..4175c880 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java
@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
@@ -77,12 +78,6 @@ public class ImContentServiceImpl extends ServiceImpl<ImContentMapper, ImContent
         if (StrUtil.isBlank(imContent.getContent())) {
             throw new CheckedException("提问内容不能为空请检查!");
         }
-        // 保存用户发送聊天记录
-        imContent.setSendUserId(SecurityUtils.getCasUser().getId());
-        imContent.setSendTime(LocalDateTime.now());
-        imContent.setReceiveUserId(imContent.getReceiveUserId());
-        imContent.setReceiveTime(LocalDateTime.now());
-        super.save(imContent);
 
         // 查询当前历史消息,进行AI上下文消息合并
         List<ImContent> imContents = super.list(Wrappers.<ImContent>lambdaQuery().and(i ->
@@ -101,6 +96,14 @@ public class ImContentServiceImpl extends ServiceImpl<ImContentMapper, ImContent
             chatMessage.setContent(item.getContent());
             return chatMessage;
         }).collect(Collectors.toList());
+        CollUtil.reverse(historyMessages);
+
+        // 保存用户发送聊天记录
+        imContent.setSendUserId(SecurityUtils.getCasUser().getId());
+        imContent.setSendTime(LocalDateTime.now());
+        imContent.setReceiveUserId(imContent.getReceiveUserId());
+        imContent.setReceiveTime(LocalDateTime.now());
+        super.save(imContent);
 
         // Completion消息
         ChatMessage completionMessage = new ChatMessage(ChatMessageRole.USER.value(), imContent.getContent());
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java
index 115b7f4a..389bb7e0 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java
@@ -81,8 +81,7 @@ public class AiUtil {
      * @param modelName 指定模型
      */
     public void truncateToTokenLimit(String modelName, List<ChatMessage> messages) {
-        ModelType modelType = ModelType.fromName(modelName)
-                .orElseThrow(() -> new CheckedException(String.format("找不到指定的:%s模型请检查配置!", modelName)));;
+        ModelType modelType = ModelType.fromName(modelName).orElseThrow(() -> new CheckedException(String.format("找不到指定的:%s模型请检查配置!", modelName)));;
         int sumTokens = TikTokensUtil.tokens(modelName, messages);
         // 确保至少有一条消息（系统消息）保持不变
         if (!messages.isEmpty()) {