Merge remote-tracking branch 'origin/main'

This reverts commit a2905d08f9.

README.md

@@ -38,7 +38,7 @@
 
 ### 拉取镜像(最低配置2H2G):
    ```bash
-     script/docker/ruoyiai目录下执行: docker-compose up -d
+     script/deploy/deploy目录下执行: docker-compose up -d
   ```
 
 ### 通过脚本启动(最低配置4H4G):
@@ -51,7 +51,7 @@
 2. **克隆项目**
    ```bash
    git clone https://github.com/ageerle/ruoyi-ai
-   cd ruoyi-ai/docker-deploy/one-step-script/
+   cd ruoyi-ai/script/deploy/one-step-script
    ```
 
 3. **启动部署脚本**
@@ -97,7 +97,6 @@
 - [项目演示](#项目演示)
   - [管理端](#管理端)
   - [用户端](#用户端)
-  - [小程序端](#小程序端)
 - [开发环境](#开发环境)
 - [项目结构](#项目结构)
   - [ruoyi-ai](#ruoyi-ai)
@@ -112,22 +111,20 @@
 
 ### 系统体验
 - 用户端：https://web.pandarobot.chat
+- 演示账号: demo 密码：demo123
 - 管理端：https://admin.pandarobot.chat
-- 用户名: admin 密码：admin123
+- 演示账号: admin 密码：admin123
-- 温馨提醒：体验前需准备测试key在后台管理配置,体验完成记得删除key信息。
 - 商业版：体验商业版请联系下方小助手获取演示地址（预计6月份上线）。
 
 ### 源码地址
 [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]gitcode
 - 前端服务-用户端：https://gitcode.com/ageerle/ruoyi-web
 - 前端服务-管理端:  https://gitcode.com/ageerle/ruoyi-admin
-- 前端服务-小程序端:  https://gitcode.com/ageerle/ruoyi-uniapp
 - 后端服务：https://gitcode.com/ageerle/ruoyi-ai
 
 ### 配套文档
@@ -136,7 +133,7 @@
 
 ### 核心功能与技术亮点
 #### 1. 全栈式开源系统
-- 全套开源系统：提供完整的前端应用、后台管理以及小程序应用，基于MIT协议，开箱即用。
+- 全套开源系统：提供完整的前端应用、后台管理,基于MIT协议，开箱即用。
 #### 2. 本地化 RAG 方案
 -  基于 **Langchain4j** 框架，支持 Milvus/Weaviate/Qdrant 向量库，结合 BGE-large-zh-v1.5 本地向量化模型 实现高效文档检索与知识库构建。
 -  支持 本地 LLM 接入，结合私有知识库实现安全可控的问答系统，避免依赖云端服务的隐私风险。
@@ -160,13 +157,6 @@
   <img src="image/mcp-04.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);"/>
 </div>
 
-#### 管理端
-<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
-  <img src="image/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);"/>
-  <img src="image/03.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/04.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/05.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);"/>
-</div>
 
 #### 用户端
 <div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
@@ -176,12 +166,15 @@
   <img src="image/11.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);"/>
 </div>
 
-#### 小程序端
+#### 管理端
-<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: flex-start;">
+<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
-  <img src="image/06.png" alt="drawing" style="width: 320px; height: 600px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+  <img src="image/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);"/>
-  <img src="image/07.png" alt="drawing" style="width: 320px; height: 600px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+  <img src="image/03.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/04.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/05.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);"/>
 </div>
 
+
 ### 开发环境
 
 1. jdk 17

ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java

@@ -2,21 +2,16 @@ package org.ruoyi.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import org.ruoyi.common.core.constant.Constants;
 import org.ruoyi.common.core.domain.R;
-import org.ruoyi.common.core.domain.model.EmailLoginBody;
+import org.ruoyi.common.core.domain.model.*;
-import org.ruoyi.common.core.domain.model.LoginBody;
-import org.ruoyi.common.core.domain.model.RegisterBody;
-import org.ruoyi.common.core.domain.model.SmsLoginBody;
-import org.ruoyi.common.core.domain.model.VisitorLoginBody;
 import org.ruoyi.common.core.utils.MapstructUtils;
 import org.ruoyi.common.core.utils.StreamUtils;
 import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.common.tenant.helper.TenantHelper;
-
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
 import org.ruoyi.system.domain.bo.SysTenantBo;
 import org.ruoyi.system.domain.vo.LoginTenantVo;
 import org.ruoyi.system.domain.vo.LoginVo;

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/listener/WebSocketEventListener.java

@@ -7,9 +7,7 @@ import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
-import org.ruoyi.common.chat.constant.OpenAIConst;
 import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
-import org.ruoyi.common.chat.entity.chat.Message;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiClient.java

@@ -10,6 +10,7 @@ import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
+import org.jetbrains.annotations.NotNull;
 import org.ruoyi.common.chat.constant.OpenAIConst;
 import org.ruoyi.common.chat.entity.billing.BillingUsage;
 import org.ruoyi.common.chat.entity.billing.Subscription;
@@ -45,7 +46,6 @@ import org.ruoyi.common.chat.openai.interceptor.OpenAiAuthInterceptor;
 import org.ruoyi.common.chat.openai.plugin.PluginAbstract;
 import org.ruoyi.common.chat.openai.plugin.PluginParam;
 import org.ruoyi.common.core.exception.base.BaseException;
-import org.jetbrains.annotations.NotNull;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.jackson.JacksonConverterFactory;

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java

@@ -13,6 +13,7 @@ import okhttp3.*;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
 import okhttp3.sse.EventSources;
+import org.jetbrains.annotations.NotNull;
 import org.ruoyi.common.chat.constant.OpenAIConst;
 import org.ruoyi.common.chat.entity.Tts.TextToSpeech;
 import org.ruoyi.common.chat.entity.billing.BillingUsage;
@@ -27,7 +28,6 @@ import org.ruoyi.common.chat.entity.images.ImageResponse;
 import org.ruoyi.common.chat.entity.models.Model;
 import org.ruoyi.common.chat.entity.models.ModelResponse;
 import org.ruoyi.common.chat.entity.whisper.Transcriptions;
-import org.ruoyi.common.chat.entity.whisper.Translations;
 import org.ruoyi.common.chat.entity.whisper.WhisperResponse;
 import org.ruoyi.common.chat.openai.exception.CommonError;
 import org.ruoyi.common.chat.openai.function.KeyRandomStrategy;
@@ -40,7 +40,6 @@ import org.ruoyi.common.chat.openai.plugin.PluginParam;
 import org.ruoyi.common.chat.sse.DefaultPluginListener;
 import org.ruoyi.common.chat.sse.PluginListener;
 import org.ruoyi.common.core.exception.base.BaseException;
-import org.jetbrains.annotations.NotNull;
 import retrofit2.Call;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/sse/DefaultPluginListener.java

@@ -1,7 +1,6 @@
 package org.ruoyi.common.chat.sse;
 
 import lombok.extern.slf4j.Slf4j;
-
 import okhttp3.sse.EventSourceListener;
 import org.ruoyi.common.chat.entity.chat.ChatCompletion;
 import org.ruoyi.common.chat.openai.OpenAiStreamClient;

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/utils/TikTokensUtil.java

@@ -7,10 +7,10 @@ import com.knuddels.jtokkit.api.EncodingRegistry;
 import com.knuddels.jtokkit.api.EncodingType;
 import com.knuddels.jtokkit.api.ModelType;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.ruoyi.common.chat.entity.chat.ChatCompletion;
 import org.ruoyi.common.chat.entity.chat.FunctionCall;
 import org.ruoyi.common.chat.entity.chat.Message;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/factory/RegexPatternPoolFactory.java

@@ -3,7 +3,6 @@ package org.ruoyi.common.core.factory;
 import cn.hutool.core.lang.PatternPool;
 import org.ruoyi.common.core.constant.RegexConstants;
 
-
 import java.util.regex.Pattern;
 
 /**

ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/utils/ip/RegionUtils.java

@@ -4,9 +4,9 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.Searcher;
 import org.ruoyi.common.core.exception.ServiceException;
 import org.ruoyi.common.core.utils.file.FileUtils;
-import org.lionsoul.ip2region.xdb.Searcher;
 
 import java.io.File;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/config/MybatisPlusConfig.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
 import org.ruoyi.aspect.DataPermissionAspect;
 import org.ruoyi.common.core.factory.YmlPropertySourceFactory;
 import org.ruoyi.common.core.utils.SpringUtils;
@@ -16,7 +17,6 @@ import org.ruoyi.handler.InjectionMetaObjectHandler;
 import org.ruoyi.handler.MybatisExceptionHandler;
 import org.ruoyi.handler.PlusPostInitTableInfoHandler;
 import org.ruoyi.interceptor.PlusDataPermissionInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.BeansException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/core/mapper/BaseMapperPlus.java

@@ -14,7 +14,6 @@ import org.apache.ibatis.logging.LogFactory;
 import org.ruoyi.common.core.utils.MapstructUtils;
 import org.ruoyi.common.core.utils.StreamUtils;
 
-
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/InjectionMetaObjectHandler.java

@@ -11,7 +11,6 @@ import org.ruoyi.common.core.utils.ObjectUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.core.domain.BaseEntity;
 
-
 import java.util.Date;
 
 /**

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/MybatisExceptionHandler.java

@@ -2,7 +2,6 @@ package org.ruoyi.handler;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-
 import org.mybatis.spring.MyBatisSystemException;
 import org.ruoyi.common.core.domain.R;
 import org.ruoyi.common.core.utils.StringUtils;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/PlusDataPermissionHandler.java

@@ -11,7 +11,6 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import org.apache.ibatis.io.Resources;
-
 import org.ruoyi.annotation.DataColumn;
 import org.ruoyi.annotation.DataPermission;
 import org.ruoyi.common.core.domain.dto.RoleDTO;
@@ -23,7 +22,6 @@ import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.enums.DataScopeType;
 import org.ruoyi.helper.DataPermissionHelper;
-
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.io.Resource;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/helper/DataBaseHelper.java

@@ -4,7 +4,6 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-
 import org.ruoyi.common.core.exception.ServiceException;
 import org.ruoyi.common.core.utils.SpringUtils;
 import org.ruoyi.enums.DataBaseType;

ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java

@@ -1,8 +1,8 @@
 package org.ruoyi.common.config;
 
-import org.ruoyi.common.core.service.ConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.common.core.service.ConfigService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/service/impl/PayServiceImpl.java

@@ -2,12 +2,11 @@ package org.ruoyi.common.service.impl;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.ruoyi.common.config.PayConfig;
 import org.ruoyi.common.service.PayService;
 import org.ruoyi.common.utils.MD5Util;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;

ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/ruoyi/common/ratelimiter/aspectj/RateLimiterAspect.java

@@ -6,6 +6,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.redisson.api.RateType;
 import org.ruoyi.common.core.constant.GlobalConstants;
 import org.ruoyi.common.core.exception.ServiceException;
 import org.ruoyi.common.core.utils.MessageUtils;
@@ -14,7 +15,6 @@ import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.ratelimiter.annotation.RateLimiter;
 import org.ruoyi.common.ratelimiter.enums.LimitType;
 import org.ruoyi.common.redis.utils.RedisUtils;
-import org.redisson.api.RateType;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.expression.EvaluationContext;

ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/config/RedisConfig.java

@@ -2,12 +2,12 @@ package org.ruoyi.common.redis.config;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.ruoyi.common.redis.config.properties.RedissonProperties;
-import org.ruoyi.common.redis.handler.KeyPrefixHandler;
-import org.ruoyi.common.redis.manager.PlusSpringCacheManager;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.codec.JsonJacksonCodec;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
+import org.ruoyi.common.redis.config.properties.RedissonProperties;
+import org.ruoyi.common.redis.handler.KeyPrefixHandler;
+import org.ruoyi.common.redis.manager.PlusSpringCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/handler/KeyPrefixHandler.java

@@ -1,7 +1,7 @@
 package org.ruoyi.common.redis.handler;
 
-import org.ruoyi.common.core.utils.StringUtils;
 import org.redisson.api.NameMapper;
+import org.ruoyi.common.core.utils.StringUtils;
 
 /**
  * redis缓存key前缀处理

ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/manager/PlusSpringCacheManager.java

@@ -15,11 +15,11 @@
  */
 package org.ruoyi.common.redis.manager;
 
-import org.ruoyi.common.redis.utils.RedisUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
 import org.redisson.spring.cache.CacheConfig;
 import org.redisson.spring.cache.RedissonCache;
+import org.ruoyi.common.redis.utils.RedisUtils;
 import org.springframework.boot.convert.DurationStyle;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;

ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/CacheUtils.java

@@ -1,9 +1,9 @@
 package org.ruoyi.common.redis.utils;
 
-import org.ruoyi.common.core.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.RMap;
+import org.ruoyi.common.core.utils.SpringUtils;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 

ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/QueueUtils.java

@@ -2,8 +2,8 @@ package org.ruoyi.common.redis.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.ruoyi.common.core.utils.SpringUtils;
 import org.redisson.api.*;
+import org.ruoyi.common.core.utils.SpringUtils;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;

ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/RedisUtils.java

@@ -2,8 +2,8 @@ package org.ruoyi.common.redis.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.ruoyi.common.core.utils.SpringUtils;
 import org.redisson.api.*;
+import org.ruoyi.common.core.utils.SpringUtils;
 
 import java.time.Duration;
 import java.util.Collection;

ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java

@@ -8,7 +8,10 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 

ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java

@@ -5,8 +5,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.redisson.config.ClusterServersConfig;
+import org.redisson.config.SingleServerConfig;
+import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.ruoyi.common.core.utils.reflect.ReflectUtils;
-
 import org.ruoyi.common.redis.config.RedisConfig;
 import org.ruoyi.common.redis.config.properties.RedissonProperties;
 import org.ruoyi.common.tenant.core.TenantSaTokenDao;
@@ -14,9 +16,6 @@ import org.ruoyi.common.tenant.handle.PlusTenantLineHandler;
 import org.ruoyi.common.tenant.handle.TenantKeyPrefixHandler;
 import org.ruoyi.common.tenant.manager.TenantSpringCacheManager;
 import org.ruoyi.common.tenant.properties.TenantProperties;
-import org.redisson.config.ClusterServersConfig;
-import org.redisson.config.SingleServerConfig;
-import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.ruoyi.config.MybatisPlusConfig;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

ruoyi-common/ruoyi-common-web/src/main/java/org/ruoyi/common/web/interceptor/PlusWebInvokeTimeInterceptor.java

@@ -15,8 +15,6 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.BufferedReader;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 /**

ruoyi-modules-api/ruoyi-chat-api/pom.xml

@@ -34,11 +34,11 @@
     <!-- 对话基础模块 -->
     <dependencies>
 
-<!--        <dependency>-->
+        <!--        <dependency>-->
-<!--            <groupId>io.modelcontextprotocol.sdk</groupId>-->
+        <!--            <groupId>io.modelcontextprotocol.sdk</groupId>-->
-<!--            <artifactId>mcp-spring-webflux</artifactId>-->
+        <!--            <artifactId>mcp-spring-webflux</artifactId>-->
-<!--            <version>0.8.0</version>-->
+        <!--            <version>0.8.0</version>-->
-<!--        </dependency>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>org.ruoyi</groupId>
@@ -83,6 +83,63 @@
             <version>0.3.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-open-ai</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-http-client-jdk</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-community-zhipu-ai</artifactId>
+            <version>1.0.1-beta6</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-community-dashscope</artifactId>
+            <version>1.0.1-beta6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.12.6</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.12.6</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.12.6</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.12.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
+
     </dependencies>
 
 </project>

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java

@@ -1,13 +1,13 @@
 package org.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.ruoyi.core.domain.BaseEntity;
 
-import java.math.BigDecimal;
-
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 聊天消息对象 chat_message

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatModel.java

@@ -1,8 +1,8 @@
 package org.ruoyi.domain;
 
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.ruoyi.core.domain.BaseEntity;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatPayOrder.java

@@ -1,13 +1,13 @@
 package org.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.ruoyi.core.domain.BaseEntity;
 
-import java.math.BigDecimal;
-
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 支付订单对象 chat_pay_order

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java

@@ -1,6 +1,7 @@
 package org.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.ruoyi.core.domain.BaseEntity;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatUsageToken.java

@@ -1,6 +1,7 @@
 package org.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serial;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatMessageBo.java

@@ -1,16 +1,15 @@
 package org.ruoyi.domain.bo;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
 import org.ruoyi.core.domain.BaseEntity;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
 import org.ruoyi.domain.ChatMessage;
 
-import java.math.BigDecimal;
-
 /**
  * 聊天消息业务对象 chat_message
  *

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatModelBo.java

@@ -1,14 +1,14 @@
 package org.ruoyi.domain.bo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import org.ruoyi.common.core.validate.AddGroup;
-import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.domain.ChatModel;
-import org.ruoyi.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.domain.ChatModel;
 
 /**
  * 聊天模型业务对象 chat_model

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatPayOrderBo.java

@@ -1,13 +1,15 @@
 package org.ruoyi.domain.bo;
 
-import org.ruoyi.common.core.validate.AddGroup;
-import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.domain.ChatPayOrder;
-import org.ruoyi.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.domain.ChatPayOrder;
+
 import java.math.BigDecimal;
 
 /**

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java

@@ -1,12 +1,11 @@
 package org.ruoyi.domain.bo;
 
-import org.ruoyi.common.core.validate.AddGroup;
-import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
 import org.ruoyi.domain.ChatSession;
 
 /**
@@ -39,7 +38,6 @@ public class ChatSessionBo extends BaseEntity {
     /**
      * 会话内容
      */
-    @NotBlank(message = "会话内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sessionContent;
 
     /**

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatUsageTokenBo.java

@@ -1,13 +1,14 @@
 package org.ruoyi.domain.bo;
 
-import org.ruoyi.common.core.validate.AddGroup;
-import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.domain.ChatUsageToken;
-import org.ruoyi.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.domain.ChatUsageToken;
 
 /**
  * 用户token使用详情业务对象 chat_usage_token

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatMessageVo.java

@@ -1,18 +1,14 @@
 package org.ruoyi.domain.vo;
 
-import java.math.BigDecimal;
-
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.ruoyi.domain.ChatMessage;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatModelVo.java

@@ -3,7 +3,6 @@ package org.ruoyi.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.ruoyi.common.sensitive.annotation.Sensitive;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatPayOrderVo.java

@@ -1,15 +1,14 @@
 package org.ruoyi.domain.vo;
 
-import java.math.BigDecimal;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.ruoyi.domain.ChatPayOrder;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 
 

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java

@@ -55,5 +55,12 @@ public class ChatSessionVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private String createTime;
+
+
 
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatUsageTokenVo.java

@@ -1,11 +1,10 @@
 package org.ruoyi.domain.vo;
 
-import org.ruoyi.domain.ChatUsageToken;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.ruoyi.domain.ChatUsageToken;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatMessageService.java

@@ -1,8 +1,8 @@
 package org.ruoyi.service;
 
 
-import org.ruoyi.core.page.TableDataInfo;
 import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
 import org.ruoyi.domain.bo.ChatMessageBo;
 import org.ruoyi.domain.vo.ChatMessageVo;
 

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatModelService.java

@@ -1,8 +1,8 @@
 package org.ruoyi.service;
 
 
-import org.ruoyi.core.page.TableDataInfo;
 import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
 import org.ruoyi.domain.ChatModel;
 import org.ruoyi.domain.bo.ChatModelBo;
 import org.ruoyi.domain.vo.ChatModelVo;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatPayOrderService.java

@@ -1,7 +1,7 @@
 package org.ruoyi.service;
 
-import org.ruoyi.core.page.TableDataInfo;
 import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
 import org.ruoyi.domain.bo.ChatPayOrderBo;
 import org.ruoyi.domain.vo.ChatPayOrderVo;