fix: 公众号登录功能同步

feat: 新增wechat模块
feat: sse对话样式优化
2026-03-13 20:53:42 +08:00 · 2025-04-30 19:34:09 +08:00 · 2025-04-30 11:29:23 +08:00 · 2025-04-29 11:44:47 +08:00 · 2025-04-29 11:00:34 +08:00 · 2025-04-24 17:09:52 +08:00
55 changed files with 1435 additions and 156 deletions
--- a/README.md
+++ b/README.md
@@ -63,18 +63,19 @@
  用户名: admin 密码：admin123

 ### 源码地址
-[1]github
- 前端服务-用户端: https://github.com/ageerle/ruoyi-web
- 前端服务-管理端: https://github.com/ageerle/ruoyi-admin
- 前端服务-小程序端: https://github.com/ageerle/ruoyi-uniapp
- 后端服务：https://github.com/ageerle/ruoyi-ai

-[2]gitee
+[1]gitee
 - 前端服务-用户端: https://gitee.com/ageerle/ruoyi-web
 - 前端服务-管理端: https://gitee.com/ageerle/ruoyi-admin
 - 前端服务-小程序端: https://gitee.com/ageerle/ruoyi-uniapp
 - 后端服务：https://gitee.com/ageerle/ruoyi-ai

+[2]github
+- 前端服务-用户端: https://github.com/ageerle/ruoyi-web
+- 前端服务-管理端: https://github.com/ageerle/ruoyi-admin
+- 前端服务-小程序端: https://github.com/ageerle/ruoyi-uniapp
+- 后端服务：https://github.com/ageerle/ruoyi-ai
+
 [3]gitcode
 - 前端服务-用户端：https://gitcode.com/ageerle/ruoyi-web
 - 前端服务-管理端:  https://gitcode.com/ageerle/ruoyi-admin
@@ -83,7 +84,7 @@

 ### 配套文档
 - 配套文档: https://doc.pandarobot.chat
-  - 项目部署文档：https://doc.pandarobot.chat/guide/introduction/
+- 项目部署文档：https://doc.pandarobot.chat/guide/introduction/

 ### 核心功能
 1. 全套开源系统：提供完整的前端应用、后台管理以及小程序应用，基于MIT协议，开箱即用。
@@ -96,7 +97,16 @@

 ### 项目演示

-#### mcp支持(需要切换dev分支 下周发布正式版)
+#### mcp支持
+
+### 如何使用
+1. ruoyi-admin\src\main\resources\application.yml中mcp.client.enabled改为true
+2. application.yml中配置openai api-key(用于推理使用那个工具,并构建工具所需参数)
+3. 启动[ruoyi-mcp-server]
+4. [mcp-server.json]中配置fileSystem.command(npx本地安装路径)
+5. 指定fileSystem操作目录(本地必须存在指定的目录)
+6. 配置search1api.env.SEARCH1API_KEY 申请地址：https://www.search1api.com/
+7. 详情教程：https://blog.csdn.net/weixin_42416319/article/details/147385808
 <div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
  <img src="image/mcp-01.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
  <img src="image/mcp-02.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
@@ -215,9 +225,12 @@

 ###  开发计划

- 流程编排
+| 主题 | 方向                                | 时间节点   | 
+| --- |-----------------------------------|--------| 
+| 前端简化版 | 与element-plus-x框架合作，推出基于该框架的前端简化版 | 2025.5 | 
+| agent2agent | Agent2Agent协议支持                   | 2025.6 | 
+| 流程编排 | 通过可视化界面和灵活的配置方式，快速构建AI应用          | 2025.7 | 

-通过流程编排功能，用户可以将不同的模型按照业务逻辑进行有序连接。这将解决单一模型能力不足的问题，充分发挥多个模型的协同作用，从而更好地满足企业的复杂业务需求。

 -  感谢

--- a/image/mcp-01.png
+++ b/image/mcp-01.png
--- a/pom.xml
+++ b/pom.xml
@@ -337,11 +337,11 @@
                <version>${revision}</version>
            </dependency>

-<!--            <dependency>-->
-<!--                <groupId>org.ruoyi</groupId>-->
-<!--                <artifactId>ruoyi-demo</artifactId>-->
-<!--                <version>${revision}</version>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>org.ruoyi</groupId>
+                <artifactId>ruoyi-wechat</artifactId>
+                <version>${revision}</version>
+            </dependency>

        </dependencies>
    </dependencyManagement>
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -42,12 +42,6 @@
            <artifactId>mssql-jdbc</artifactId>
        </dependency>

-        <!--  demo模块  -->
-<!--        <dependency>-->
-<!--            <groupId>org.ruoyi</groupId>-->
-<!--            <artifactId>ruoyi-demo</artifactId>-->
-<!--        </dependency>-->
-
        <dependency>
            <groupId>org.ruoyi</groupId>
            <artifactId>ruoyi-system</artifactId>
@@ -58,6 +52,16 @@
            <artifactId>ruoyi-chat</artifactId>
        </dependency>

+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-generator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-wechat</artifactId>
+        </dependency>
+
    </dependencies>

    <build>
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -25,7 +25,7 @@ spring:
        master:
          type: ${spring.datasource.type}
          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://43.139.70.230:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: ry-vue
          password: xx

--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -323,11 +323,11 @@ wechat:
 spring:
  ai:
    openai:
-      api-key: sk-xxx
+      api-key: sk-xx
      base-url: https://api.pandarobot.chat/
    mcp:
      client:
-        enabled: true
+        enabled: false
        name: ruoyi-ai-mcp
        sse:
          connections:
@@ -335,4 +335,5 @@ spring:
              url: http://127.0.0.1:8081
        stdio:
          servers-configuration: classpath:mcp-server.json
+        request-timeout: 300s

--- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatVxService.java
+++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatVxService.java
@@ -0,0 +1,19 @@
+package org.ruoyi.service;
+
+/**
+ * 企业微信聊天管理Service接口
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+public interface IChatVxService {
+
+
+    /**
+     * 企业微信应用回复
+     * @param prompt 提示词
+     * @return 回复内容
+     */
+    String chat(String prompt);
+
+}
--- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatVxServiceImpl.java
+++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatVxServiceImpl.java
@@ -0,0 +1,37 @@
+package org.ruoyi.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.common.chat.entity.chat.ChatCompletion;
+import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
+import org.ruoyi.common.chat.entity.chat.Message;
+import org.ruoyi.common.chat.openai.OpenAiStreamClient;
+import org.ruoyi.service.IChatVxService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class ChatVxServiceImpl implements IChatVxService {
+
+    private final OpenAiStreamClient openAiStreamClient;
+
+    @Override
+    public String chat(String prompt) {
+        List<Message> messageList = new ArrayList<>();
+        Message message = Message.builder().role(Message.Role.USER).content(prompt).build();
+        messageList.add(message);
+        ChatCompletion chatCompletion = ChatCompletion
+            .builder()
+            .messages(messageList)
+            .model("gpt-4o-mini")
+            .stream(false)
+            .build();
+        ChatCompletionResponse chatCompletionResponse = openAiStreamClient.chatCompletion(chatCompletion);
+        return chatCompletionResponse.getChoices().get(0).getMessage().getContent().toString();
+    }
+
+}
--- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/KnowledgeInfoBo.java
+++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/KnowledgeInfoBo.java
@@ -21,7 +21,7 @@ import jakarta.validation.constraints.*;
 public class KnowledgeInfoBo extends BaseEntity {

    /**
-     *
+     *  主键
     */
    @NotNull(message = "不能为空", groups = { EditGroup.class })
    private Long id;
@@ -29,13 +29,13 @@ public class KnowledgeInfoBo extends BaseEntity {
    /**
     * 知识库ID
     */
-    @NotBlank(message = "知识库ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "知识库ID不能为空", groups = {EditGroup.class })
    private String kid;

    /**
     * 用户ID
     */
-    @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "用户ID不能为空", groups = {EditGroup.class })
    private Long uid;

    /**
@@ -53,25 +53,21 @@ public class KnowledgeInfoBo extends BaseEntity {
    /**
     * 描述
     */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
    private String description;

    /**
     * 知识分隔符
     */
-    @NotBlank(message = "知识分隔符不能为空", groups = { AddGroup.class, EditGroup.class })
    private String knowledgeSeparator;

    /**
     * 提问分隔符
     */
-    @NotBlank(message = "提问分隔符不能为空", groups = { AddGroup.class, EditGroup.class })
    private String questionSeparator;

    /**
     * 重叠字符数
     */
-    @NotNull(message = "重叠字符数不能为空", groups = { AddGroup.class, EditGroup.class })
    private Long overlapChar;

    /**
@@ -101,8 +97,6 @@ public class KnowledgeInfoBo extends BaseEntity {
    /**
     * 备注
     */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
    private String remark;

-
 }
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -21,6 +21,7 @@
        <module>ruoyi-chat</module>
        <module>ruoyi-system</module>
        <module>ruoyi-generator</module>
+        <module>ruoyi-wechat</module>
    </modules>

    <properties>
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java
@@ -75,12 +75,19 @@ public class ChatConfigController extends BaseController {
    /**
     * 新增配置信息
     */
-    @SaCheckPermission("system:config:add")
-    @Log(title = "配置信息", businessType = BusinessType.INSERT)
+    @SaCheckPermission("system:config:edit")
+    @Log(title = "新增或者修改配置信息", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ChatConfigBo bo) {
-        return toAjax(chatConfigService.insertByBo(bo));
+    @PostMapping("/saveOrUpdate")
+    public R<Void> saveOrUpdate(@RequestBody List<ChatConfigBo> boList) {
+        for (ChatConfigBo chatConfigBo : boList) {
+            if(chatConfigBo.getId() == null){
+                chatConfigService.insertByBo(chatConfigBo);
+            }else {
+                chatConfigService.updateByBo(chatConfigBo);
+            }
+        }
+        return toAjax(true);
    }

    /**
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatGptsController.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatGptsController.java
@@ -39,7 +39,6 @@ public class ChatGptsController extends BaseController {
    /**
     * 查询应用管理列表
     */
-    @SaCheckPermission("system:gpts:list")
    @GetMapping("/list")
    public TableDataInfo<ChatGptsVo> list(ChatGptsBo bo, PageQuery pageQuery) {
        return chatGptsService.queryPageList(bo, pageQuery);
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java
@@ -45,6 +45,14 @@ public class ChatPackagePlanController extends BaseController {
        return chatPackagePlanService.queryPageList(bo, pageQuery);
    }

+    /**
+     * 查询套餐列表-不分页
+     */
+    @GetMapping("/listPlan")
+    public R<List<ChatPackagePlanVo>> listPlan() {
+        return R.ok(chatPackagePlanService.queryList(new ChatPackagePlanBo()));
+    }
+
    /**
     * 导出套餐管理列表
     */
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/enums/BillingType.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/enums/BillingType.java
@@ -4,8 +4,8 @@ import lombok.Getter;

@Getter
 public enum BillingType {
-    TOKEN("1", "token扣费"), // token扣费
-    TIMES("2", "次数扣费");   // 次数扣费
+    TOKEN("1", "token扣费"),
+    TIMES("2", "次数扣费");

    private final String code;
    private final String description;
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/enums/ChatModeType.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/enums/ChatModeType.java
@@ -4,9 +4,9 @@ import lombok.Getter;

@Getter
 public enum ChatModeType {
-    OLLAMA("ollama", "本地部署模型"), // token扣费
-    CHAT("chat", "中转模型"),   // 次数扣费
-    VECTOR("vector", "知识库向量模型");   // 次数扣费
+    OLLAMA("ollama", "本地部署模型"),
+    CHAT("chat", "中转模型"),
+    VECTOR("vector", "知识库向量模型");

    private final String code;
    private final String description;
@@ -16,11 +16,4 @@ public enum ChatModeType {
        this.description = description;
    }

-    public String getCode() {
-        return code;
-    }
-
-    public String getDescription() {
-        return description;
-    }
 }
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/enums/DisplayType.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/enums/DisplayType.java
@@ -3,7 +3,7 @@ package org.ruoyi.chat.enums;
 import lombok.Getter;

 /**
- * 描述：
+ * 描述：是否显示
 *
 * @author ageerle@163.com
 * date 2025/4/10
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/listener/SSEEventSourceListener.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/listener/SSEEventSourceListener.java
@@ -12,6 +12,7 @@ import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
 import org.jetbrains.annotations.NotNull;
 import org.ruoyi.chat.service.chat.IChatCostService;
+import org.ruoyi.chat.util.SSEUtil;
 import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
 import org.ruoyi.common.chat.request.ChatRequest;
 import org.ruoyi.common.core.utils.SpringUtils;
@@ -84,10 +85,10 @@ public class SSEEventSourceListener extends EventSourceListener {
                    modelName = completionResponse.getModel();
                }
                stringBuffer.append(content);
-                emitter.send(content);
+                emitter.send(data);
            }
        } catch (Exception e) {
-            emitter.completeWithError(e);
+            log.error(e.getMessage(), e);
        }
    }

--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/ISseService.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/ISseService.java
@@ -48,11 +48,4 @@ public interface ISseService {
    UploadFileResponse upload(MultipartFile file);


-    /**
-     * 企业应用回复
-     * @param prompt 提示词
-     * @return 回复内容
-     */
-    String wxCpChat(String prompt);
-
 }
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OpenAIServiceImpl.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OpenAIServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
 import org.springframework.ai.openai.OpenAiChatOptions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 import java.util.List;
@@ -29,6 +30,10 @@ public class OpenAIServiceImpl implements IChatService {

    private OpenAiStreamClient openAiStreamClient;

+
+    @Value("${spring.ai.mcp.client.enabled}")
+    private Boolean enabled;
+
    private final ChatClient chatClient;

    public OpenAIServiceImpl(ChatClient.Builder chatClientBuilder, List<McpSyncClient> mcpSyncClients) {
@@ -43,10 +48,12 @@ public class OpenAIServiceImpl implements IChatService {
    public SseEmitter chat(ChatRequest chatRequest,SseEmitter emitter) {
        ChatModelVo chatModelVo = chatModelService.selectModelByName(chatRequest.getModel());
        openAiStreamClient = ChatConfig.createOpenAiStreamClient(chatModelVo.getApiHost(), chatModelVo.getApiKey());
-        String toolString = mcpChat(chatRequest.getPrompt());
-        Message userMessage = Message.builder().content("工具返回信息："+toolString).role(Message.Role.USER).build();
        List<Message> messages = chatRequest.getMessages();
-        messages.add(userMessage);
+        if (enabled) {
+            String toolString = mcpChat(chatRequest.getPrompt());
+            Message userMessage = Message.builder().content("工具返回信息："+toolString).role(Message.Role.USER).build();
+            messages.add(userMessage);
+        }
        SSEEventSourceListener listener = new SSEEventSourceListener(emitter);
        ChatCompletion completion = ChatCompletion
                .builder()
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
@@ -11,10 +11,9 @@ import org.ruoyi.chat.enums.ChatModeType;
 import org.ruoyi.chat.service.chat.IChatCostService;
 import org.ruoyi.chat.service.chat.ISseService;
 import org.ruoyi.chat.util.IpUtil;
+import org.ruoyi.chat.util.SSEUtil;
 import org.ruoyi.common.chat.config.LocalCache;
 import org.ruoyi.common.chat.entity.Tts.TextToSpeech;
-import org.ruoyi.common.chat.entity.chat.ChatCompletion;
-import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
 import org.ruoyi.common.chat.entity.chat.Message;
 import org.ruoyi.common.chat.entity.files.UploadFileResponse;
 import org.ruoyi.common.chat.entity.whisper.WhisperResponse;
@@ -80,16 +79,15 @@ public class SseServiceImpl implements ISseService {
                checkUnauthenticatedUserChatLimit(request);
            }else {
                LocalCache.CACHE.put("userId", chatCostService.getUserId());
-
                chatRequest.setUserId(chatCostService.getUserId());
                // 保存消息记录 并扣除费用
                chatCostService.deductToken(chatRequest);
            }
-            // 根据模型名称前缀调用不同的处理逻辑
+            // 根据模型分类调用不同的处理逻辑
            switchModelAndHandle(chatRequest,sseEmitter);
        } catch (Exception e) {
            log.error(e.getMessage(),e);
-            sseEmitter.completeWithError(e);
+            SSEUtil.sendErrorEvent(sseEmitter,e.getMessage());
        }
        return sseEmitter;
    }
@@ -119,7 +117,6 @@ public class SseServiceImpl implements ISseService {
                count++;
                RedisUtils.setCacheObject(redisKey, count);
            }
-
    }

    /**
@@ -145,8 +142,7 @@ public class SseServiceImpl implements ISseService {
        if(StringUtils.isEmpty(sysPrompt)){
            sysPrompt ="你是一个由RuoYI-AI开发的人工智能助手，名字叫熊猫助手。你擅长中英文对话，能够理解并处理各种问题，提供安全、有帮助、准确的回答。" +
                    "当前时间："+ DateUtils.getDate()+
-                    "#注意：回复之前注意结合上下文和工具返回内容。";
-
+                    "#注意：回复之前注意结合上下文和工具返回内容进行回复。";
        }
        // 设置系统默认提示词
        Message sysMessage = Message.builder().content(sysPrompt).role(Message.Role.SYSTEM).build();
@@ -273,20 +269,4 @@ public class SseServiceImpl implements ISseService {
        return file;
    }

-
-    @Override
-    public String wxCpChat(String prompt) {
-        List<Message> messageList = new ArrayList<>();
-        Message message = Message.builder().role(Message.Role.USER).content(prompt).build();
-        messageList.add(message);
-        ChatCompletion chatCompletion = ChatCompletion
-            .builder()
-            .messages(messageList)
-            .model("gpt-4o-mini")
-            .stream(false)
-            .build();
-        ChatCompletionResponse chatCompletionResponse = openAiStreamClient.chatCompletion(chatCompletion);
-        return chatCompletionResponse.getChoices().get(0).getMessage().getContent().toString();
-    }
-
 }
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/OpenAiVectorizationImpl.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/OpenAiVectorizationImpl.java
@@ -53,7 +53,7 @@ public class OpenAiVectorizationImpl implements VectorizationService {
        ChatModelVo chatModelVo = chatModelService.selectModelByName(knowledgeInfoVo.getVectorModel());
        String apiHost= chatModelVo.getApiHost();
        String apiKey= chatModelVo.getApiKey();
-        openAiStreamClient = chatConfig.createOpenAiStreamClient(apiHost,apiKey);
+        openAiStreamClient = ChatConfig.createOpenAiStreamClient(apiHost,apiKey);
        Embedding embedding = buildEmbedding(chunkList, knowledgeInfoVo);
        EmbeddingResponse embeddings = openAiStreamClient.embeddings(embedding);
        // 处理 OpenAI 返回的嵌入数据
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/SSEUtil.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/util/SSEUtil.java
@@ -21,11 +21,8 @@ public class SSEUtil {
     * @param errorMessage 错误信息
     */
    public static void sendErrorEvent(ResponseBodyEmitter sseEmitter, String errorMessage) {
-        SseEmitter.SseEventBuilder event = SseEmitter.event()
-                .name("error")
-                .data(errorMessage);
        try {
-            sseEmitter.send(event);
+            sseEmitter.send(errorMessage);
        } catch (IOException e) {
            log.error("SSE发送失败: {}", e.getMessage());
        }
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
@@ -19,12 +19,10 @@ import org.ruoyi.common.core.constant.TenantConstants;
 import org.ruoyi.common.core.domain.dto.RoleDTO;
 import org.ruoyi.common.core.domain.model.LoginUser;
 import org.ruoyi.common.core.domain.model.VisitorLoginBody;
-import org.ruoyi.common.core.domain.model.VisitorLoginUser;
 import org.ruoyi.common.core.enums.*;
 import org.ruoyi.common.core.exception.user.CaptchaException;
 import org.ruoyi.common.core.exception.user.CaptchaExpireException;
 import org.ruoyi.common.core.exception.user.UserException;
-import org.ruoyi.common.core.service.ConfigService;
 import org.ruoyi.common.core.utils.*;
 import org.ruoyi.common.log.event.LogininforEvent;
 import org.ruoyi.common.redis.utils.RedisUtils;
@@ -32,8 +30,7 @@ import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.common.tenant.exception.TenantException;
 import org.ruoyi.common.tenant.helper.TenantHelper;
 import org.ruoyi.system.domain.SysUser;
-import org.ruoyi.system.domain.bo.SysUserBo;
-import org.ruoyi.system.domain.vo.LoginVo;
+
 import org.ruoyi.system.domain.vo.SysTenantVo;
 import org.ruoyi.system.domain.vo.SysUserVo;
 import org.ruoyi.system.mapper.SysUserMapper;
@@ -43,7 +40,6 @@ import org.springframework.stereotype.Service;
 import java.time.Duration;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 import java.util.function.Supplier;

 /**
@@ -60,8 +56,6 @@ public class SysLoginService {
    private final WxMaService wxMaService;
    private final ISysPermissionService permissionService;
    private final ISysTenantService tenantService;
-    private final ISysUserService userService;
-    private final ConfigService configService;

    @Value("${user.password.maxRetryCount}")
    private Integer maxRetryCount;
@@ -69,7 +63,7 @@ public class SysLoginService {
    private Integer lockTime;

    /**
-     * 获取微信
+     * 获取微信code
     * @param xcxCode 获取xcxCode
    */
    public String getOpenidFromCode(String xcxCode) {
@@ -137,9 +131,8 @@ public class SysLoginService {
        return StpUtil.getTokenValue();
    }

-
    /**
-     * 游客登录
+     * 微信小程序登录
     *
     * @param loginBody
     * @return String
@@ -164,57 +157,6 @@ public class SysLoginService {
        }
    }

-    public LoginVo mpLogin(String openid) {
-        // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
-        SysUserVo user = userService.selectUserByOpenId(openid);
-        VisitorLoginUser loginUser = new VisitorLoginUser();
-        if (ObjectUtil.isNull(user)) {
-            SysUserBo sysUser = new SysUserBo();
-            // 改为自增
-            String name = "用户" + UUID.randomUUID().toString().replace("-", "");
-            // 设置默认用户名
-            sysUser.setUserName(name);
-            // 设置默认昵称
-            sysUser.setNickName(name);
-            // 设置默认密码
-            sysUser.setPassword(BCrypt.hashpw("123456"));
-            // 设置微信openId
-            sysUser.setOpenId(openid);
-            String configValue = configService.getConfigValue("mail", "amount");
-            // 设置默认余额
-            sysUser.setUserBalance(NumberUtils.toDouble(configValue, 1));
-            // 注册用户,设置默认租户为0
-            SysUser registerUser = userService.registerUser(sysUser, "0");
-
-            // 构建登录用户信息
-            loginUser.setTenantId("0");
-            loginUser.setUserId(registerUser.getUserId());
-            loginUser.setUsername(registerUser.getUserName());
-            loginUser.setUserType(UserType.APP_USER.getUserType());
-            loginUser.setOpenid(openid);
-            loginUser.setNickName(registerUser.getNickName());
-
-        } else {
-            // 此处可根据登录用户的数据不同 自行创建 loginUser
-            loginUser.setTenantId(user.getTenantId());
-            loginUser.setUserId(user.getUserId());
-            loginUser.setUsername(user.getUserName());
-            loginUser.setUserType(user.getUserType());
-            loginUser.setNickName(user.getNickName());
-            loginUser.setAvatar(user.getWxAvatar());
-            loginUser.setOpenid(openid);
-        }
-        // 生成token
-        LoginHelper.loginByDevice(loginUser, DeviceType.XCX);
-        recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        LoginVo loginVo = new LoginVo();
-        // 生成令牌
-        loginVo.setToken(StpUtil.getTokenValue());
-        loginVo.setUserInfo(loginUser);
-        return loginVo;
-    }
-
-
    /**
     * 退出登录
     */
--- a/ruoyi-modules/ruoyi-wechat/pom.xml
+++ b/ruoyi-modules/ruoyi-wechat/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.ruoyi</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ruoyi-wechat</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-chat-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-system-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/builder/AbstractBuilder.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/builder/AbstractBuilder.java
@@ -0,0 +1,12 @@
+package org.ruoyi.builder;
+
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+
+/**
+ *  @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public abstract class AbstractBuilder {
+  public abstract WxCpXmlOutMessage build(String content, WxCpXmlMessage wxMessage, WxCpService service);
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/builder/ImageBuilder.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/builder/ImageBuilder.java
@@ -0,0 +1,24 @@
+package org.ruoyi.builder;
+
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutImageMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+
+/**
+ *  @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class ImageBuilder extends AbstractBuilder {
+
+  @Override
+  public WxCpXmlOutMessage build(String content, WxCpXmlMessage wxMessage,
+                                 WxCpService service) {
+
+    WxCpXmlOutImageMessage m = WxCpXmlOutMessage.IMAGE().mediaId(content)
+        .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
+        .build();
+
+    return m;
+  }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/builder/TextBuilder.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/builder/TextBuilder.java
@@ -0,0 +1,22 @@
+package org.ruoyi.builder;
+
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutTextMessage;
+
+/**
+ *  @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class TextBuilder extends AbstractBuilder {
+
+  @Override
+  public WxCpXmlOutMessage build(String content, WxCpXmlMessage wxMessage,
+                                 WxCpService service) {
+    WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content(content)
+        .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
+        .build();
+    return m;
+  }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/config/WxCpConfiguration.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/config/WxCpConfiguration.java
@@ -0,0 +1,130 @@
+package org.ruoyi.config;
+
+
+import com.google.common.collect.Maps;
+import jakarta.annotation.PostConstruct;
+import lombok.val;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
+import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
+import me.chanjar.weixin.cp.constant.WxCpConsts;
+import me.chanjar.weixin.cp.message.WxCpMessageHandler;
+import me.chanjar.weixin.cp.message.WxCpMessageRouter;
+import org.ruoyi.handler.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 单实例配置
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Configuration
+@EnableConfigurationProperties(WxCpProperties.class)
+public class WxCpConfiguration {
+    private final LogHandler logHandler;
+    private NullHandler nullHandler;
+    private LocationHandler locationHandler;
+    private MenuHandler menuHandler;
+    private MsgHandler msgHandler;
+    private final UnsubscribeHandler unsubscribeHandler;
+    private SubscribeHandler subscribeHandler;
+    private WxCpProperties properties;
+
+    private static Map<Integer, WxCpMessageRouter> routers = Maps.newHashMap();
+    private static Map<Integer, WxCpService> cpServices = Maps.newHashMap();
+
+    @Autowired
+    public WxCpConfiguration(LogHandler logHandler, NullHandler nullHandler, LocationHandler locationHandler,
+                             MenuHandler menuHandler, MsgHandler msgHandler, UnsubscribeHandler unsubscribeHandler,
+                             SubscribeHandler subscribeHandler, WxCpProperties properties) {
+        this.logHandler = logHandler;
+        this.nullHandler = nullHandler;
+        this.locationHandler = locationHandler;
+        this.menuHandler = menuHandler;
+        this.msgHandler = msgHandler;
+        this.unsubscribeHandler = unsubscribeHandler;
+        this.subscribeHandler = subscribeHandler;
+        this.properties = properties;
+    }
+
+
+    public static Map<Integer, WxCpMessageRouter> getRouters() {
+        return routers;
+    }
+
+    public static WxCpService getCpService(Integer agentId) {
+        return cpServices.get(agentId);
+    }
+
+    @PostConstruct
+    public void initServices() {
+        cpServices = this.properties.getAppConfigs().stream().map(a -> {
+            val configStorage = new WxCpDefaultConfigImpl();
+            configStorage.setCorpId(this.properties.getCorpId());
+            configStorage.setAgentId(a.getAgentId());
+            configStorage.setCorpSecret(a.getSecret());
+            configStorage.setToken(a.getToken());
+            configStorage.setAesKey(a.getAesKey());
+            val service = new WxCpServiceImpl();
+            service.setWxCpConfigStorage(configStorage);
+            routers.put(a.getAgentId(), this.newRouter(service));
+            return service;
+        }).collect(Collectors.toMap(service -> service.getWxCpConfigStorage().getAgentId(), a -> a));
+    }
+
+    private WxCpMessageRouter newRouter(WxCpService wxCpService) {
+        final val newRouter = new WxCpMessageRouter(wxCpService);
+
+        // 记录所有事件的日志 （异步执行）
+        newRouter.rule().handler(this.logHandler).next();
+
+        // 自定义菜单事件
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxConsts.MenuButtonType.CLICK).handler(this.menuHandler).end();
+
+        // 点击菜单链接事件（这里使用了一个空的处理器，可以根据自己需要进行扩展）
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxConsts.MenuButtonType.VIEW).handler(this.nullHandler).end();
+
+        // 关注事件
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxConsts.EventType.SUBSCRIBE).handler(this.subscribeHandler)
+            .end();
+
+        // 取消关注事件
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxConsts.EventType.UNSUBSCRIBE)
+            .handler((WxCpMessageHandler) this.unsubscribeHandler).end();
+
+        // 上报地理位置事件
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxConsts.EventType.LOCATION).handler(this.locationHandler)
+            .end();
+
+        // 接收地理位置消息
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.LOCATION)
+            .handler(this.locationHandler).end();
+
+        // 扫码事件（这里使用了一个空的处理器，可以根据自己需要进行扩展）
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxConsts.EventType.SCAN).handler((WxCpMessageHandler) this.nullHandler).end();
+
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxCpConsts.EventType.CHANGE_CONTACT).handler(new ContactChangeHandler()).end();
+
+        newRouter.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+            .event(WxCpConsts.EventType.ENTER_AGENT).handler(new EnterAgentHandler()).end();
+
+        // 默认
+        newRouter.rule().async(false).handler(this.msgHandler).end();
+
+        return newRouter;
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/config/WxCpProperties.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/config/WxCpProperties.java
@@ -0,0 +1,48 @@
+package org.ruoyi.config;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Data
+@ConfigurationProperties(prefix = "wechat.cp")
+public class WxCpProperties {
+  /**
+   * 设置企业微信的corpId
+   */
+  private String corpId;
+
+  private List<AppConfig> appConfigs;
+
+  @Getter
+  @Setter
+  public static class AppConfig {
+    /**
+     * 设置企业微信应用的AgentId
+     */
+    private Integer agentId;
+
+    /**
+     * 设置企业微信应用的Secret
+     */
+    private String secret;
+
+    /**
+     * 设置企业微信应用的token
+     */
+    private String token;
+
+    /**
+     * 设置企业微信应用的EncodingAESKey
+     */
+    private String aesKey;
+
+  }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WeixinServerController.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WeixinServerController.java
@@ -0,0 +1,48 @@
+package org.ruoyi.controller;
+
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.ruoyi.service.WeixinUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Slf4j
+@RestController
+public class WeixinServerController {
+
+    @Autowired
+    private WeixinUserService weixinUserService;
+
+    @GetMapping(value = "/weixin/check")
+    public String weixinCheck(HttpServletRequest request) {
+        String signature = request.getParameter("signature");
+        String timestamp = request.getParameter("timestamp");
+        String nonce = request.getParameter("nonce");
+        String echostr = request.getParameter("echostr");
+
+        if (StringUtils.isEmpty(signature) || StringUtils.isEmpty(timestamp) || StringUtils.isEmpty(nonce)) {
+            return "";
+        }
+        weixinUserService.checkSignature(signature, timestamp, nonce);
+        return echostr;
+    }
+
+    @PostMapping(value = "/weixin/check")
+    public String weixinMsg(@RequestBody String requestBody, @RequestParam("signature") String signature,
+        @RequestParam("timestamp") String timestamp, @RequestParam("nonce") String nonce) {
+
+        log.debug("requestBody:{}", requestBody);
+        log.debug("signature:{}", signature);
+        log.debug("timestamp:{}", timestamp);
+        log.debug("nonce:{}", nonce);
+
+        weixinUserService.checkSignature(signature, timestamp, nonce);
+        return weixinUserService.handleWeixinMsg(requestBody);
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WeixinUserController.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WeixinUserController.java
@@ -0,0 +1,52 @@
+package org.ruoyi.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.domin.WeixinQrCode;
+import org.ruoyi.service.VxLoginService;
+import org.ruoyi.system.domain.vo.LoginVo;
+import org.ruoyi.util.WeixinApiUtil;
+import org.ruoyi.util.WeixinQrCodeCacheUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Slf4j
+@RestController
+public class WeixinUserController {
+
+    @Autowired
+    private WeixinApiUtil weixinApiUtil;
+
+    @Autowired
+    private VxLoginService loginService;
+
+    @GetMapping(value = "/user/qrcode")
+    public R<WeixinQrCode> getQrCode() {
+        WeixinQrCode qrCode = weixinApiUtil.getQrCode();
+        qrCode.setUrl(null);
+        qrCode.setExpireSeconds(null);
+        return R.ok(qrCode);
+    }
+
+    /**
+     * 校验是否扫描完成
+     * 完成，返回 JWT
+     * 未完成，返回 check failed
+     */
+    @GetMapping(value = "/user/login/qrcode")
+    public R<LoginVo> userLogin(String ticket) {
+        String openId = WeixinQrCodeCacheUtil.get(ticket);
+        if (StringUtils.isNotEmpty(openId)) {
+            log.info("login success,open id:{}", openId);
+            LoginVo loginVo = loginService.mpLogin(openId);
+            return R.ok(loginVo);
+        }
+        log.info("login error,ticket:{}", ticket);
+        return R.fail("check failed");
+    }
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WxPortalController.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WxPortalController.java
@@ -0,0 +1,86 @@
+package org.ruoyi.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.ruoyi.common.core.utils.JsonUtils;
+
+import org.ruoyi.config.WxCpConfiguration;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@RestController
+@RequestMapping("/wx/cp")
+@Slf4j
+public class WxPortalController {
+
+    @Value("${wechat.cp.appConfigs[0].agentId}")
+    private Integer agentId;
+
+
+  @GetMapping(produces = "text/plain;charset=utf-8")
+  public String authGet(
+                        @RequestParam(name = "msg_signature", required = false) String signature,
+                        @RequestParam(name = "timestamp", required = false) String timestamp,
+                        @RequestParam(name = "nonce", required = false) String nonce,
+                        @RequestParam(name = "echostr", required = false) String echostr) {
+    log.info("\n接收到来自微信服务器的认证消息：signature = [{}], timestamp = [{}], nonce = [{}], echostr = [{}]",
+        signature, timestamp, nonce, echostr);
+
+    if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) {
+      throw new IllegalArgumentException("请求参数非法，请核实!");
+    }
+
+    final WxCpService wxCpService = WxCpConfiguration.getCpService(agentId);
+    if (wxCpService == null) {
+      throw new IllegalArgumentException(String.format("未找到对应agentId=[%d]的配置，请核实！", agentId));
+    }
+
+    if (wxCpService.checkSignature(signature, timestamp, nonce, echostr)) {
+      return new WxCpCryptUtil(wxCpService.getWxCpConfigStorage()).decrypt(echostr);
+    }
+
+    return "非法请求";
+  }
+
+  @PostMapping(produces = "application/xml; charset=UTF-8")
+  public String post(
+                     @RequestBody String requestBody,
+                     @RequestParam("msg_signature") String signature,
+                     @RequestParam("timestamp") String timestamp,
+                     @RequestParam("nonce") String nonce) {
+    log.info("\n接收微信请求：[signature=[{}], timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
+        signature, timestamp, nonce, requestBody);
+
+    final WxCpService wxCpService = WxCpConfiguration.getCpService(1000002);
+    WxCpXmlMessage inMessage = WxCpXmlMessage.fromEncryptedXml(requestBody, wxCpService.getWxCpConfigStorage(),
+        timestamp, nonce, signature);
+    log.debug("\n消息解密后内容为：\n{} ", JsonUtils.toJson(inMessage));
+    WxCpXmlOutMessage outMessage = this.route(1000002, inMessage);
+    if (outMessage == null) {
+      return "";
+    }
+
+    String out = outMessage.toEncryptedXml(wxCpService.getWxCpConfigStorage());
+    log.debug("\n组装回复信息：{}", out);
+    return out;
+  }
+
+  private WxCpXmlOutMessage route(Integer agentId, WxCpXmlMessage message) {
+    try {
+      return WxCpConfiguration.getRouters().get(agentId).route(message);
+    } catch (Exception e) {
+      log.error(e.getMessage(), e);
+    }
+
+    return null;
+  }
+
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/domin/ReceiveMessage.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/domin/ReceiveMessage.java
@@ -0,0 +1,58 @@
+package org.ruoyi.domin;
+
+import lombok.Data;
+
+@Data
+public class ReceiveMessage {
+    /**
+     * 开发者微信号
+     */
+    private String toUserName;
+    /**
+     * 发送方账号(一个openid）
+     */
+    private String fromUserName;
+    /**
+     * 消息创建时间（整形）
+     */
+    private String createTime;
+    /**
+     * 消息类型
+     */
+    private String msgType;
+    /**
+     * 文本消息内容
+     */
+    private String content;
+    /**
+     * 消息ID 64位
+     */
+    String msgId;
+    /**
+     * 消息的数据ID 消息来自文章才有
+     */
+    private String msgDataId;
+    /**
+     * 多图文时第几篇文章，从1开始 消息如果来自文章才有
+     */
+    private String idx;
+    /**
+     * 订阅事件 subscribe 订阅 unsbscribe 取消订阅
+     */
+    private String event;
+    /**
+     * 扫码 - ticket
+     */
+    private String ticket;
+
+    public String getReplyTextMsg(String msg) {
+        String xml = "<xml>\n"
+            + "       <ToUserName><![CDATA[" + getFromUserName() + "]]></ToUserName>\n"
+            + "       <FromUserName><![CDATA[" + getToUserName() + "]]></FromUserName>\n"
+            + "       <CreateTime>" + System.currentTimeMillis() + "</CreateTime>\n"
+            + "       <MsgType><![CDATA[text]]></MsgType>\n"
+            + "       <Content><![CDATA[" + msg + "]]></Content>\n"
+            + "     </xml>";
+        return xml;
+    }
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/domin/WeixinQrCode.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/domin/WeixinQrCode.java
@@ -0,0 +1,15 @@
+package org.ruoyi.domin;
+
+import lombok.Data;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Data
+public class WeixinQrCode {
+
+    private String ticket;
+    private Long expireSeconds;
+    private String url;
+    private String qrCodeUrl;
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/AbstractHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/AbstractHandler.java
@@ -0,0 +1,9 @@
+package org.ruoyi.handler;
+
+import me.chanjar.weixin.cp.message.WxCpMessageHandler;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public abstract class AbstractHandler implements WxCpMessageHandler {
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/ContactChangeHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/ContactChangeHandler.java
@@ -0,0 +1,34 @@
+package org.ruoyi.handler;
+
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.ruoyi.builder.TextBuilder;
+import org.ruoyi.common.core.utils.JsonUtils;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 通讯录变更事件处理器.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+@Component
+public class ContactChangeHandler extends AbstractHandler {
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) {
+        String content = "收到通讯录变更事件，内容：" + JsonUtils.toJson(wxMessage);
+        log.info(content);
+
+        return new TextBuilder().build(content, wxMessage, cpService);
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/EnterAgentHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/EnterAgentHandler.java
@@ -0,0 +1,29 @@
+package org.ruoyi.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+
+import java.util.Map;
+
+/**
+ * <pre>
+ *
+ * Created by Binary Wang on 2018/8/27.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+public class EnterAgentHandler extends AbstractHandler {
+    private static final int TEST_AGENT = 1000002;
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService, WxSessionManager sessionManager) throws WxErrorException {
+        // do something
+        return null;
+    }
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/LocationHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/LocationHandler.java
@@ -0,0 +1,44 @@
+package org.ruoyi.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.ruoyi.builder.TextBuilder;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+@Component
+public class LocationHandler extends AbstractHandler {
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) {
+        if (wxMessage.getMsgType().equals(WxConsts.XmlMsgType.LOCATION)) {
+            //TODO 接收处理用户发送的地理位置消息
+            try {
+                String content = "感谢反馈，您的的地理位置已收到！";
+                return new TextBuilder().build(content, wxMessage, null);
+            } catch (Exception e) {
+                log.error("位置消息接收处理失败", e);
+                return null;
+            }
+        }
+
+        //上报地理位置事件
+        log.info("\n上报地理位置，纬度 : {}\n经度 : {}\n精度 : {}",
+            wxMessage.getLatitude(), wxMessage.getLongitude(), String.valueOf(wxMessage.getPrecision()));
+
+        //TODO  可以将用户地理位置信息保存到本地数据库，以便以后使用
+
+        return null;
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/LogHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/LogHandler.java
@@ -0,0 +1,26 @@
+package org.ruoyi.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.ruoyi.common.core.utils.JsonUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+@Component
+public class LogHandler extends AbstractHandler {
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) {
+        log.info("\n接收到请求消息，内容：{}", JsonUtils.toJson(wxMessage));
+        return null;
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/MenuHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/MenuHandler.java
@@ -0,0 +1,34 @@
+package org.ruoyi.handler;
+
+import me.chanjar.weixin.common.api.WxConsts.MenuButtonType;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Component
+public class MenuHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+
+    String msg = String.format("type:%s, event:%s, key:%s",
+        wxMessage.getMsgType(), wxMessage.getEvent(),
+        wxMessage.getEventKey());
+    if (MenuButtonType.VIEW.equals(wxMessage.getEvent())) {
+      return null;
+    }
+
+    return WxCpXmlOutMessage.TEXT().content(msg)
+        .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
+        .build();
+  }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/MsgHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/MsgHandler.java
@@ -0,0 +1,43 @@
+package org.ruoyi.handler;
+
+import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+
+import org.ruoyi.builder.TextBuilder;
+import org.ruoyi.service.IChatVxService;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Component
+@RequiredArgsConstructor
+public class MsgHandler extends AbstractHandler {
+
+    private final IChatVxService chatVxService;
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) {
+        final String msgType = wxMessage.getMsgType();
+        if (msgType == null) {
+            // 如果msgType没有，就自己根据具体报文内容做处理
+        }
+
+        if (!msgType.equals(WxConsts.XmlMsgType.EVENT)) {
+            //TODO 可以选择将消息保存到本地
+        }
+        //TODO 组装回复消息
+        String content = chatVxService.chat(wxMessage.getContent());
+
+        return new TextBuilder().build(content, wxMessage, cpService);
+
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/NullHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/NullHandler.java
@@ -0,0 +1,23 @@
+package org.ruoyi.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Component
+public class NullHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+    return null;
+  }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/ScanHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/ScanHandler.java
@@ -0,0 +1,8 @@
+package org.ruoyi.handler;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public abstract class ScanHandler extends AbstractHandler {
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/SubscribeHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/SubscribeHandler.java
@@ -0,0 +1,63 @@
+package org.ruoyi.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpUser;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.ruoyi.builder.TextBuilder;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+@Component
+public class SubscribeHandler extends AbstractHandler {
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) throws WxErrorException {
+
+        log.info("新关注用户 OPENID: " + wxMessage.getFromUserName());
+
+        // 获取微信用户基本信息
+        WxCpUser userWxInfo = cpService.getUserService().getById(wxMessage.getFromUserName());
+
+        if (userWxInfo != null) {
+            // TODO 可以添加关注用户到本地
+        }
+
+        WxCpXmlOutMessage responseResult = null;
+        try {
+            responseResult = handleSpecial(wxMessage);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+
+        if (responseResult != null) {
+            return responseResult;
+        }
+
+        try {
+            return new TextBuilder().build("感谢关注", wxMessage, cpService);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+
+        return null;
+    }
+
+    /**
+     * 处理特殊请求，比如如果是扫码进来的，可以做相应处理
+     */
+    private WxCpXmlOutMessage handleSpecial(WxCpXmlMessage wxMessage) {
+        //TODO
+        return null;
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/UnsubscribeHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/UnsubscribeHandler.java
@@ -0,0 +1,28 @@
+package org.ruoyi.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+@Component
+public class UnsubscribeHandler extends AbstractHandler {
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) {
+        String openId = wxMessage.getFromUserName();
+        log.info("取消关注用户 OPENID: " + openId);
+        // TODO 可以更新本地数据库为取消关注状态
+        return null;
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/VxLoginService.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/VxLoginService.java
@@ -0,0 +1,108 @@
+package org.ruoyi.service;
+
+import cn.dev33.satoken.secure.BCrypt;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.ruoyi.common.core.constant.Constants;
+import org.ruoyi.common.core.domain.model.VisitorLoginUser;
+import org.ruoyi.common.core.enums.DeviceType;
+import org.ruoyi.common.core.enums.UserType;
+import org.ruoyi.common.core.service.ConfigService;
+import org.ruoyi.common.core.utils.MessageUtils;
+import org.ruoyi.common.core.utils.ServletUtils;
+import org.ruoyi.common.core.utils.SpringUtils;
+import org.ruoyi.common.log.event.LogininforEvent;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.system.domain.SysUser;
+import org.ruoyi.system.domain.bo.SysUserBo;
+import org.ruoyi.system.domain.vo.LoginVo;
+import org.ruoyi.system.domain.vo.SysUserVo;
+import org.ruoyi.system.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+
+/**
+ * 描述：微信公众号登录
+ *
+ * @author ageerle@163.com
+ * date 2025/4/30
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class VxLoginService {
+
+    private final ISysUserService userService;
+
+    private final ConfigService configService;
+
+    public LoginVo mpLogin(String openid) {
+        // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
+        SysUserVo user = userService.selectUserByOpenId(openid);
+        VisitorLoginUser loginUser = new VisitorLoginUser();
+        if (ObjectUtil.isNull(user)) {
+            SysUserBo sysUser = new SysUserBo();
+            String name = "用户" + UUID.randomUUID().toString().replace("-", "");
+            // 设置默认用户名
+            sysUser.setUserName(name);
+            // 设置默认昵称
+            sysUser.setNickName(name);
+            // 设置默认密码
+            sysUser.setPassword(BCrypt.hashpw("123456"));
+            // 设置微信openId
+            sysUser.setOpenId(openid);
+            String configValue = configService.getConfigValue("mail", "amount");
+            // 设置默认余额
+            sysUser.setUserBalance(NumberUtils.toDouble(configValue, 1));
+            // 注册用户,设置默认租户为0
+            SysUser registerUser = userService.registerUser(sysUser, "0");
+
+            // 构建登录用户信息
+            loginUser.setTenantId("0");
+            loginUser.setUserId(registerUser.getUserId());
+            loginUser.setUsername(registerUser.getUserName());
+            loginUser.setUserType(UserType.APP_USER.getUserType());
+            loginUser.setOpenid(openid);
+            loginUser.setNickName(registerUser.getNickName());
+        } else {
+            // 此处可根据登录用户的数据不同 自行创建 loginUser
+            loginUser.setTenantId(user.getTenantId());
+            loginUser.setUserId(user.getUserId());
+            loginUser.setUsername(user.getUserName());
+            loginUser.setUserType(user.getUserType());
+            loginUser.setNickName(user.getNickName());
+            loginUser.setAvatar(user.getWxAvatar());
+            loginUser.setOpenid(openid);
+        }
+        // 生成token
+        LoginHelper.loginByDevice(loginUser, DeviceType.XCX);
+        recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+        LoginVo loginVo = new LoginVo();
+        // 生成令牌
+        loginVo.setToken(StpUtil.getTokenValue());
+        loginVo.setUserInfo(loginUser);
+        return loginVo;
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     */
+    private void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/WeixinUserService.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/WeixinUserService.java
@@ -0,0 +1,10 @@
+package org.ruoyi.service;
+
+
+public interface WeixinUserService {
+
+    void checkSignature(String signature, String timestamp, String nonce);
+
+    String handleWeixinMsg(String body);
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/impl/WeixinUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/impl/WeixinUserServiceImpl.java
@@ -0,0 +1,65 @@
+package org.ruoyi.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.ruoyi.domin.ReceiveMessage;
+import org.ruoyi.service.WeixinUserService;
+import org.ruoyi.util.WeixinMsgUtil;
+import org.ruoyi.util.WeixinQrCodeCacheUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+
+@Slf4j
+@Service
+public class WeixinUserServiceImpl implements WeixinUserService {
+
+    private String token = "panda";
+
+    @Override
+    public void checkSignature(String signature, String timestamp, String nonce) {
+        String[] arr = new String[] {token, timestamp, nonce};
+        Arrays.sort(arr);
+        StringBuilder content = new StringBuilder();
+        for (String str : arr) {
+            content.append(str);
+        }
+        String tmpStr = DigestUtils.sha1Hex(content.toString());
+        if (tmpStr.equals(signature)) {
+            log.info("check success");
+            return;
+        }
+        log.error("check fail");
+        throw new RuntimeException("check fail");
+    }
+
+    @Override
+    public String handleWeixinMsg(String requestBody) {
+        ReceiveMessage receiveMessage = WeixinMsgUtil.msgToReceiveMessage(requestBody);
+        // 扫码登录
+        if (WeixinMsgUtil.isScanQrCode(receiveMessage)) {
+            return handleScanLogin(receiveMessage);
+        }
+        // 关注
+        if (WeixinMsgUtil.isEventAndSubscribe(receiveMessage)) {
+            return receiveMessage.getReplyTextMsg("感谢您的关注！");
+        }
+        return receiveMessage.getReplyTextMsg("收到（自动回复）");
+    }
+
+    /**
+     * 处理扫码登录
+     *
+     * @param receiveMessage
+     * @return
+     */
+    private String handleScanLogin(ReceiveMessage receiveMessage) {
+        String qrCodeTicket = WeixinMsgUtil.getQrCodeTicket(receiveMessage);
+        if (WeixinQrCodeCacheUtil.get(qrCodeTicket) == null) {
+            String openId = receiveMessage.getFromUserName();
+            WeixinQrCodeCacheUtil.put(qrCodeTicket, openId);
+        }
+        return receiveMessage.getReplyTextMsg("你已成功登录！");
+    }
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/KeyUtils.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/KeyUtils.java
@@ -0,0 +1,24 @@
+package org.ruoyi.util;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.util.UUID;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+public class KeyUtils {
+
+    public synchronized static String key6() {
+        return RandomStringUtils.randomAlphanumeric(6);
+    }
+
+    public synchronized static String key16() {
+        return RandomStringUtils.randomAlphanumeric(16);
+    }
+
+    public static String uuid32() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinApiUtil.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinApiUtil.java
@@ -0,0 +1,81 @@
+package org.ruoyi.util;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.common.core.service.ConfigService;
+import org.ruoyi.domin.WeixinQrCode;
+import org.springframework.stereotype.Component;
+
+import java.net.URI;
+import java.time.LocalDateTime;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class WeixinApiUtil {
+
+    private final ConfigService configService;
+
+    private static String QR_CODE_URL_PREFIX = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=";
+
+    private static String ACCESS_TOKEN = null;
+    private static LocalDateTime ACCESS_TOKEN_EXPIRE_TIME = null;
+    /**
+     * 二维码 Ticket 过期时间
+     */
+    private static int QR_CODE_TICKET_TIMEOUT = 10 * 60;
+
+    /**
+     * 获取 access token
+     *
+     * @return
+     */
+    public synchronized String getAccessToken() {
+        if (ACCESS_TOKEN != null && ACCESS_TOKEN_EXPIRE_TIME.isAfter(LocalDateTime.now())) {
+            return ACCESS_TOKEN;
+        }
+        String api = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + getKey("appid") + "&secret="
+            + getKey("secret");
+        String result = HttpUtil.get(api);
+        JSONObject jsonObject = JSON.parseObject(result);
+        ACCESS_TOKEN = jsonObject.getString("access_token");
+        ACCESS_TOKEN_EXPIRE_TIME = LocalDateTime.now().plusSeconds(jsonObject.getLong("expires_in") - 10);
+        return ACCESS_TOKEN;
+    }
+
+    /**
+     * 获取二维码 Ticket
+     *
+     * https://developers.weixin.qq.com/doc/offiaccount/Account_Management/Generating_a_Parametric_QR_Code.html
+     *
+     * @return
+     */
+    public WeixinQrCode getQrCode() {
+        String api = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + getAccessToken();
+        String jsonBody = String.format("{\n"
+            + "  \"expire_seconds\": %d,\n"
+            + "  \"action_name\": \"QR_STR_SCENE\",\n"
+            + "  \"action_info\": {\n"
+            + "    \"scene\": {\n"
+            + "      \"scene_str\": \"%s\"\n"
+            + "    }\n"
+            + "  }\n"
+            + "}", QR_CODE_TICKET_TIMEOUT, KeyUtils.uuid32());
+        String result = HttpUtil.post(api, jsonBody);
+        log.info("get qr code params:{}", jsonBody);
+        log.info("get qr code result:{}", result);
+        WeixinQrCode weixinQrCode = JSON.parseObject(result, WeixinQrCode.class);
+        weixinQrCode.setQrCodeUrl(QR_CODE_URL_PREFIX + URI.create(weixinQrCode.getTicket()).toASCIIString());
+        return weixinQrCode;
+    }
+
+    public String getKey(String key) {
+        return configService.getConfigValue("weixin", key);
+    }
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinMsgUtil.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinMsgUtil.java
@@ -0,0 +1,66 @@
+package org.ruoyi.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.ruoyi.domin.ReceiveMessage;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+public class WeixinMsgUtil {
+
+    // 事件-关注
+    private static String EVENT_SUBSCRIBE = "subscribe";
+
+    /**
+     * 微信消息转对象
+     *
+     * @param xml
+     * @return
+     */
+    public static ReceiveMessage msgToReceiveMessage(String xml) {
+        JSONObject jsonObject = JSON.parseObject(XmlUtil.xml2json(xml));
+        ReceiveMessage receiveMessage = new ReceiveMessage();
+        receiveMessage.setToUserName(jsonObject.getString("ToUserName"));
+        receiveMessage.setFromUserName(jsonObject.getString("FromUserName"));
+        receiveMessage.setCreateTime(jsonObject.getString("CreateTime"));
+        receiveMessage.setMsgType(jsonObject.getString("MsgType"));
+        receiveMessage.setContent(jsonObject.getString("Content"));
+        receiveMessage.setMsgId(jsonObject.getString("MsgId"));
+        receiveMessage.setEvent(jsonObject.getString("Event"));
+        receiveMessage.setTicket(jsonObject.getString("Ticket"));
+        return receiveMessage;
+    }
+
+    /**
+     * 是否是订阅事件
+     *
+     * @param receiveMessage
+     * @return
+     */
+    public static boolean isEventAndSubscribe(ReceiveMessage receiveMessage) {
+        return StringUtils.equals(receiveMessage.getEvent(), EVENT_SUBSCRIBE);
+    }
+
+    /**
+     * 是否是二维码扫描事件
+     *
+     * @param receiveMessage
+     * @return
+     */
+    public static boolean isScanQrCode(ReceiveMessage receiveMessage) {
+        return StringUtils.isNotEmpty(receiveMessage.getTicket());
+    }
+
+    /**
+     * 获取扫描的二维码 Ticket
+     *
+     * @param receiveMessage
+     * @return
+     */
+    public static String getQrCodeTicket(ReceiveMessage receiveMessage) {
+        return receiveMessage.getTicket();
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinQrCodeCacheUtil.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinQrCodeCacheUtil.java
@@ -0,0 +1,34 @@
+package org.ruoyi.util;
+
+import java.util.LinkedHashMap;
+
+/**
+ * 微信二维码缓存工具类
+ *
+ * @author https://www.wdbyte.com
+ */
+public class WeixinQrCodeCacheUtil {
+    private static long MAX_CACHE_SIZE = 10000;
+    private static LinkedHashMap<String, String> QR_CODE_TICKET_MAP = new LinkedHashMap<>();
+
+    /**
+     * 增加一个 Ticket
+     * 首次 put：value 为 ""
+     * 再次 put: value 有 openId，若openId已经存在，则已被扫码
+     *
+     * @param key
+     * @param value
+     */
+    public synchronized static void put(String key, String value) {
+        QR_CODE_TICKET_MAP.put(key, value);
+        if (QR_CODE_TICKET_MAP.size() > MAX_CACHE_SIZE) {
+            String first = QR_CODE_TICKET_MAP.keySet().stream().findFirst().get();
+            QR_CODE_TICKET_MAP.remove(first);
+        }
+    }
+
+    public synchronized static String get(String key) {
+        return QR_CODE_TICKET_MAP.remove(key);
+    }
+
+}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/XmlUtil.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/XmlUtil.java
@@ -0,0 +1,28 @@
+package org.ruoyi.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Slf4j
+public class XmlUtil {
+
+    public static String xml2json(String requestBody) {
+        requestBody = StringUtils.trim(requestBody);
+        XmlMapper xmlMapper = new XmlMapper();
+        JsonNode node = null;
+        try {
+            node = xmlMapper.readTree(requestBody.getBytes());
+            ObjectMapper jsonMapper = new ObjectMapper();
+            return jsonMapper.writeValueAsString(node);
+        } catch (Exception e) {
+            log.error("xml 2 json error,msg:" + e.getMessage(), e);
+        }
+        return null;
+    }
+}
--- a/script/sql/update/updatdata20250402.sql
+++ b/script/sql/update/updatdata20250402.sql
@@ -1 +0,0 @@
-INSERT INTO `chat_app_store` (`id`, `name`, `description`, `avatar`, `app_url`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (7, '微信机器人', '微信机器人', 'https://panda-1253683406.cos.ap-guangzhou.myqcloud.com/panda/2025/04/02/0557a7d68fa842bba952ce0d6ef38a2e.png', '/wxbot', NULL, NULL, NULL, NULL, NULL, NULL);
--- a/script/sql/update/updatdata20250407.sql
+++ b/script/sql/update/updatdata20250407.sql
@@ -1,4 +1,4 @@
 INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907575746601119746, '000000', 'vector', 'text-embedding-3-small', 'text-embedding-3-small', 0, '2', '0', NULL, 'https://api.pandarobot.chat/', 'sk-cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:27:54', 1, '2025-04-03 07:27:54', 'text-embedding-3-small');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576007017066497, '000000', 'vector', 'quentinz/bge-large-zh-v1.5', 'bge-large-zh-v1.5', 0, '2', '0', NULL, 'https://api.pandarobot.chat/', 'cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:28:56', 1, '2025-04-03 07:28:56', 'bge-large-zh-v1.5');
+INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576007017066497, '000000', 'vector', 'quentinz/bge-large-zh-v1.5', 'bge-large-zh-v1.5', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:28:56', 1, '2025-04-03 07:28:56', 'bge-large-zh-v1.5');
 INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576806191362049, '000000', 'vector', 'nomic-embed-text', 'nomic-embed-text', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'nomic-embed-text', 103, 1, '2025-04-03 07:32:06', 1, '2025-04-03 07:32:06', 'nomic-embed-text');
 INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907577073490161665, '000000', 'vector', 'snowflake-arctic-embed', 'snowflake-arctic-embed', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'snowflake-arctic-embed', 103, 1, '2025-04-03 07:33:10', 1, '2025-04-03 07:33:10', 'snowflake-arctic-embed');
Author	SHA1	Message	Date
ageer	5476a4b0b7	fix: 公众号登录功能同步	2025-04-30 19:34:09 +08:00
ageerle	cd490aa0e5	feat: 新增wechat模块	2025-04-30 11:29:23 +08:00
ageerle	b1ff44df4b	feat: sse对话样式优化	2025-04-29 11:44:47 +08:00
ageerle	dc6d00f0fc	feat: 查询gpts无需登录	2025-04-29 11:00:34 +08:00
ageerle	990da8da6f	feat: 增加工具调用超时时间配置	2025-04-24 17:09:52 +08:00
ageerle	8fc7ad0359	feat: mcp开启后才执行工具调用	2025-04-24 10:31:58 +08:00
ageer	8a89d9eb9c	fix: 1.合并知识库对话接口 2.修复web无法查询套餐信息	2025-04-23 23:10:31 +08:00
ageer	abfa9ae97b	fix: 1.合并知识库对话接口 2.修复web无法查询套餐信息	2025-04-23 23:09:56 +08:00
ageer	bde2e8ff8e	fix: 1.合并知识库对话接口 2.修复web无法查询套餐信息	2025-04-23 23:09:22 +08:00
ageer	4d8eb1850f	feat: 附件上传逻辑调整	2025-04-22 21:43:40 +08:00
ageer	5aaa3a5662	fix: 1. 修复No static resource tool/gen/list. 2. 修复新增数据库校验异常	2025-04-22 21:24:00 +08:00
ageerle	8fec96f5b2	feat: 默认关闭mcp功能	2025-04-22 18:01:40 +08:00
				`@@ -1 +0,0 @@`
				INSERT INTO `chat_app_store` (`id`, `name`, `description`, `avatar`, `app_url`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (7, '微信机器人', '微信机器人', 'https://panda-1253683406.cos.ap-guangzhou.myqcloud.com/panda/2025/04/02/0557a7d68fa842bba952ce0d6ef38a2e.png', '/wxbot', NULL, NULL, NULL, NULL, NULL, NULL);