Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,6 +10,9 @@ assignees: getActivity
 ##### 版本号：
 
 
+##### 分支：
+
+
 ##### 问题描述：
 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,10 +6,12 @@ assignees: getActivity
 
 ---
 
-
 ##### 版本号：
 
 
+##### 分支：
+
+
 ##### 问题描述：
 
 

.gitignore

@@ -13,4 +13,6 @@ os_del.cmd
 os_del_doc.cmd
 .svn
 derby.log
-*.log
+*.log
+.cursor
+.history

README.md

@@ -50,10 +50,10 @@ JeecgBoot低代码平台兼容所有J2EE项目开发，支持信创国产化，
 版本说明
 -----------------------------------
 
-|下载    | JDK17 + SpringBoot3.3 + Shiro                     |JDK17 + SpringBoot3.3+ SpringAuthorizationServer   | JDK17/JDK8 + SpringBoot2.7 |
-|------|----------------------------------------------------|--------------------------------------------|--------------------------------------------|
-| Github |  [`springboot3`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3)  | [`springboot3_sas`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3_sas) 分支 |[`master`](https://github.com/jeecgboot/JeecgBoot) 分支|
-| Gitee |  [`springboot3`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3/)      | [`springboot3_sas`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3_sas) 分支 |[`master`](https://gitee.com/jeecg/JeecgBoot)     分支 |
+|下载 | SpringBoot3.5 + Shiro  |SpringBoot3.5+ SpringAuthorizationServer | SpringBoot3.5 + Sa-Token | SpringBoot2.7(JDK17/JDK8) |
+|------|----------------|----------------------------|-------------------|--------------------------------------------|
+| Github |  [`springboot3`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3) | [`springboot3_sas`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3_sas) 分支  |  [`springboot3-satoken`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3-satoken) 分支|[`master`](https://github.com/jeecgboot/JeecgBoot) 分支|
+| Gitee |  [`springboot3`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3/)      | [`springboot3_sas`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3_sas) 分支|  [`springboot3-satoken`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3-satoken) 分支|[`master`](https://gitee.com/jeecg/JeecgBoot)     分支 |
 
 
 - `jeecg-boot` 是后端JAVA源码项目Springboot3+SpringCloudAlibaba（支持单体和微服务切换）.
@@ -157,6 +157,9 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 #### 前端
 
 - 前端环境要求：Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上
+
+ ` ( Vite 不再支持已结束生命周期（EOL）的 Node.js 18。现在需要使用 Node.js 20.19+ 或 22.12+)`
+
 - 依赖管理：node、npm、pnpm
 - 前端IDE建议：IDEA、WebStorm、Vscode
 - 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue4等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能

jeecg-boot/README.md

@@ -47,10 +47,10 @@ JeecgBoot低代码平台兼容所有J2EE项目开发，支持信创国产化，
 
 #### 项目说明
 
-| 项目名                | 说明                           | 
-|--------------------|------------------------------|
-| `jeecg-boot`    | 后端源码JAVA（SpringBoot3微服务架构）   |
-| `jeecgboot-vue3` | 前端源码VUE3（vue3+vite5+ts最新技术栈） |
+| 项目名                | 说明                                 | 
+|--------------------|------------------------------------|
+| `jeecg-boot`    | 后端源码JAVA（SpringBoot3微服务架构）         |
+| `jeecgboot-vue3` | 前端源码VUE3（vue3+vite6+antd4+ts最新技术栈） |
 
 
 
@@ -165,6 +165,8 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 #### 前端
 
 - 前端环境要求：Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上
+  ` ( Vite 不再支持已结束生命周期（EOL）的 Node.js 18。现在需要使用 Node.js 20.19+ 或 22.12+)`
+
 - 依赖管理：node、npm、pnpm
 - 前端IDE建议：IDEA、WebStorm、Vscode
 - 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue4等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.*;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
@@ -56,12 +56,22 @@ public class RestUtil {
     private final static RestTemplate RT;
 
     static {
-        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        //update-begin---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
+        // 使用 Apache HttpClient 避免 JDK HttpURLConnection 的 too many bytes written 问题
+        HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+        //update-end---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
         requestFactory.setConnectTimeout(30000);
         requestFactory.setReadTimeout(30000);
         RT = new RestTemplate(requestFactory);
-        // 解决乱码问题
-        RT.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+        //update-begin---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
+        // 解决乱码问题（替换 StringHttpMessageConverter 为 UTF-8）
+        for (int i = 0; i < RT.getMessageConverters().size(); i++) {
+            if (RT.getMessageConverters().get(i) instanceof StringHttpMessageConverter) {
+                RT.getMessageConverters().set(i, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+                break;
+            }
+        }
+        //update-end---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
     }
 
     public static RestTemplate getRestTemplate() {
@@ -250,12 +260,21 @@ public class RestUtil {
         // 创建自定义RestTemplate（如果需要设置超时）
         RestTemplate restTemplate = RT;
         if (timeout > 0) {
-            SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+            //update-begin---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
+            HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+            //update-end---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
             requestFactory.setConnectTimeout(timeout);
             requestFactory.setReadTimeout(timeout);
             restTemplate = new RestTemplate(requestFactory);
-            // 解决乱码问题
-            restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+            //update-begin---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
+            // 解决乱码问题（替换 StringHttpMessageConverter 为 UTF-8）
+            for (int i = 0; i < restTemplate.getMessageConverters().size(); i++) {
+                if (restTemplate.getMessageConverters().get(i) instanceof StringHttpMessageConverter) {
+                    restTemplate.getMessageConverters().set(i, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+                    break;
+                }
+            }
+            //update-end---author:chenrui ---date:20251011  for：[issues/8859]online表单java增强失效------------
         }
 
         // 请求体

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml

@@ -31,10 +31,28 @@
     </repositories>
 
     <properties>
-        <langchain4j.version>0.35.0</langchain4j.version>
         <apache-tika.version>2.9.1</apache-tika.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-bom</artifactId>
+                <version>1.3.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-community-bom</artifactId>
+                <version>1.3.0-beta9</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- system单体 api-->
         <dependency>
@@ -55,7 +73,7 @@
         <dependency>
             <groupId>org.jeecgframework.boot3</groupId>
             <artifactId>jeecg-aiflow</artifactId>
-            <version>1.2.0</version>
+            <version>3.8.3.1</version>
         </dependency>
 
         <!-- beigin 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
@@ -72,7 +90,6 @@
             <scope>provided</scope>
         </dependency>
         <!-- end 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
-
         <!-- aiflow 脚本依赖 -->
         <dependency>
             <groupId>com.yomahub</groupId>
@@ -105,17 +122,19 @@
             </exclusions>
         </dependency>
         <!-- aiflow 脚本依赖 -->
-
+        
         <!-- langChain4j model support -->
         <dependency>
             <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-ollama</artifactId>
-            <version>${langchain4j.version}</version>
+            <artifactId>langchain4j-open-ai</artifactId>
         </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-zhipu-ai</artifactId>
-            <version>${langchain4j.version}</version>
+            <artifactId>langchain4j-ollama</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-community-zhipu-ai</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>checker-qual</artifactId>
@@ -129,13 +148,11 @@
         </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-qianfan</artifactId>
-            <version>${langchain4j.version}</version>
+            <artifactId>langchain4j-community-qianfan</artifactId>
         </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-dashscope</artifactId>
-            <version>${langchain4j.version}</version>
+            <artifactId>langchain4j-community-dashscope</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -151,7 +168,7 @@
         <dependency>
             <groupId>org.jeecgframework</groupId>
             <artifactId>langchain4j-pgvector</artifactId>
-            <version>${langchain4j.version}</version>
+            <version>1.3.0-beta9</version>
         </dependency>
         <!-- langChain4j Document Parser -->
         <dependency>

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragAppServiceImpl.java

@@ -71,7 +71,7 @@ public class AiragAppServiceImpl extends ServiceImpl<AiragAppMapper, AiragApp> i
             AtomicBoolean isThinking = new AtomicBoolean(false);
             String requestId = UUIDGenerator.generate();
             // ai聊天响应逻辑
-            tokenStream.onNext((String resMessage) -> {
+            tokenStream.onPartialResponse((String resMessage) -> {
                         // 兼容推理模型
                         if ("<think>".equals(resMessage)) {
                             isThinking.set(true);
@@ -99,9 +99,9 @@ public class AiragAppServiceImpl extends ServiceImpl<AiragAppMapper, AiragApp> i
                             throw new RuntimeException(e);
                         }
                     })
-                    .onComplete((responseMessage) -> {
+                    .onCompleteResponse((responseMessage) -> {
                         // 记录ai的回复
-                        AiMessage aiMessage = responseMessage.content();
+                        AiMessage aiMessage = responseMessage.aiMessage();
                         FinishReason finishReason = responseMessage.finishReason();
                         String respText = aiMessage.text();
                         if (FinishReason.STOP.equals(finishReason) || null == finishReason) {
@@ -114,9 +114,6 @@ public class AiragAppServiceImpl extends ServiceImpl<AiragAppMapper, AiragApp> i
                                 throw new RuntimeException(e);
                             }
                             closeSSE(emitter, eventData);
-                        } else if (FinishReason.TOOL_EXECUTION.equals(finishReason)) {
-                            // 需要执行工具
-                            // TODO author: chenrui for: date:2025/3/7
                         } else {
                             // 异常结束
                             log.error("调用模型异常:" + respText);

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java

@@ -860,7 +860,7 @@ public class AiragChatServiceImpl implements IAiragChatService {
          */
         AtomicBoolean isThinking = new AtomicBoolean(false);
         // ai聊天响应逻辑
-        chatStream.onNext((String resMessage) -> {
+        chatStream.onPartialResponse((String resMessage) -> {
             // 兼容推理模型
             if ("<think>".equals(resMessage)) {
                 isThinking.set(true);
@@ -886,12 +886,12 @@ public class AiragChatServiceImpl implements IAiragChatService {
                 return;
             }
             sendMessage2Client(emitter, eventData);
-        }).onComplete((responseMessage) -> {
+        }).onCompleteResponse((responseMessage) -> {
             // 打印流程耗时日志
             printChatDuration(requestId, "LLM输出消息完成");
             AiragLocalCache.remove(AiragConsts.CACHE_TYPE_SSE_SEND_TIME, requestId);
             // 记录ai的回复
-            AiMessage aiMessage = responseMessage.content();
+            AiMessage aiMessage = responseMessage.aiMessage();
             FinishReason finishReason = responseMessage.finishReason();
             String respText = aiMessage.text();
             // sse

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java

@@ -105,14 +105,14 @@ public class AIChatHandler implements IAIChatHandler {
             // langchain4j 异常友好提示
             String errMsg = "调用大模型接口失败，详情请查看后台日志。";
             if (oConvertUtils.isNotEmpty(e.getMessage())) {
-//                // 根据常见异常关键字做细致翻译
-//                for (Map.Entry<String, String> entry : MODEL_ERROR_MAP.entrySet()) {
-//                    String key = entry.getKey();
-//                    String value = entry.getValue();
-//                    if (errMsg.contains(key)) {
-//                        errMsg = value;
-//                    }
-//                }
+                // 根据常见异常关键字做细致翻译
+                for (Map.Entry<String, String> entry : MODEL_ERROR_MAP.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    if (errMsg.contains(key)) {
+                        errMsg = value;
+                    }
+                }
             }
             log.error("AI模型调用异常: {}", errMsg, e);
             throw new JeecgBootException(errMsg);

jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/EmbeddingHandler.java

@@ -9,7 +9,6 @@ import dev.langchain4j.data.document.splitter.DocumentSplitters;
 import dev.langchain4j.data.embedding.Embedding;
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiTokenizer;
 import dev.langchain4j.rag.content.retriever.ContentRetriever;
 import dev.langchain4j.rag.content.retriever.EmbeddingStoreContentRetriever;
 import dev.langchain4j.rag.query.router.DefaultQueryRouter;
@@ -167,7 +166,7 @@ public class EmbeddingHandler implements IEmbeddingHandler {
         // 删除旧数据
         embeddingStore.removeAll(metadataKey(EMBED_STORE_METADATA_DOCID).isEqualTo(doc.getId()));
         // 分段器
-        DocumentSplitter splitter = DocumentSplitters.recursive(DEFAULT_SEGMENT_SIZE, DEFAULT_OVERLAP_SIZE, new OpenAiTokenizer());
+        DocumentSplitter splitter = DocumentSplitters.recursive(DEFAULT_SEGMENT_SIZE, DEFAULT_OVERLAP_SIZE);
         // 分段并存储
         EmbeddingStoreIngestor ingestor = EmbeddingStoreIngestor.builder()
                 .documentSplitter(splitter)

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/airag/JeecgBizToolsProvider.java

@@ -5,13 +5,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import dev.langchain4j.agent.tool.JsonSchemaProperty;
 import dev.langchain4j.agent.tool.ToolSpecification;
+import dev.langchain4j.model.chat.request.json.JsonObjectSchema;
 import dev.langchain4j.service.tool.ToolExecutor;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.airag.llm.handler.JeecgToolsProvider;
@@ -85,12 +83,17 @@ public class JeecgBizToolsProvider implements JeecgToolsProvider {
                         "\n\n - 提前使用用户名查询用户是否存在,如果存在则不能添加." +
                         "\n\n - 添加成功后返回成功消息,如果失败则返回失败原因." +
                         "\n\n - 用户名,工号,邮箱,手机号均要求唯一,提前通过查询用户工具确认唯一性." )
-                .addParameter("username", JsonSchemaProperty.STRING, JsonSchemaProperty.description("用户名,必填,只允许使用字母、数字、下划线，且必须以字母开头,唯一"))
-                .addParameter("password", JsonSchemaProperty.STRING, JsonSchemaProperty.description("用户密码,必填"))
-                .addParameter("realname", JsonSchemaProperty.STRING, JsonSchemaProperty.description("真实姓名,必填"))
-                .addParameter("workNo", JsonSchemaProperty.STRING, JsonSchemaProperty.description("工号,必填,唯一"))
-                .addParameter("email", JsonSchemaProperty.STRING, JsonSchemaProperty.description("邮箱,必填,唯一"))
-                .addParameter("phone", JsonSchemaProperty.STRING, JsonSchemaProperty.description("手机号,必填,唯一"))
+                .parameters(
+                        JsonObjectSchema.builder()
+                                .addStringProperty("username", "用户名,必填,只允许使用字母、数字、下划线，且必须以字母开头,唯一")
+                                .addStringProperty("password", "用户密码,必填")
+                                .addStringProperty("realname", "真实姓名,必填")
+                                .addStringProperty("workNo", "工号,必填,唯一")
+                                .addStringProperty("email", "邮箱,必填,唯一")
+                                .addStringProperty("phone", "手机号,必填,唯一")
+                                .required("username","password","realname","workNo","email","phone")
+                                .build()
+                )
                 .build();
         ToolExecutor toolExecutor = (toolExecutionRequest, memoryId) -> {
             JSONObject arguments = JSONObject.parseObject(toolExecutionRequest.arguments());
@@ -138,11 +141,15 @@ public class JeecgBizToolsProvider implements JeecgToolsProvider {
         ToolSpecification toolSpecification = ToolSpecification.builder()
                 .name("query_user_by_name")
                 .description("查询用户详细信息，返回json数组。支持用户名、真实姓名、邮箱、手机号、工号多字段组合查询，用户名、真实姓名、邮箱、手机号均为模糊查询，工号为精确查询。无条件则返回全部用户。")
-                .addParameter("username", JsonSchemaProperty.STRING, JsonSchemaProperty.description("用户名"))
-                .addParameter("realname", JsonSchemaProperty.STRING, JsonSchemaProperty.description("真实姓名"))
-                .addParameter("email", JsonSchemaProperty.STRING, JsonSchemaProperty.description("电子邮件"))
-                .addParameter("phone", JsonSchemaProperty.STRING, JsonSchemaProperty.description("手机号"))
-                .addParameter("workNo", JsonSchemaProperty.STRING, JsonSchemaProperty.description("工号"))
+                .parameters(
+                        JsonObjectSchema.builder()
+                                .addStringProperty("username", "用户名")
+                                .addStringProperty("realname", "真实姓名")
+                                .addStringProperty("email", "电子邮件")
+                                .addStringProperty("phone", "手机号")
+                                .addStringProperty("workNo", "工号")
+                                .build()
+                )
                 .build();
         ToolExecutor toolExecutor = (toolExecutionRequest, memoryId) -> {
             SysUser args = JSONObject.parseObject(toolExecutionRequest.arguments(), SysUser.class);
@@ -180,8 +187,12 @@ public class JeecgBizToolsProvider implements JeecgToolsProvider {
         ToolSpecification spec = ToolSpecification.builder()
                 .name("query_all_roles")
                 .description("查询所有角色，返回json数组。包含字段：id、roleName、roleCode；默认按创建时间/排序号规则由后端决定。")
-                .addParameter("roleName", JsonSchemaProperty.STRING, JsonSchemaProperty.description("角色姓名"))
-                .addParameter("roleCode", JsonSchemaProperty.STRING, JsonSchemaProperty.description("角色编码"))
+                .parameters(
+                        JsonObjectSchema.builder()
+                                .addStringProperty("roleName", "角色姓名")
+                                .addStringProperty("roleCode", "角色编码")
+                                .build()
+                )
                 .build();
         ToolExecutor exec = (toolExecutionRequest, memoryId) -> {
             // 做租户隔离查询（若开启）
@@ -194,10 +205,10 @@ public class JeecgBizToolsProvider implements JeecgToolsProvider {
                 qw.like("role_code", sysRole.getRoleCode());
             }
             // 未删除
-            List<org.jeecg.modules.system.entity.SysRole> roles = sysRoleService.list(qw);
+            List<SysRole> roles = sysRoleService.list(qw);
             // 仅返回核心字段
             JSONArray arr = new JSONArray();
-            for (org.jeecg.modules.system.entity.SysRole r : roles) {
+            for (SysRole r : roles) {
                 JSONObject o = new JSONObject();
                 o.put("id", r.getId());
                 o.put("roleName", r.getRoleName());
@@ -219,17 +230,22 @@ public class JeecgBizToolsProvider implements JeecgToolsProvider {
         ToolSpecification spec = ToolSpecification.builder()
                 .name("grant_user_roles")
                 .description("给用户授予角色，支持一次授予多个角色；如果关系已存在则跳过。返回授予结果统计。")
-                .addParameter("userId", JsonSchemaProperty.STRING, JsonSchemaProperty.description("用户ID，必填"))
-                .addParameter("roleIds", JsonSchemaProperty.STRING, JsonSchemaProperty.description("角色ID列表，必填，使用英文逗号分隔"))
+                .parameters(
+                        JsonObjectSchema.builder()
+                                .addStringProperty("userId", "用户ID，必填")
+                                .addStringProperty("roleIds", "角色ID列表，必填，使用英文逗号分隔")
+                                .required("userId","roleIds")
+                                .build()
+                )
                 .build();
         ToolExecutor exec = (toolExecutionRequest, memoryId) -> {
             JSONObject args = JSONObject.parseObject(toolExecutionRequest.arguments());
             String userId = args.getString("userId");
             String roleIdsStr = args.getString("roleIds");
-            if (org.apache.commons.lang3.StringUtils.isAnyBlank(userId, roleIdsStr)) {
+            if (StringUtils.isAnyBlank(userId, roleIdsStr)) {
                 return "参数缺失：userId 或 roleIds";
             }
-            org.jeecg.modules.system.entity.SysUser user = sysUserService.getById(userId);
+            SysUser user = sysUserService.getById(userId);
             if (user == null) {
                 return "用户不存在：" + userId;
             }
@@ -238,9 +254,9 @@ public class JeecgBizToolsProvider implements JeecgToolsProvider {
             for (String roleId : roleIds) {
                 roleId = roleId.trim();
                 if (roleId.isEmpty()) continue;
-                org.jeecg.modules.system.entity.SysRole role = sysRoleService.getById(roleId);
+                SysRole role = sysRoleService.getById(roleId);
                 if (role == null) { invalid++; continue; }
-                com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<org.jeecg.modules.system.entity.SysUserRole> q = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
+                QueryWrapper<org.jeecg.modules.system.entity.SysUserRole> q = new QueryWrapper<>();
                 q.eq("role_id", roleId).eq("user_id", userId);
                 org.jeecg.modules.system.entity.SysUserRole one = sysUserRoleService.getOne(q);
                 if (one == null) {

jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml

@@ -42,6 +42,13 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+        
+        <!-- 分库分表示例 -->
+     <!--  <dependency>
+           <groupId>org.jeecgframework.boot3</groupId>
+           <artifactId>jeecg-cloud-test-shardingsphere</artifactId>
+           <version>3.8.3</version>
+       </dependency>-->
     </dependencies>
 
     <build>

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -153,12 +153,10 @@ spring:
           username: root
           password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
+#        # shardingjdbc数据源
+#        sharding-db:
+#          driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
+#          url: jdbc:shardingsphere:classpath:sharding.yaml
   #redis 配置
   data:
     redis:

jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml

@@ -25,11 +25,7 @@
         <!-- Gateway网关依赖,内置webflux-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
         </dependency>
         <!-- redis方式限流 -->
         <dependency>

jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml

@@ -28,17 +28,21 @@ spring:
         username: @config.username@
         password: @config.password@
     gateway:
-      discovery:
-        locator:
-          enabled: true
-      globalcors:
-        cors-configurations:
-          '[/**]':
-            allowCredentials: true
-            #springboot2.4后需用allowedOriginPatterns
-            allowedOriginPatterns: "*"
-            allowedMethods: "*"
-            allowedHeaders: "*"
+      server:
+        webflux:
+          discovery:
+            locator:
+              enabled: true
+          globalcors:
+            cors-configurations:
+              '[/**]':
+                allow-credentials: true
+                allowed-origin-patterns:
+                  - "*"
+                allowed-methods:
+                  - "*"
+                allowed-headers:
+                  - "*"
     #Sentinel配置
     sentinel:
       transport:

jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml

@@ -1,59 +0,0 @@
-spring:
-  shardingsphere:
-    datasource:
-      names: ds0,ds1
-      ds0:
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-        type: com.alibaba.druid.pool.DruidDataSource
-        username: root
-        password: root
-      ds1:
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-        type: com.alibaba.druid.pool.DruidDataSource
-        username: root
-        password: root
-    props:
-      sql-show: true
-    rules:
-      replica-query:
-        load-balancers:
-          round-robin:
-            type: ROUND_ROBIN
-            props:
-              default: 0
-        data-sources:
-          prds:
-            primary-data-source-name: ds0
-            replica-data-source-names: ds1
-            load-balancer-name: round_robin
-      sharding:
-        binding-tables:
-          - sys_log
-        key-generators:
-          snowflake:
-            type: SNOWFLAKE
-            props:
-              worker-id: 123
-        sharding-algorithms:
-          table-classbased:
-            props:
-              strategy: standard
-              algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
-            type: CLASS_BASED
-          database-inline:
-            type: INLINE
-            props:
-              algorithm-expression: ds$->{operate_type % 2}
-        tables:
-          sys_log:
-            actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}
-            database-strategy:
-              standard:
-                sharding-column: operate_type
-                sharding-algorithm-name: database-inline
-            table-strategy:
-              standard:
-                sharding-algorithm-name: table-classbased
-                sharding-column: log_type

jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml

@@ -1,33 +0,0 @@
-spring:
-  shardingsphere:
-    datasource:
-      names: ds0
-      ds0:
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-        username: root
-        password: root
-        type: com.alibaba.druid.pool.DruidDataSource
-    props:
-      sql-show: true
-    rules:
-      sharding:
-        binding-tables: sys_log
-        key-generators:
-          snowflake:
-            type: SNOWFLAKE
-            props:
-              worker-id: 123
-        sharding-algorithms:
-          table-classbased:
-            props:
-              strategy: standard
-              algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
-            type: CLASS_BASED
-        tables:
-          sys_log:
-            actual-data-nodes: ds0.sys_log$->{0..1}
-            table-strategy:
-              standard:
-                sharding-algorithm-name: table-classbased
-                sharding-column: log_type

jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml

@@ -71,7 +71,11 @@
            <groupId>org.jeecgframework.boot3</groupId>
            <artifactId>jeecg-cloud-test-shardingsphere</artifactId>
            <version>${jeecgboot.version}</version>
-       </dependency>-->
+       </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot3</groupId>
+            <artifactId>jeecg-boot-starter-shardingsphere-nacos</artifactId>
+        </dependency>-->
 
     </dependencies>
 

jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml

@@ -21,4 +21,11 @@ spring:
   config:
     import:
       - optional:nacos:jeecg.yaml
-      - optional:nacos:jeecg-@profile.name@.yaml
+      - optional:nacos:jeecg-@profile.name@.yaml
+#  #shardingjdbc数据源
+#  datasource:
+#    dynamic:
+#      datasource:
+#        sharding-db:
+#          driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
+#          url: jdbc:shardingsphere:nacos:sharding.yaml?serverAddr=@config.server-addr@&namespace=@config.namespace@&group=@config.group@

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/README-ShardingSphere配置说明.md

@@ -0,0 +1,176 @@
+# JeecgBoot ShardingSphere配置使用说明
+
+## 项目中的ShardingSphere配置
+
+本项目使用ShardingSphere实现分库分表功能，主要涉及以下配置文件和组件：
+
+## 1. 配置文件说明
+
+### sharding.yaml - 基础分表配置
+```yaml
+databaseName: sharding-db  # 重要：必须与@DS注解中的名称一致
+
+dataSources:
+  ds0:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    jdbcUrl: jdbc:mysql://localhost:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8
+    username: root
+    password: root
+
+rules:
+  - !SHARDING
+    tables:
+      sys_log:  # 分表的逻辑表名
+        actualDataNodes: ds0.sys_log$->{0..1}  # 实际表：sys_log0, sys_log1
+        tableStrategy:
+          standard:
+            shardingColumn: log_type  # 分片字段
+            shardingAlgorithmName: table_inline
+    
+    shardingAlgorithms:
+      table_inline:
+        type: INLINE
+        props:
+          algorithm-expression: sys_log$->{log_type % 2}  # 根据log_type取模分表
+```
+
+### sharding-multi.yaml - 分库分表+读写分离配置
+```yaml
+databaseName: sharding-db  # 与@DS注解保持一致
+
+dataSources:
+  ds0:  # 主库
+    jdbcUrl: jdbc:mysql://localhost:3306/jeecg-boot?...
+  ds1:  # 从库
+    jdbcUrl: jdbc:mysql://localhost:3306/jeecg-boot2?...
+
+rules:
+  - !SHARDING
+    tables:
+      sys_log:
+        actualDataNodes: ds$->{0..1}.sys_log$->{0..1}  # 2库2表
+        databaseStrategy:  # 分库策略
+          standard:
+            shardingColumn: operate_type
+            shardingAlgorithmName: database-inline
+        tableStrategy:  # 分表策略
+          standard:
+            shardingColumn: log_type
+            shardingAlgorithmName: table-classbased
+
+  - !READWRITE_SPLITTING  # 读写分离
+    dataSources:
+      prds:
+        writeDataSourceName: ds0  # 写库
+        readDataSourceNames: [ds1]  # 读库
+```
+
+## 2. Spring Boot配置
+
+### application-dev.yml中的数据源配置
+
+```yaml
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        # 普通数据源
+        master:
+          url: jdbc:mysql://localhost:3306/jeecg-boot
+          username: root
+          password: root
+        
+        # ShardingSphere分片数据源
+        sharding-db:  # 数据源名称，对应@DS("sharding-db")
+          driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
+          # 本地配置文件方式
+          url: jdbc:shardingsphere:classpath:sharding.yaml
+          # 或者Nacos配置方式
+          url: jdbc:shardingsphere:nacos:sharding.yaml?serverAddr=${spring.cloud.nacos.config.server-addr}&namespace=${spring.cloud.nacos.config.namespace}&group=${spring.cloud.nacos.config.group}
+```
+
+**关键点：**
+- `sharding-db` 是数据源的名称标识
+- 这个名称必须与Service类上的`@DS("sharding-db")`注解保持一致
+
+## 3. Service层使用
+
+### ShardingSysLogServiceImpl类配置
+
+```java
+@Service
+@DS("sharding-db")  // 指定使用sharding-db数据源
+public class ShardingSysLogServiceImpl extends ServiceImpl<ShardingSysLogMapper, ShardingSysLog> 
+    implements IShardingSysLogService {
+}
+```
+
+**配置关系说明：**
+1. `@DS("sharding-db")` 注解告诉MyBatis-Plus使用名为`sharding-db`的数据源
+2. `sharding-db`对应application-dev.yml中配置的数据源名称
+3. 该数据源使用ShardingSphere驱动，会根据sharding.yaml中的规则进行分片
+
+## 4. 使用步骤
+
+### 步骤1：准备数据库表
+```sql
+-- 在jeecg-boot数据库中创建分表
+CREATE TABLE sys_log0 LIKE sys_log;
+CREATE TABLE sys_log1 LIKE sys_log;
+```
+
+### 步骤2：配置application-dev.yml
+```yaml
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        sharding-db:
+          driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
+          url: jdbc:shardingsphere:classpath:sharding.yaml
+```
+
+### 步骤3：配置sharding.yaml
+- 将配置文件放在`src/main/resources/`目录下
+- 确保`databaseName: sharding-db`与数据源名称一致
+
+### 步骤4：在Service上添加注解
+```java
+@DS("sharding-db")  // 使用分片数据源
+public class ShardingSysLogServiceImpl {
+    // 业务代码
+}
+```
+
+### 步骤5：正常使用MyBatis-Plus
+```java
+// 插入数据时会自动根据log_type字段进行分表
+shardingSysLogService.save(sysLog);
+
+// 查询时也会根据分片规则路由到正确的表
+shardingSysLogService.list();
+```
+
+## 5. 配置验证
+
+启动项目后查看日志，如果看到类似输出说明配置成功：
+```
+Logic SQL: INSERT INTO sys_log (log_type, content) VALUES (?, ?)
+Actual SQL: ds0 ::: INSERT INTO sys_log0 (log_type, content) VALUES (?, ?)
+```
+
+## 6. 注意事项
+
+1. **名称一致性**：确保以下三处名称完全一致
+   - application-dev.yml中的数据源名称：`sharding-db`
+   - sharding.yaml中的databaseName：`sharding-db`
+   - Service类注解：`@DS("sharding-db")`
+
+2. **表结构一致**：所有分片表的结构必须完全一致
+
+3. **分片键选择**：选择分布均匀的字段作为分片键，避免数据倾斜
+
+4. **事务支持**：单表事务正常，跨表事务需要注意
+
+这样配置后，通过ShardingSysLogServiceImpl操作的数据会自动根据分片规则分布到不同的表中。

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/algorithm/StandardModTableShardAlgorithm.java

@@ -52,13 +52,6 @@ public class StandardModTableShardAlgorithm implements StandardShardingAlgorithm
         return collection;
     }
 
-    /**
-     * 初始化对象的时候调用的方法
-     */
-    @Override
-    public void init() {
-    }
-
     /**
      * 对应分片算法（sharding-algorithms）的类型
      *
@@ -68,19 +61,4 @@ public class StandardModTableShardAlgorithm implements StandardShardingAlgorithm
     public String getType() {
         return "STANDARD_MOD";
     }
-
-    @Override
-    public Properties getProps() {
-        return this.props;
-    }
-
-    /**
-     * 获取分片相关属性
-     *
-     * @param properties
-     */
-    @Override
-    public void setProps(Properties properties) {
-        this.props = properties;
-    }
 }

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java

@@ -23,23 +23,23 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Tag(name = "分库分表测试")
 @RestController
-@RequestMapping("/sharding")
+@RequestMapping("/demo/sharding")
 public class JeecgShardingDemoController extends JeecgController<ShardingSysLog, IShardingSysLogService> {
     @Autowired
     private IShardingSysLogService shardingSysLogService;
 
     /**
-     * 单库分表 —— 添加
+     * 单库分表 —— 插入
      * @return
      */
-    @PostMapping(value = "/test1")
+    @PostMapping(value = "/insert")
     @Operation(summary = "单库分表插入")
-    public Result<?> add() {
+    public Result<?> insert() {
         log.info("---------------------------------单库分表插入--------------------------------");
         int size = 10;
         for (int i = 0; i < size; i++) {
             ShardingSysLog shardingSysLog = new ShardingSysLog();
-            shardingSysLog.setLogContent("jeecg");
+            shardingSysLog.setLogContent("采用shardingsphere实现分库分表，插入测试！");
             shardingSysLog.setLogType(i);
             shardingSysLog.setOperateType(i);
             shardingSysLogService.save(shardingSysLog);
@@ -51,7 +51,7 @@ public class JeecgShardingDemoController extends JeecgController<ShardingSysLog,
      * 单库分表 —— 查询
      * @return
      */
-    @PostMapping(value = "/list1")
+    @PostMapping(value = "/list")
     @Operation(summary = "单库分表查询")
     public Result<?> list() {
         return Result.OK(shardingSysLogService.list());
@@ -61,9 +61,9 @@ public class JeecgShardingDemoController extends JeecgController<ShardingSysLog,
      * 分库分表 - 插入
      * @return
      */
-    @PostMapping(value = "/test2")
+    @PostMapping(value = "/insert2")
     @Operation(summary = "分库分表插入")
-    public Result<?> test2() {
+    public Result<?> insert2() {
         int start=20;
         int size=30;
         for (int i = start; i <= size; i++) {

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/service/impl/ShardingSysLogServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @date: 2022/04/21
  */
 @Service
-@DS("sharding")
+@DS("sharding-db")
 public class ShardingSysLogServiceImpl extends ServiceImpl<ShardingSysLogMapper, ShardingSysLog> implements IShardingSysLogService {
 
-}
+}

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/application-sharding-multi.yml

@@ -1,72 +0,0 @@
-# 双库分表配置
-spring:
-  shardingsphere:
-    props:
-      sql-show: true
-    datasource:
-      ds0:
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-        type: com.alibaba.druid.pool.DruidDataSource
-        username: root
-        password: root
-      ds1:
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-        type: com.alibaba.druid.pool.DruidDataSource
-        username: root
-        password: root
-      names: ds0,ds1
-    # 规则配置
-    rules:
-      replica-query:
-        # 负载均衡算法
-        load-balancers:
-          round-robin:
-            type: ROUND_ROBIN
-            props:
-              default: 0
-        data-sources:
-          prds:
-            primary-data-source-name: ds0
-            replica-data-source-names: ds1
-            load-balancer-name: round_robin
-      sharding:
-        # 配置绑定表，每一行为一组,绑定表会提高查询效率
-        binding-tables:
-          - sys_log
-        # 分布式序列算法配置
-        key-generators:
-          snowflake:
-            type: SNOWFLAKE
-            props:
-              worker-id: 123
-        # 分片算法配置
-        sharding-algorithms:
-          table-classbased:
-            props:
-              strategy: standard
-              algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
-            type: CLASS_BASED
-          # 通过operate_type取模的方式确定数据落在哪个库
-          database-inline:
-            type: INLINE
-            props:
-              algorithm-expression: ds$->{operate_type % 2}
-        tables:
-          # 逻辑表名称
-          sys_log:
-            #配置具体表的数据节点
-            actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}
-            # 分库策略
-            database-strategy:
-              standard:
-                sharding-column: operate_type
-                sharding-algorithm-name: database-inline
-            # 分表策略
-            table-strategy:
-              standard:
-                # 分片算法名称
-                sharding-algorithm-name: table-classbased
-                # 分片列名称
-                sharding-column: log_type

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/application-sharding.yml

@@ -1,45 +0,0 @@
-#单库分表配置
-spring:
-  shardingsphere:
-    props:
-      sql-show: true
-    datasource:
-      #添加分库数据源
-      ds0:
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-        username: root
-        password: root
-        type: com.alibaba.druid.pool.DruidDataSource
-      names: ds0
-    # 规则配置
-    rules:
-      sharding:
-        # 配置绑定表，每一行为一组
-        binding-tables: sys_log
-        # 分布式序列算法配置
-        key-generators:
-          snowflake:
-            type: SNOWFLAKE
-            props:
-              worker-id: 123
-        # 分片算法配置
-        sharding-algorithms:
-          table-classbased:
-            props:
-              strategy: standard
-              # 自定义标准分配算法
-              algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
-            type: CLASS_BASED
-        tables:
-          # 逻辑表名称
-          sys_log:
-            #配置具体表的数据节点
-            actual-data-nodes: ds0.sys_log$->{0..1}
-            # 分表策略
-            table-strategy:
-              standard:
-                # 分片算法名称
-                sharding-algorithm-name: table-classbased
-                # 分片列名称(对应数据库字段)
-                sharding-column: log_type

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/sharding-multi.yaml

@@ -0,0 +1,67 @@
+# !!!数据源名称要和动态数据源中配置的名称一致
+databaseName: sharding-db
+
+# 具体参看官网文档说明
+dataSources:
+  ds0:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    jdbcUrl: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    password: root
+    username: root
+  ds1:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    jdbcUrl: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    password: root
+    username: root
+
+rules:
+  - !SHARDING
+    bindingTables:
+      - sys_log
+    tables:
+      sys_log:
+        actualDataNodes: ds$->{0..1}.sys_log$->{0..1}
+        databaseStrategy:
+          standard:
+            shardingColumn: operate_type
+            shardingAlgorithmName: database-inline
+        tableStrategy:
+          standard:
+            shardingColumn: log_type
+            shardingAlgorithmName: table-classbased
+        keyGenerateStrategy:
+          column: id
+          keyGeneratorName: snowflake
+    
+    keyGenerators:
+      snowflake:
+        type: SNOWFLAKE
+        props:
+          worker-id: 123
+    
+    shardingAlgorithms:
+      database-inline:
+        type: INLINE
+        props:
+          algorithm-expression: ds$->{operate_type % 2}
+      table-classbased:
+        type: CLASS_BASED
+        props:
+          strategy: standard
+          algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm
+
+  - !READWRITE_SPLITTING
+    dataSources:
+      prds:
+        writeDataSourceName: ds0
+        readDataSourceNames:
+          - ds1
+        loadBalancerName: round-robin
+    loadBalancers:
+      round-robin:
+        type: ROUND_ROBIN
+
+props:
+  sql-show: true

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/sharding.yaml

@@ -0,0 +1,40 @@
+# !!!数据源名称要和动态数据源中配置的名称一致
+databaseName: sharding-db
+
+# 具体参看官网文档说明
+dataSources:
+  db_0:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    jdbcUrl: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    password: root
+    username: root
+
+rules:
+  - !SHARDING
+    tables: # 数据分片规则配置
+      sys_log: # 逻辑表名称
+        actualDataNodes: db_0.sys_log$->{0..1} # 由数据源名 + 表名组成（参考 Inline 语法规则）
+        databaseStrategy: # 分库策略，缺省表示使用默认分库策略，以下的分片策略只能选其一
+          none:
+        tableStrategy: # 分表策略
+          standard: # 用于单分片键的标准分片场景
+            shardingColumn: log_type # 分片列名称
+            shardingAlgorithmName: user_inline
+        keyGenerateStrategy:
+          column: id
+          keyGeneratorName: snowflake
+    keyGenerators:
+      snowflake:
+        type: SNOWFLAKE
+        props:
+          worker-id: 123
+    # 分片算法配置
+    shardingAlgorithms:
+      user_inline:
+        type: INLINE
+        props:
+          algorithm-expression: sys_log$->{log_type % 2}
+
+props:
+  sql-show: true

jeecg-boot/pom.xml

@@ -59,14 +59,14 @@
 		<liteflow.version>2.15.0</liteflow.version>
 		
 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>2.1.3</jimureport-spring-boot-starter.version>
-		<jimubi-spring-boot-starter.version>2.1.4</jimubi-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>2.1.5</jimureport-spring-boot-starter.version>
+		<jimubi-spring-boot-starter.version>2.1.5</jimubi-spring-boot-starter.version>
 		<minidao.version>1.10.14</minidao.version>
 		<autopoi-web.version>1.4.18</autopoi-web.version>
 		
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.12</mybatis-plus.version>
-		<dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
+		<dynamic-datasource-spring-boot-starter.version>4.3.1</dynamic-datasource-spring-boot-starter.version>
 		<druid.version>1.2.24</druid.version>
 
 		<commons-io.version>2.11.0</commons-io.version>
@@ -243,7 +243,12 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot3</groupId>
 				<artifactId>jeecg-boot-starter-shardingsphere</artifactId>
-				<version>${jeecgboot.version}</version>
+				<version>3.8.3.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.jeecgframework.boot3</groupId>
+				<artifactId>jeecg-boot-starter-shardingsphere-nacos</artifactId>
+				<version>3.8.3.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
@@ -528,7 +533,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot3</groupId>
 				<artifactId>jeecg-boot-starter-chatgpt</artifactId>
-				<version>${jeecgboot.version}</version>
+				<version>3.8.3.2</version>
 			</dependency>
 			<!--flyway 支持 mysql5.7+、MariaDB10.3.16-->
 			<!--mysql5.6，需要把版本号改成5.2.1-->

jeecgboot-vue3/README.md

@@ -35,9 +35,9 @@ JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue4、TypeScript 等新技术
 ## 安装与使用
 
 *   本地环境安装 `Node.js 、npm 、pnpm`
-*   Node.js 版本建议`v20.15.0`，要求`Node 20+` 版本以上
+*   Node.js 版本要求`Node 20+` 版本以上
 
- ` ( 因为Vite5 不再支持已 EOL 的 Node.js 14 / 16 / 17 / 19，现在需要 Node.js 18 / 20+ )`
+ ` ( 因为Vite5 不再支持已 EOL 的 Node.js 14 / 16 / 17 / 19，现在需要 Node 20+ )`