国际化

Update renderUtils.ts 修复字典渲染renderTag使用tag渲染没使用字典配置颜色的问题

README-AI.md

@@ -3,9 +3,6 @@ AIGC应用平台介绍
 
 一个全栈式 AI 开发平台，旨在帮助开发者快速构建和部署个性化的 AI 应用。
 
-> JDK说明：AI流程编排引擎暂时不支持jdk21，所以目前只能使用jdk8或者jdk17启动项目。
-
-
 JeecgBoot平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发平台`+`知识库问答`，是一款基于LLM大语言模型AI应用平台和 RAG 的知识库问答系统。
 其直观的界面结合了 AI 流程编排、RAG 管道、知识库管理、模型管理、对接向量库、实时运行可观察等，让您可以快速从原型到生产，拥有AI服务能力。
 
@@ -109,6 +106,10 @@ JeecgBoot平台的AIGC功能模块，是一套类似`Dify`的`AIGC应用开发
 | ChatGTP       |  √   |
 | Qwq           |  √   |
 | 智库            |  √   |
+| claude        |  √   |
+| vl模型          |  √   |
+| 千帆大模型         |  √   |
+| 通义千问          |  √   |
 | Ollama本地搭建大模型 |  √   |
 | 等等。。          |  √   |
 

README-Enterprise.md

@@ -1,126 +0,0 @@
-
-JeecgBoot低代码平台(商业版介绍)
-===============
-
-
-
-项目介绍
------------------------------------
-
-<h3 align="center">企业级AI低代码平台</h3>
-
-
-JeecgBoot是一款集成AI应用的，基于BPM流程的低代码平台，旨在帮助企业快速实现低代码开发和构建个性化AI应用，支持MCP和插件，实现聊天式业务操作（如 “一句话创建用户”）！
-
-前后端分离架构Ant Design&Vue3，SpringBoot，SpringCloud Alibaba，Mybatis-plus，Shiro。强大的代码生成器让前后端代码一键生成，无需写任何代码！ 引领AI低代码开发模式: AI生成->OnlineCoding-> 代码生成-> 手工MERGE， 帮助Java项目解决80%的重复工作，让开发更多关注业务，提高效率、节省成本，同时又不失灵活性！低代码能力：Online表单、表单设计、流程设计、Online报表、大屏/仪表盘设计、报表设计; AI应用平台功能：AI知识库问答、AI模型管理、AI流程编排、AI聊天等，支持含ChatGPT、DeepSeek、Ollama等多种AI大模型
-
-JeecgBoot 提供了一系列 `低代码能力`，实现`真正的零代码`在线开发：Online表单开发、Online报表、复杂报表设计、打印设计、在线图表设计、仪表盘设计、大屏设计、移动图表能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）
-
-`AI赋能低代码:` 目前提供了AI应用、AI模型管理、AI流程编排、AI对话助手，AI建表、AI写文章、AI知识库问答、AI字段建议等功能;支持各种AI大模型ChatGPT、DeepSeek、Ollama、智普、千问等.
-
-`JEECG宗旨是:` 简单功能由OnlineCoding配置实现，做到`零代码开发`；复杂功能由代码生成器生成进行手工Merge 实现`低代码开发`，既保证了`智能`又兼顾`灵活`；实现了低代码开发的同时又支持灵活编码，解决了当前低代码产品普遍不灵活的弊端！
-
-`JEECG业务流程:` 采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。
-
-
-
-#### JeecgBoot商业版与同类产品区别
------------------------------------
-
-- 灵活性：jeecgboot基于开源技术栈，设计初考虑到可插拔性和集成灵活性，确保平台的智能性与灵活性，避免因平台过于庞大而导致的扩展困难。
-- 流程管理：支持一个表单挂接多个流程，同时一个流程可以连接多个表单，增强了流程的灵活性和复杂性管理。
-- 符合中国国情的流程：针对中国市场的特定需求，jeecgboot能够实现各种符合中国国情的业务流程。
-- 强大的表单设计器：jeecgboot的表单设计器与敲敲云共享，具备高质量和智能化的特点，能够满足零代码应用的需求，业内同类产品中不多见。
-- 报表功能：自主研发的报表工具，拥有独立知识产权，功能上比业内老牌产品如帆软更智能，操作简便。
-- BI产品整合：提供大屏、仪表盘、门户等功能，完美解决这些需求，并支持移动面板的设计与渲染。
-- 自主研发的模块：jeecgboot的所有模块均为自主研发，具有独立的知识产权。
-- 颗粒度和功能细致：在功能细致度和颗粒度上，jeecgboot远超同类产品，尤其在零代码能力方面表现突出。
-- 零代码应用管理：最新版支持与敲敲云的零代码应用管理能力的集成，使得jeecgboot既具备低代码，又具备零代码的应用能力，业内独一无二。
-- 强大的代码生成器：作为开源代码生成器的先锋，jeecgboot在代码生成的智能化和在线低代码与代码生成的结合方面，优势明显。
-- 精细化权限管理：提供行级和列级的数据权限控制，满足企业在ERP和OA领域对权限管理的严格需求。
-- 多平台支持的APP：目前采用uniapp3实现，支持小程序、H5、App及鸿蒙、鸿蒙Next、Electron桌面应用等多种终端。
-
-> 综上所述，jeecgboot不仅在功能上具备丰富性和灵活性，还在技术架构、权限管理和用户体验等方面展现出明显的优势，是一个综合性能强大的低代码平台。
-
-
-
-商业版演示
------------------------------------
-
-JeecgBoot vs 敲敲云
-> - JeecgBoot是低代码产品拥有系列低代码能力，比如流程设计、表单设计、大屏设计，代码生成器，适合半开发模式（开发+低代码结合），也可以集成零代码应用管理模块.
-> - 敲敲云是零代码产品，完全不写代码，通过配置搭建业务系统，其在jeecgboot基础上研发而成，删除了online、代码生成、OA等需要编码功能，只保留应用管理功能和聊天、日程、文件三个OA组件.
-
-
-- JeecgBoot低代码：  https://boot3.jeecg.com
-- 敲敲云零代码：https://app.qiaoqiaoyun.com
-- APP演示(多端): http://jeecg.com/appIndex
-
-
-### 流程视频介绍
-
-[![](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/flow_video.png)](https://www.bilibili.com/video/BV1Nk4y1o7Qc)
-
-
-
-### 商业版功能简述
-
-> 详细的功能介绍，[请联系官方](https://jeecg.com/vip)
-
-```
-│─更多商业功能
-│  ├─流程设计器
-│  ├─简流设计器(类钉钉版)
-│  ├─门户设计（NEW）
-│  ├─表单设计器
-│  ├─大屏设计器
-│  └─我的任务
-│  └─历史流程
-│  └─历史流程
-│  └─流程实例管理
-│  └─流程监听管理
-│  └─流程表达式
-│  └─我发起的流程
-│  └─我的抄送
-│  └─流程委派、抄送、跳转
-│  └─OA办公组件
-│  └─零代码应用管理（无需编码，在线搭建应用系统）
-│  ├─积木报表企业版（含jimureport、jimubi）
-│  ├─AI流程设计器源码
-│  ├─Online全模块功能和源码
-│  ├─AI写文章（CMS）
-│  ├─AI表单字段建议（表单设计器）
-│  ├─OA办公协同组件
-│  ├─在线聊天功能
-│  ├─设计表单移动适配
-│  ├─设计表单支持外部填报
-│  ├─设计表单AI字段建议
-│  ├─设计表单视图功能(支持多种类型含日历、表格、看板、甘特图)
-│  └─。。。
-   
-```
-
-
-
-
-##### 流程设计
-![](https://oscimg.oschina.net/oscnet/up-981ce174e4fbb48c8a2ce4ccfd7372e2994.png)
-
-![](https://oscimg.oschina.net/oscnet/up-1dc0d052149ec675f3e4fad632b82b48add.png)
-
-![](https://oscimg.oschina.net/oscnet/up-de31bc2f9d9b8332c554b0954cc73d79593.png)
-
-![输入图片说明](https://static.oschina.net/uploads/img/201907/05165142_yyQ7.png "在这里输入图片标题")
-
-![输入图片说明](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "在这里输入图片标题")
-
-![输入图片说明](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "在这里输入图片标题")
-
-
-
-##### 表单设计器
-![](https://oscimg.oschina.net/oscnet/up-5f8cb657615714b02190b355e59f60c5937.png)
-
-![](https://oscimg.oschina.net/oscnet/up-d9659b2f324e33218476ec98c9b400e6508.png)
-
-![](https://oscimg.oschina.net/oscnet/up-4868615395272d3206dbb960ade02dbc291.png)

README.en-US.md

@@ -1,4 +1,4 @@
-
+[中文](./README.md) | English
 
 ![JEECG](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/logov3.png "JeecgBoot低代码开发平台")
 

README.md

@@ -1,3 +1,4 @@
+中文 | [English](./README.en-US.md)
 
 JeecgBoot AI低代码平台
 ===============
@@ -19,15 +20,17 @@ JeecgBoot AI低代码平台
 
 <h3 align="center">企业级AI低代码平台</h3>
 
-JeecgBoot 是一款基于BPM流程和代码生成的AI低代码平台，助力企业快速实现低代码开发和构建AI应用，支持MCP和插件，实现聊天式业务操作（如 “一句话创建用户”）！
+JeecgBoot 是一款融合代码生成与AI应用的低代码开发平台，助力企业快速实现低代码开发和构建AI应用。平台支持MCP和插件扩展，提供聊天式业务操作(如“一句话创建用户”)，大幅提升开发效率与用户便捷性。
 
 采用前后端分离架构（Ant Design&Vue3，SpringBoot3，SpringCloud Alibaba，Mybatis-plus），强大代码生成器实现前后端一键生成，无需手写代码。 
 平台引领AI低代码开发模式：AI生成→在线编码→代码生成→手工合并，解决Java项目80%重复工作，提升效率，节省成本，兼顾灵活性。 
 具备强大且颗粒化的权限控制，支持按钮权限和数据权限设置，满足大型业务系统需求。功能涵盖在线表单、表单设计、流程设计、门户设计、报表与大屏设计、OA办公、AI应用、AI知识库、大模型管理、AI流程编排、AI聊天，支持ChatGPT、DeepSeek、Ollama等多种AI大模型。
 
-`AI赋能报表:` 积木报表是一款自主研发的强大开源企业级Web报表与大屏工具。它通过零编码的拖拽式操作，赋能用户如同搭积木般轻松构建各类复杂报表和数据大屏，全面满足企业数据可视化与分析需求，助力企业级数据产品的高效打造与应用。
+`傻瓜式报表:` JimuReport是一款自主研发的强大开源企业级Web报表工具。它通过零编码的拖拽式操作，赋能用户如同搭积木般轻松构建各类复杂报表，全面满足企业数据可视化与分析需求，助力企业级数据产品的高效打造与应用。
 
-`AI赋能低代码:` 提供完善成熟的AI应用平台，涵盖AI应用管理、AI模型管理、智能对话助手、知识库问答、流程编排与设计器、AI建表等多项功能。平台兼容多种主流大模型，包括ChatGPT、DeepSeek、Ollama、智普、千问等，助力企业高效构建智能化应用，推动低代码开发与AI深度融合。
+`傻瓜式大屏:` JimuBI一款自主研发的强大的大屏和仪表盘设计工具。专注数字孪生与数据可视化，支持交互式大屏、仪表盘、门户和移动端，实现“一次开发，多端适配”。 大屏设计类Word风格，支持多屏切换，自由拖拽，轻松打造炫酷动态界面。
+
+`成熟AI应用功能:` 提供一套完善AI应用平台: 涵盖AI应用管理、AI模型管理、智能对话助手、知识库问答、流程编排与设计器、AI建表、MCP插件配置等功能。平台兼容主流大模型，包括ChatGPT、DeepSeek、Ollama、智普、千问等，助力企业高效构建智能化应用，推动低代码开发与AI深度融合。
 
 `JEECG宗旨是:` JEECG旨在通过OnlineCoding平台实现简单功能的零代码快速搭建，同时针对复杂功能采用代码生成器生成代码并手工合并，打造智能且灵活的低代码开发模式，有效解决了当前低代码产品普遍缺乏灵活性的问题，提升开发效率的同时兼顾系统的扩展性和定制化能力。
 
@@ -230,20 +233,6 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
 
 
 
-
-
-开源版与企业版区别?
------------------------------------
-
- - JeecgBoot开源版采用 [Apache-2.0 license](LICENSE) 协议附加补充条款：允许商用使用，不会造成侵权行为，允许基于本平台软件开展业务系统开发（但在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件).
- - 商业版与开源版主要区别在于商业版提供了技术支持 和 更多的企业级功能(例如：Online图表、流程监控、流程设计、流程审批、表单设计器、表单视图、积木报表企业版、OA办公、商业APP、零代码应用、Online模块源码等功能). [更多商业功能介绍，点击查看](README-Enterprise.md)
- - JeecgBoot未来发展方向是：零代码平台的建设，也就是团队的另外一款产品 [敲敲云零代码](https://www.qiaoqiaoyun.com) ，无需编码即可通过拖拽快速搭建企业级应用，与JeecgBoot低代码平台形成互补，满足从简单业务到复杂系统的全场景开发需求，目前已经开源，[欢迎下载](https://qiaoqiaoyun.com/downloadCode)
-
-
-
-
-
-
 ### Jeecg Boot 产品功能蓝图
 ![功能蓝图](https://jeecgos.oss-cn-beijing.aliyuncs.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "在这里输入图片标题")
 

jeecg-boot/README.md

@@ -1,4 +1,3 @@
-
 JeecgBoot 低代码开发平台
 ===============
 

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

@@ -3,9 +3,7 @@ package org.jeecg.common.system.util;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.annotation.EnumDict;
 import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
@@ -13,6 +11,7 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.util.ClassUtils;
+
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -183,10 +182,10 @@ public class ResourceUtil {
                 for (DictModel dm : dictItemList) {
                     String value = dm.getValue();
                     if (keySet.contains(value)) {
-                        List<DictModel> list = new ArrayList<>();
+                        // 修复bug：获取或创建该dictCode对应的list，而不是每次都创建新的list
+                        List<DictModel> list = map.computeIfAbsent(code, k -> new ArrayList<>());
                         list.add(new DictModel(value, dm.getText()));
-                        map.put(code, list);
-                        break;
+                        //break;
                     }
                 }
             }

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/annotation/SignatureCheck.java

@@ -0,0 +1,32 @@
+package org.jeecg.config.sign.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 签名校验注解
+ * 用于方法级别的签名验证，功能等同于yml中的jeecg.signUrls配置
+ * 参考DragSignatureAspect的设计思路，使用AOP切面实现
+ * 
+ * @author GitHub Copilot
+ * @since 2025-12-15
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SignatureCheck {
+    
+    /**
+     * 是否启用签名校验
+     * @return true-启用(默认), false-禁用
+     */
+    boolean enabled() default true;
+    
+    /**
+     * 签名校验失败时的错误消息
+     * @return 错误消息
+     */
+    String errorMessage() default "Sign签名校验失败！";
+    
+}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/aspect/SignatureCheckAspect.java

@@ -0,0 +1,93 @@
+package org.jeecg.config.sign.aspect;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.jeecg.config.sign.annotation.SignatureCheck;
+import org.jeecg.config.sign.interceptor.SignAuthInterceptor;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.lang.reflect.Method;
+
+/**
+ * 基于AOP的签名验证切面
+ * 复用SignAuthInterceptor的成熟签名验证逻辑
+ * 
+ * @author GitHub Copilot
+ * @since 2025-12-15
+ */
+@Aspect
+@Slf4j
+@Component("signatureCheckAspect")
+public class SignatureCheckAspect {
+    
+    /**
+     * 复用SignAuthInterceptor的签名验证逻辑
+     */
+    private final SignAuthInterceptor signAuthInterceptor = new SignAuthInterceptor();
+
+    /**
+     * 验签切点：拦截所有标记了@SignatureCheck注解的方法
+     */
+    @Pointcut("@annotation(org.jeecg.config.sign.annotation.SignatureCheck)")
+    private void signatureCheckPointCut() {
+    }
+
+    /**
+     * 开始验签
+     */
+    @Before("signatureCheckPointCut()")
+    public void doSignatureValidation(JoinPoint point) throws Exception {
+        // 获取方法上的注解
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Method method = signature.getMethod();
+        SignatureCheck signatureCheck = method.getAnnotation(SignatureCheck.class);
+        
+        log.info("AOP签名验证: {}.{}", method.getDeclaringClass().getSimpleName(), method.getName());
+        
+        // 如果注解被禁用，直接返回
+        if (!signatureCheck.enabled()) {
+            log.info("签名验证已禁用，跳过");
+            return;
+        }
+        
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            log.error("无法获取请求上下文");
+            throw new IllegalArgumentException("无法获取请求上下文");
+        }
+        
+        HttpServletRequest request = attributes.getRequest();
+        log.info("X-SIGN: {}, X-TIMESTAMP: {}", request.getHeader("X-SIGN"), request.getHeader("X-TIMESTAMP"));
+        
+        try {
+            // 直接调用SignAuthInterceptor的验证逻辑
+            signAuthInterceptor.validateSignature(request);
+            log.info("AOP签名验证通过");
+            
+        } catch (IllegalArgumentException e) {
+            // 使用注解中配置的错误消息，或者保留原始错误消息
+            String errorMessage = signatureCheck.errorMessage();
+            log.error("AOP签名验证失败: {}", e.getMessage());
+            
+            if ("Sign签名校验失败！".equals(errorMessage)) {
+                // 如果是默认错误消息，使用原始的详细错误信息
+                throw e;
+            } else {
+                // 如果是自定义错误消息，使用自定义消息
+                throw new IllegalArgumentException(errorMessage, e);
+            }
+        } catch (Exception e) {
+            // 包装其他异常
+            String errorMessage = signatureCheck.errorMessage();
+            log.error("AOP签名验证异常: {}", e.getMessage());
+            throw new IllegalArgumentException(errorMessage, e);
+        }
+    }
+}

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java

@@ -1,12 +1,10 @@
 package org.jeecg.config.sign.interceptor;
 
 
-import java.io.PrintWriter;
-import java.util.SortedMap;
-
+import com.alibaba.fastjson.JSON;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.DateUtils;
@@ -16,9 +14,8 @@ import org.jeecg.config.sign.util.HttpUtils;
 import org.jeecg.config.sign.util.SignUtil;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import com.alibaba.fastjson.JSON;
-
-import lombok.extern.slf4j.Slf4j;
+import java.io.PrintWriter;
+import java.util.SortedMap;
 
 /**
  * 签名拦截器
@@ -33,63 +30,94 @@ public class SignAuthInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        log.debug("Sign Interceptor request URI = " + request.getRequestURI());
-        HttpServletRequest requestWrapper = new BodyReaderHttpServletRequestWrapper(request);
-        //获取全部参数(包括URL和body上的)
-        SortedMap<String, String> allParams = HttpUtils.getAllParams(requestWrapper);
-        //对参数进行签名验证
-        String headerSign = request.getHeader(CommonConstant.X_SIGN);
-        String xTimestamp = request.getHeader(CommonConstant.X_TIMESTAMP);
+        log.info("签名拦截器 Interceptor request URI = " + request.getRequestURI());
         
-        if(oConvertUtils.isEmpty(xTimestamp)){
-            Result<?> result = Result.error("Sign签名校验失败，时间戳为空！");
-            log.error("Sign 签名校验失败！Header xTimestamp 为空");
-            //校验失败返回前端
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application/json; charset=utf-8");
-            PrintWriter out = response.getWriter();
-            out.print(JSON.toJSON(result));
-            return false;
-        }
-
-        //客户端时间
-        Long clientTimestamp = Long.parseLong(xTimestamp);
-
-        int length = 14;
-        int length1000 = 1000;
-        //1.校验签名时间（兼容X_TIMESTAMP的新老格式）
-        if (xTimestamp.length() == length) {
-            //a. X_TIMESTAMP格式是 yyyyMMddHHmmss (例子：20220308152143)
-            if ((DateUtils.getCurrentTimestamp() - clientTimestamp) > MAX_EXPIRE) {
-                log.error("签名验证失败:X-TIMESTAMP已过期，注意系统时间和服务器时间是否有误差！");
-                throw new IllegalArgumentException("签名验证失败:X-TIMESTAMP已过期");
-            }
-        } else {
-            //b. X_TIMESTAMP格式是 时间戳 (例子：1646552406000)
-            if ((System.currentTimeMillis() - clientTimestamp) > (MAX_EXPIRE * length1000)) {
-                log.error("签名验证失败:X-TIMESTAMP已过期，注意系统时间和服务器时间是否有误差！");
-                throw new IllegalArgumentException("签名验证失败:X-TIMESTAMP已过期");
-            }
-        }
-
-        //2.校验签名
-        boolean isSigned = SignUtil.verifySign(allParams,headerSign);
-
-        if (isSigned) {
-            log.debug("Sign 签名通过！Header Sign : {}",headerSign);
+        try {
+            // 调用验证逻辑
+            validateSignature(request);
             return true;
-        } else {
-            log.debug("sign allParams: {}", allParams);
-            log.error("request URI = " + request.getRequestURI());
-            log.error("Sign 签名校验失败！Header Sign : {}",headerSign);
-            //校验失败返回前端
+        } catch (IllegalArgumentException e) {
+            // 验证失败，返回错误响应
+            log.error("Sign 签名校验失败！{}", e.getMessage());
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");
             PrintWriter out = response.getWriter();
-            Result<?> result = Result.error("Sign签名校验失败！");
+            Result<?> result = Result.error(e.getMessage());
             out.print(JSON.toJSON(result));
             return false;
         }
     }
     
+    /**
+     * 签名验证核心逻辑
+     * 提取出来供AOP切面复用
+     * @param request HTTP请求
+     * @throws IllegalArgumentException 验证失败时抛出异常
+     */
+    public void validateSignature(HttpServletRequest request) throws IllegalArgumentException {
+        try {
+            log.debug("开始签名验证: {} {}", request.getMethod(), request.getRequestURI());
+            
+            HttpServletRequest requestWrapper = new BodyReaderHttpServletRequestWrapper(request);
+            //获取全部参数(包括URL和body上的)
+            SortedMap<String, String> allParams = HttpUtils.getAllParams(requestWrapper);
+            log.debug("提取参数: {}", allParams);
+            
+            //对参数进行签名验证
+            String headerSign = request.getHeader(CommonConstant.X_SIGN);
+            String xTimestamp = request.getHeader(CommonConstant.X_TIMESTAMP);
+            
+            if(oConvertUtils.isEmpty(xTimestamp)){
+                log.error("Sign签名校验失败，时间戳为空！");
+                throw new IllegalArgumentException("Sign签名校验失败，请求参数不完整！");
+            }
+
+            //客户端时间
+            Long clientTimestamp = Long.parseLong(xTimestamp);
+
+            int length = 14;
+            int length1000 = 1000;
+            //1.校验签名时间（兼容X_TIMESTAMP的新老格式）
+            if (xTimestamp.length() == length) {
+                //a. X_TIMESTAMP格式是 yyyyMMddHHmmss (例子：20220308152143)
+                long currentTimestamp = DateUtils.getCurrentTimestamp();
+                long timeDiff = currentTimestamp - clientTimestamp;
+                log.debug("时间戳验证(yyyyMMddHHmmss): 时间差{}秒", timeDiff);
+                
+                if (timeDiff > MAX_EXPIRE) {
+                    log.error("时间戳已过期: {}秒 > {}秒", timeDiff, MAX_EXPIRE);
+                    throw new IllegalArgumentException("签名验证失败，请求时效性验证失败！");
+                }
+            } else {
+                //b. X_TIMESTAMP格式是 时间戳 (例子：1646552406000)
+                long currentTime = System.currentTimeMillis();
+                long timeDiff = currentTime - clientTimestamp;
+                long maxExpireMs = MAX_EXPIRE * length1000;
+                log.debug("时间戳验证(Unix): 时间差{}ms", timeDiff);
+                
+                if (timeDiff > maxExpireMs) {
+                    log.error("时间戳已过期: {}ms > {}ms", timeDiff, maxExpireMs);
+                    throw new IllegalArgumentException("签名验证失败，请求时效性验证失败！");
+                }
+            }
+
+            //2.校验签名
+            boolean isSigned = SignUtil.verifySign(allParams,headerSign);
+
+            if (isSigned) {
+                log.debug("签名验证通过");
+            } else {
+                log.error("签名验证失败, 参数: {}", allParams);
+                throw new IllegalArgumentException("Sign签名校验失败！");
+            }
+        } catch (IllegalArgumentException e) {
+            // 重新抛出签名验证异常
+            throw e;
+        } catch (Exception e) {
+            // 包装其他异常（如IOException）
+            log.error("签名验证异常: {}", e.getMessage());
+            throw new IllegalArgumentException("Sign签名校验失败：" + e.getMessage());
+        }
+    }
+
 }

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

@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.jeecgframework.boot3</groupId>
             <artifactId>jeecg-aiflow</artifactId>
-            <version>3.9.0</version>
+            <version>3.9.0.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -85,10 +85,14 @@
                     <groupId>commons-beanutils</groupId>
                     <artifactId>commons-beanutils</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.yomahub</groupId>
+                    <artifactId>liteflow-script-python</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
-        <!-- beigin 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
+        <!-- begin 注意：这几个依赖体积较大，每个约50MB。若发布时需要使用，请将 <scope>provided</scope> 删除 -->
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-scripting-jsr223</artifactId>
@@ -101,7 +105,13 @@
             <version>${liteflow.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- end 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-python</artifactId>
+            <version>${liteflow.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- end 注意：这几个依赖体积较大，每个约50MB。若发布时需要使用，请将 <scope>provided</scope> 删除 -->
 
         <!-- aiflow 脚本依赖 -->
         <dependency>
@@ -110,12 +120,6 @@
             <version>${liteflow.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>liteflow-script-python</artifactId>
-            <version>${liteflow.version}</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-kotlin</artifactId>

jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java

@@ -1,438 +0,0 @@
-package org.jeecg.modules.dlglong.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.MatchTypeEnum;
-import org.jeecg.common.system.query.QueryCondition;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.constant.VxeSocketConst;
-import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket;
-import org.jeecg.modules.dlglong.entity.MockEntity;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLDecoder;
-import java.util.*;
-
-/**
- * @Description: DlMockController
- * @author: jeecg-boot
- */
-@Slf4j
-@RestController
-@RequestMapping("/mock/dlglong")
-public class DlMockController {
-
-    /**
-     * 模拟更改状态
-     *
-     * @param id
-     * @param status
-     * @return
-     */
-    @GetMapping("/change1")
-    public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
-        /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        rowData.put("status", status);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    /**
-     * 模拟更改拖轮状态
-     *
-     * @param id
-     * @param tugStatus
-     * @return
-     */
-    @GetMapping("/change2")
-    public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tugStatus) {
-        /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        JSONObject status = JSON.parseObject(tugStatus);
-        rowData.put("tug_status", status);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    /**
-     * 模拟更改进度条状态
-     *
-     * @param id
-     * @param progress
-     * @return
-     */
-    @GetMapping("/change3")
-    public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
-        /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        rowData.put("progress", progress);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    private void mockChange(JSONObject rowData) {
-        // 封装socket数据
-        JSONObject socketData = new JSONObject();
-        // 这里的 socketKey 必须要和调度计划页面上写的 socketKey 属性保持一致
-        socketData.put("socketKey", "page-dispatch");
-        // 这里的 args 必须得是一个数组，下标0是行数据，下标1是caseId，一般不用传
-        socketData.put("args", new Object[]{rowData, ""});
-        // 封装消息字符串，这里的 type 必须是 VXESocketConst.TYPE_UVT
-        String message = VxeSocket.packageMessage(VxeSocketConst.TYPE_UVT, socketData);
-        // 调用 sendMessageToAll 发送给所有在线的用户
-        VxeSocket.sendMessageToAll(message);
-    }
-
-    /**
-     * 模拟更改【大船待审】状态
-     *
-     * @param status
-     * @return
-     */
-    @GetMapping("/change4")
-    public Result mockChange4(@RequestParam("status") String status) {
-        // 封装socket数据
-        JSONObject socketData = new JSONObject();
-        // 这里的 key 是前端注册时使用的key，必须保持一致
-        socketData.put("key", "dispatch-dcds-status");
-        // 这里的 args 必须得是一个数组，每一位都是注册方法的参数，按顺序传递
-        socketData.put("args", new Object[]{status});
-
-        // 封装消息字符串，这里的 type 必须是 VXESocketConst.TYPE_UVT
-        String message = VxeSocket.packageMessage(VxeSocketConst.TYPE_CSD, socketData);
-        // 调用 sendMessageToAll 发送给所有在线的用户
-        VxeSocket.sendMessageToAll(message);
-
-        return Result.ok();
-    }
-
-    /**
-     * 【模拟】即时保存单行数据
-     *
-     * @param rowData 行数据，实际使用时可以替换成一个实体类
-     */
-    @PutMapping("/immediateSaveRow")
-    public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception {
-        System.out.println("即时保存.rowData：" + rowData.toJSONString());
-        // 延时1.5秒，模拟网慢堵塞真实感
-        Thread.sleep(500);
-        return Result.ok();
-    }
-
-    /**
-     * 【模拟】即时保存整个表格的数据
-     *
-     * @param tableData 表格数据（实际使用时可以替换成一个List实体类）
-     */
-    @PostMapping("/immediateSaveAll")
-    public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws Exception {
-        // 【注】：
-        // 1、tableData里包含该页所有的数据
-        // 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了，
-        //    不需要再进行一次update操作了，所以可以在前端传数据的时候就遍历判断一下，
-        //    只传新增的数据给后台insert即可，否者将会造成性能上的浪费。
-        // 3、新增的行是没有id的，通过这一点，就可以判断是否是新增的数据
-
-        System.out.println("即时保存.tableData：" + tableData.toJSONString());
-        // 延时1.5秒，模拟网慢堵塞真实感
-        Thread.sleep(1000);
-        return Result.ok();
-    }
-
-    /**
-     * 获取模拟数据
-     *
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @param parentId 父ID，不传则查询顶级
-     * @return
-     */
-    @GetMapping("/getData")
-    public Result getMockData(
-            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            // 父级id，根据父级id查询子级，如果为空则查询顶级
-            @RequestParam(name = "parentId", required = false) String parentId
-    ) {
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/dlglong/json/dlglong.json";
-        // 读取JSON数据
-        JSONArray dataList = readJsonData(path);
-        if (dataList == null) {
-            return Result.error("读取数据失败！");
-        }
-        IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
-        return Result.ok(page);
-    }
-
-    /**
-     * 获取模拟“调度计划”页面的数据
-     *
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @param parentId 父ID，不传则查询顶级
-     * @return
-     */
-    @GetMapping("/getDdjhData")
-    public Result getMockDdjhData(
-            // SpringMVC 会自动将参数注入到实体里
-            MockEntity mockEntity,
-            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            // 父级id，根据父级id查询子级，如果为空则查询顶级
-            @RequestParam(name = "parentId", required = false) String parentId,
-            @RequestParam(name = "status", required = false) String status,
-            // 高级查询条件
-            @RequestParam(name = "superQueryParams", required = false) String superQueryParams,
-            // 高级查询模式
-            @RequestParam(name = "superQueryMatchType", required = false) String superQueryMatchType,
-            HttpServletRequest request
-    ) {
-        // 获取查询条件（前台传递的查询参数）
-        Map<String, String[]> parameterMap = request.getParameterMap();
-        // 遍历输出到控制台
-        System.out.println("\ngetDdjhData - 普通查询条件：");
-        for (String key : parameterMap.keySet()) {
-            System.out.println("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key)));
-        }
-        // 输出高级查询
-        try {
-            System.out.println("\ngetDdjhData - 高级查询条件：");
-            // 高级查询模式
-            MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType);
-            if (matchType == null) {
-                System.out.println("-- 高级查询模式：不识别（" + superQueryMatchType + "）");
-            } else {
-                System.out.println("-- 高级查询模式：" + matchType.getValue());
-            }
-            superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
-            List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
-            if (conditions != null) {
-                for (QueryCondition condition : conditions) {
-                    System.out.println("-- " + JSON.toJSONString(condition));
-                }
-            } else {
-                System.out.println("-- 没有传递任何高级查询条件");
-            }
-            System.out.println();
-        } catch (Exception e) {
-            log.error("-- 高级查询操作失败：" + superQueryParams, e);
-            e.printStackTrace();
-        }
-
-        /* 注：实际使用中不用写上面那种繁琐的代码，这里只是为了直观的输出到控制台里而写的示例，
-              使用下面这种写法更简洁方便 */
-
-        // 封装成 MyBatisPlus 能识别的 QueryWrapper，可以直接使用这个对象进行SQL筛选条件拼接
-        // 这个方法也会自动封装高级查询条件，但是高级查询参数名必须是superQueryParams和superQueryMatchType
-        QueryWrapper<MockEntity> queryWrapper = QueryGenerator.initQueryWrapper(mockEntity, parameterMap);
-        System.out.println("queryWrapper： " + queryWrapper.getCustomSqlSegment());
-
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/dlglong/json/ddjh.json";
-        String statusValue = "8";
-        if (statusValue.equals(status)) {
-            path = "classpath:org/jeecg/modules/dlglong/json/ddjh_s8.json";
-        }
-        // 读取JSON数据
-        JSONArray dataList = readJsonData(path);
-        if (dataList == null) {
-            return Result.error("读取数据失败！");
-        }
-
-        IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
-        // 逐行查询子表数据，用于计算拖轮状态
-        List<JSONObject> records = page.getRecords();
-        for (JSONObject record : records) {
-            Map<String, Integer> tugStatusMap = new HashMap<>(5);
-            String id = record.getString("id");
-            // 查询出主表的拖轮
-            String tugMain = record.getString("tug");
-            // 判断是否有值
-            if (StringUtils.isNotBlank(tugMain)) {
-                // 拖轮根据分号分割
-                String[] tugs = tugMain.split(";");
-                // 查询子表数据
-                List<JSONObject> subRecords = this.queryDataPage(dataList, id, null, null).getRecords();
-                // 遍历子表和拖轮数据，找出进行计算反推拖轮状态
-                for (JSONObject subData : subRecords) {
-                    String subTug = subData.getString("tug");
-                    if (StringUtils.isNotBlank(subTug)) {
-                        for (String tug : tugs) {
-                            if (tug.equals(subTug)) {
-                                // 计算拖轮状态逻辑
-                                int statusCode = 0;
-
-                                /* 如果有发船时间、作业开始时间、作业结束时间、回船时间，则主表中的拖轮列中的每个拖轮背景色要即时变色 */
-
-                                // 有发船时间，状态 +1
-                                String departureTime = subData.getString("departure_time");
-                                if (StringUtils.isNotBlank(departureTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有作业开始时间，状态 +1
-                                String workBeginTime = subData.getString("work_begin_time");
-                                if (StringUtils.isNotBlank(workBeginTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有作业结束时间，状态 +1
-                                String workEndTime = subData.getString("work_end_time");
-                                if (StringUtils.isNotBlank(workEndTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有回船时间，状态 +1
-                                String returnTime = subData.getString("return_time");
-                                if (StringUtils.isNotBlank(returnTime)) {
-                                    statusCode += 1;
-                                }
-                                // 保存拖轮状态，key是拖轮的值，value是状态，前端根据不同的状态码，显示不同的颜色，这个颜色也可以后台计算完之后返回给前端直接使用
-                                tugStatusMap.put(tug, statusCode);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            // 新加一个字段用于保存拖轮状态，不要直接覆盖原来的，这个字段可以不保存到数据库里
-            record.put("tug_status", tugStatusMap);
-        }
-        page.setRecords(records);
-        return Result.ok(page);
-    }
-
-    /**
-     * 模拟查询数据，可以根据父ID查询，可以分页
-     *
-     * @param dataList 数据列表
-     * @param parentId 父ID
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @return
-     */
-    private IPage<JSONObject> queryDataPage(JSONArray dataList, String parentId, Integer pageNo, Integer pageSize) {
-        // 根据父级id查询子级
-        JSONArray dataDb = dataList;
-        if (StringUtils.isNotBlank(parentId)) {
-            JSONArray results = new JSONArray();
-            List<String> parentIds = Arrays.asList(parentId.split(","));
-            this.queryByParentId(dataDb, parentIds, results);
-            dataDb = results;
-        }
-        // 模拟分页（实际中应用SQL自带的分页）
-        List<JSONObject> records = new ArrayList<>();
-        IPage<JSONObject> page;
-        long beginIndex, endIndex;
-        // 如果任意一个参数为null，则不分页
-        if (pageNo == null || pageSize == null) {
-            page = new Page<>(0, dataDb.size());
-            beginIndex = 0;
-            endIndex = dataDb.size();
-        } else {
-            page = new Page<>(pageNo, pageSize);
-            beginIndex = page.offset();
-            endIndex = page.offset() + page.getSize();
-        }
-        for (long i = beginIndex; (i < endIndex && i < dataDb.size()); i++) {
-            JSONObject data = dataDb.getJSONObject((int) i);
-            data = JSON.parseObject(data.toJSONString());
-            // 不返回 children
-            data.remove("children");
-            records.add(data);
-        }
-        page.setRecords(records);
-        page.setTotal(dataDb.size());
-        return page;
-    }
-
-    private void queryByParentId(JSONArray dataList, List<String> parentIds, JSONArray results) {
-        for (int i = 0; i < dataList.size(); i++) {
-            JSONObject data = dataList.getJSONObject(i);
-            JSONArray children = data.getJSONArray("children");
-            // 找到了该父级
-            if (parentIds.contains(data.getString("id"))) {
-                if (children != null) {
-                    // addAll 的目的是将多个子表的数据合并在一起
-                    results.addAll(children);
-                }
-            } else {
-                if (children != null) {
-                    queryByParentId(children, parentIds, results);
-                }
-            }
-        }
-        results.addAll(new JSONArray());
-    }
-
-    private JSONArray readJsonData(String path) {
-        try {
-            InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", ""));
-            if (stream != null) {
-                String json = IOUtils.toString(stream, "UTF-8");
-                return JSON.parseArray(json);
-            }
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    /**
-     * 获取车辆最后一个位置
-     *
-     * @return
-     */
-    @PostMapping("/findLatestCarLngLat")
-    public List findLatestCarLngLat() {
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/dlglong/json/CarLngLat.json";
-        // 读取JSON数据
-        return readJsonData(path);
-    }
-
-    /**
-     * 获取车辆最后一个位置
-     *
-     * @return
-     */
-    @PostMapping("/findCarTrace")
-    public List findCarTrace() {
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/dlglong/json/CarTrace.json";
-        // 读取JSON数据
-        return readJsonData(path);
-    }
-
-}

jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java

@@ -1,27 +0,0 @@
-package org.jeecg.modules.dlglong.entity;
-
-import lombok.Data;
-
-/**
- * 模拟实体
- * @author: jeecg-boot
- */
-@Data
-public class MockEntity {
-
-    /**
-     * id
-     */
-    private String id;
-    /**
-     * 父级ID
-     */
-    private String parentId;
-    /**
-     * 状态
-     */
-    private String status;
-
-    /* -- 省略其他字段 -- */
-
-}

jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/CarLngLat.json

@@ -1,14 +0,0 @@
-[
-  {
-    "id": "6891ba44421aa907bcb7390c",
-    "alarm": "0",
-    "altitude": "13",
-    "direction": "0",
-    "latitude": "38.918739",
-    "longitude": "117.758737",
-    "speed": "11",
-    "status": "4980739",
-    "timestamp": "2025-08-05T16:01:07",
-    "imei": "18441136860"
-  }
-]

jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub.json

@@ -1,370 +0,0 @@
-{
-  "list": [
-    {
-      "key": "1717072932495_439966",
-      "type": "card",
-      "isAutoGrid": true,
-      "isContainer": true,
-      "list": [
-        {
-          "type": "input",
-          "name": "名称",
-          "className": "form-input",
-          "icon": "icon-input",
-          "hideTitle": false,
-          "options": {
-            "width": "100%",
-            "defaultValue": "",
-            "required": true,
-            "dataType": null,
-            "pattern": "",
-            "placeholder": "",
-            "clearable": false,
-            "readonly": false,
-            "disabled": false,
-            "fillRuleCode": "",
-            "showPassword": false,
-            "unique": false,
-            "hidden": false,
-            "hiddenOnAdd": false,
-            "fieldNote": "",
-            "autoWidth": 50
-          },
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "string",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "remoteAPI": {
-            "url": "",
-            "executed": false
-          },
-          "key": "1717072932495_556479",
-          "model": "input_1717072932495_556479",
-          "modelType": "main",
-          "rules": [
-            {
-              "required": true,
-              "message": "${title}必须填写"
-            }
-          ],
-          "isSubItem": false
-        },
-        {
-          "type": "number",
-          "name": "数字",
-          "className": "form-number",
-          "icon": "icon-number",
-          "hideTitle": false,
-          "options": {
-            "width": "",
-            "required": false,
-            "defaultValue": 0,
-            "placeholder": "",
-            "controls": false,
-            "min": 0,
-            "minUnlimited": true,
-            "max": 100,
-            "maxUnlimited": true,
-            "step": 1,
-            "disabled": false,
-            "controlsPosition": "right",
-            "unitText": "",
-            "unitPosition": "suffix",
-            "showPercent": false,
-            "align": "left",
-            "hidden": false,
-            "hiddenOnAdd": false,
-            "fieldNote": "",
-            "autoWidth": 50
-          },
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "number",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "remoteAPI": {
-            "url": "",
-            "executed": false
-          },
-          "key": "1717072985868_606195",
-          "model": "number_1717072985868_606195",
-          "modelType": "main",
-          "rules": [],
-          "isSubItem": false
-        }
-      ],
-      "options": {
-        "required": false,
-        "hiddenOnAdd": false,
-        "hidden": false,
-        "fieldNote": ""
-      },
-      "model": "card_1717072932495_439966",
-      "hideTitle": false,
-      "modelType": "main"
-    },
-    {
-      "key": "1717072988159_545097",
-      "type": "card",
-      "isAutoGrid": true,
-      "isContainer": true,
-      "list": [
-        {
-          "type": "money",
-          "name": "金额",
-          "className": "form-money",
-          "icon": "icon-money",
-          "hideTitle": false,
-          "options": {
-            "width": "180px",
-            "placeholder": "请输入金额",
-            "required": false,
-            "unitText": "元",
-            "unitPosition": "suffix",
-            "precision": 2,
-            "hidden": false,
-            "disabled": false,
-            "hiddenOnAdd": false,
-            "fieldNote": "",
-            "autoWidth": 50
-          },
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "number",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "remoteAPI": {
-            "url": "",
-            "executed": false
-          },
-          "key": "1717072988159_568693",
-          "model": "money_1717072988159_568693",
-          "modelType": "main",
-          "rules": [],
-          "isSubItem": false
-        },
-        {
-          "type": "select",
-          "name": "下拉选择框",
-          "className": "form-select",
-          "icon": "icon-select",
-          "hideTitle": false,
-          "options": {
-            "defaultValue": "",
-            "multiple": false,
-            "disabled": false,
-            "clearable": true,
-            "placeholder": "",
-            "required": false,
-            "showLabel": false,
-            "showType": "default",
-            "width": "",
-            "useColor": false,
-            "colorIteratorIndex": 3,
-            "options": [
-              {
-                "value": "下拉框1",
-                "itemColor": "#2196F3"
-              },
-              {
-                "value": "下拉框2",
-                "itemColor": "#08C9C9"
-              },
-              {
-                "value": "下拉框3",
-                "itemColor": "#00C345"
-              }
-            ],
-            "remote": false,
-            "filterable": false,
-            "remoteOptions": [],
-            "props": {
-              "value": "value",
-              "label": "label"
-            },
-            "remoteFunc": "",
-            "hidden": false,
-            "hiddenOnAdd": false,
-            "fieldNote": "",
-            "autoWidth": 50
-          },
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "string",
-              "allowFunc": true,
-              "valueSplit": ",",
-              "customConfig": true
-            }
-          },
-          "remoteAPI": {
-            "url": "",
-            "executed": false
-          },
-          "key": "1717072991431_622198",
-          "model": "select_1717072991431_622198",
-          "modelType": "main",
-          "rules": [],
-          "isSubItem": false
-        }
-      ],
-      "options": {
-        "required": false,
-        "hiddenOnAdd": false,
-        "hidden": false,
-        "fieldNote": ""
-      },
-      "model": "card_1717072988159_545097",
-      "hideTitle": false,
-      "modelType": "main"
-    },
-    {
-      "key": "1717072932495_382575",
-      "type": "card",
-      "isAutoGrid": true,
-      "isContainer": true,
-      "list": [
-        {
-          "type": "imgupload",
-          "name": "图片上传",
-          "className": "form-tupian",
-          "icon": "icon-tupian",
-          "hideTitle": false,
-          "options": {
-            "defaultValue": [],
-            "size": {
-              "width": 100,
-              "height": 100
-            },
-            "width": "",
-            "tokenFunc": "funcGetToken",
-            "token": "",
-            "domain": "http://img.h5huodong.com",
-            "disabled": false,
-            "length": 9,
-            "multiple": true,
-            "hidden": false,
-            "hiddenOnAdd": false,
-            "required": false,
-            "fieldNote": "",
-            "autoWidth": 50
-          },
-          "key": "1717072996509_795340",
-          "model": "imgupload_1717072996509_795340",
-          "modelType": "main",
-          "rules": [],
-          "isSubItem": false
-        },
-        {
-          "type": "file-upload",
-          "name": "附件",
-          "className": "form-file-upload",
-          "icon": "icon-shangchuan",
-          "hideTitle": false,
-          "options": {
-            "defaultValue": [],
-            "token": "",
-            "length": 1,
-            "drag": false,
-            "multiple": false,
-            "disabled": false,
-            "buttonText": "添加附件",
-            "tokenFunc": "funcGetToken",
-            "hidden": false,
-            "hiddenOnAdd": false,
-            "required": false,
-            "fieldNote": "",
-            "autoWidth": 50
-          },
-          "key": "1717072932495_669325",
-          "model": "file_upload_1717072932495_669325",
-          "modelType": "main",
-          "rules": [],
-          "isSubItem": false
-        }
-      ],
-      "options": {
-        "required": false,
-        "hiddenOnAdd": false,
-        "hidden": false,
-        "fieldNote": ""
-      },
-      "model": "card_1717072932495_382575",
-      "hideTitle": false,
-      "modelType": "main"
-    }
-  ],
-  "config": {
-    "titleField": "input_1717072932495_556479",
-    "showHeaderTitle": true,
-    "labelWidth": 100,
-    "labelPosition": "top",
-    "size": "small",
-    "dialogOptions": {
-      "top": 20,
-      "width": 1000,
-      "padding": {
-        "top": 25,
-        "right": 25,
-        "bottom": 30,
-        "left": 25
-      }
-    },
-    "disabledAutoGrid": false,
-    "designMobileView": false,
-    "enableComment": true,
-    "hasWidgets": [
-      "input",
-      "number",
-      "card",
-      "money",
-      "select",
-      "imgupload",
-      "file-upload"
-    ],
-    "expand": {
-      "js": "",
-      "css": "",
-      "url": {
-        "js": "",
-        "css": ""
-      }
-    },
-    "transactional": true,
-    "customRequestURL": [
-      {
-        "url": ""
-      }
-    ],
-    "allowExternalLink": false,
-    "externalLinkShowData": false,
-    "headerImgUrl": "",
-    "externalTitle": "",
-    "enableNotice": false,
-    "noticeMode": "external",
-    "noticeType": "system",
-    "noticeReceiver": "",
-    "allowPrint": false,
-    "allowJmReport": false,
-    "jmReportURL": "",
-    "bizRuleConfig": [],
-    "bigDataMode": false
-  }
-}

jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub_one.json

@@ -1,496 +0,0 @@
-{
-  "list": [
-    {
-      "hideTitle": false,
-      "options": {
-        "hidden": false,
-        "hiddenOnAdd": false,
-        "fieldNote": "",
-        "required": false
-      },
-      "isContainer": true,
-      "model": "card_1717072902303_783177",
-      "modelType": "main",
-      "type": "card",
-      "isAutoGrid": true,
-      "list": [
-        {
-          "isSubItem": false,
-          "remoteAPI": {
-            "executed": false,
-            "url": ""
-          },
-          "icon": "icon-input",
-          "className": "form-input",
-          "rules": [
-            {
-              "required": true,
-              "message": "${title}必须填写"
-            }
-          ],
-          "modelType": "main",
-          "type": "input",
-          "hideTitle": false,
-          "name": "名称",
-          "options": {
-            "clearable": false,
-            "hidden": false,
-            "defaultValue": "",
-            "pattern": "",
-            "fillRuleCode": "",
-            "fieldNote": "",
-            "required": true,
-            "readonly": false,
-            "unique": false,
-            "hiddenOnAdd": false,
-            "width": "100%",
-            "autoWidth": 100,
-            "showPassword": false,
-            "disabled": false,
-            "placeholder": ""
-          },
-          "model": "input_1717072902303_477529",
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "string",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "key": "1717072902303_477529"
-        }
-      ],
-      "key": "1717072902303_783177"
-    },
-    {
-      "options": {
-        "required": false,
-        "hiddenOnAdd": false,
-        "hidden": false,
-        "fieldNote": ""
-      },
-      "isContainer": true,
-      "model": "card_1717073019436_526262",
-      "type": "card",
-      "isAutoGrid": true,
-      "list": [
-        {
-          "isSubItem": false,
-          "remoteAPI": {
-            "executed": false,
-            "url": ""
-          },
-          "icon": "icon-number",
-          "className": "form-number",
-          "rules": [],
-          "modelType": "main",
-          "type": "number",
-          "hideTitle": false,
-          "name": "数字",
-          "options": {
-            "controls": false,
-            "showPercent": false,
-            "hidden": false,
-            "max": 100,
-            "defaultValue": 0,
-            "unitPosition": "suffix",
-            "fieldNote": "",
-            "maxUnlimited": true,
-            "align": "left",
-            "required": false,
-            "min": 0,
-            "minUnlimited": true,
-            "hiddenOnAdd": false,
-            "width": "",
-            "autoWidth": 50,
-            "step": 1,
-            "disabled": false,
-            "placeholder": "",
-            "controlsPosition": "right",
-            "unitText": ""
-          },
-          "model": "number_1717073019436_586474",
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "number",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "key": "1717073019436_586474"
-        },
-        {
-          "isSubItem": false,
-          "remoteAPI": {
-            "executed": false,
-            "url": ""
-          },
-          "icon": "icon-money",
-          "className": "form-money",
-          "rules": [],
-          "modelType": "main",
-          "type": "money",
-          "hideTitle": false,
-          "name": "金额",
-          "options": {
-            "hidden": false,
-            "precision": 2,
-            "hiddenOnAdd": false,
-            "width": "180px",
-            "autoWidth": 50,
-            "unitPosition": "suffix",
-            "disabled": false,
-            "fieldNote": "",
-            "placeholder": "请输入金额",
-            "required": false,
-            "unitText": "元"
-          },
-          "model": "money_1717073021100_526660",
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "number",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "key": "1717073021100_526660"
-        }
-      ],
-      "key": "1717073019436_526262",
-      "hideTitle": false,
-      "modelType": "main"
-    },
-    {
-      "hideTitle": false,
-      "options": {
-        "hidden": false,
-        "hiddenOnAdd": false,
-        "fieldNote": "",
-        "required": false
-      },
-      "isContainer": true,
-      "model": "card_1717072902303_118977",
-      "modelType": "main",
-      "type": "card",
-      "isAutoGrid": true,
-      "list": [
-        {
-          "isSubItem": false,
-          "remoteAPI": {
-            "executed": false,
-            "url": ""
-          },
-          "icon": "icon-select",
-          "className": "form-select",
-          "rules": [],
-          "modelType": "main",
-          "type": "select",
-          "hideTitle": false,
-          "name": "下拉选择框",
-          "options": {
-            "remoteFunc": "",
-            "filterable": false,
-            "clearable": true,
-            "hidden": false,
-            "defaultValue": "",
-            "remoteOptions": [],
-            "multiple": false,
-            "fieldNote": "",
-            "remote": false,
-            "required": false,
-            "showLabel": false,
-            "useColor": false,
-            "props": {
-              "label": "label",
-              "value": "value"
-            },
-            "colorIteratorIndex": 3,
-            "hiddenOnAdd": false,
-            "width": "",
-            "options": [
-              {
-                "itemColor": "#2196F3",
-                "value": "下拉框1"
-              },
-              {
-                "itemColor": "#08C9C9",
-                "value": "下拉框2"
-              },
-              {
-                "itemColor": "#00C345",
-                "value": "下拉框3"
-              }
-            ],
-            "autoWidth": 50,
-            "showType": "default",
-            "disabled": false,
-            "placeholder": ""
-          },
-          "model": "select_1717073033259_273399",
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "string",
-              "allowFunc": true,
-              "valueSplit": ",",
-              "customConfig": true
-            }
-          },
-          "key": "1717073033259_273399"
-        },
-        {
-          "isSubItem": false,
-          "remoteAPI": {
-            "executed": false,
-            "url": ""
-          },
-          "icon": "icon-textarea",
-          "className": "form-textarea",
-          "rules": [],
-          "modelType": "main",
-          "type": "textarea",
-          "hideTitle": false,
-          "name": "描述",
-          "options": {
-            "readonly": false,
-            "hidden": false,
-            "defaultValue": "",
-            "unique": false,
-            "hiddenOnAdd": false,
-            "width": "100%",
-            "pattern": "",
-            "autoWidth": 50,
-            "disabled": false,
-            "fieldNote": "",
-            "placeholder": "",
-            "required": false
-          },
-          "model": "textarea_1717072902303_129466",
-          "advancedSetting": {
-            "defaultValue": {
-              "type": "compose",
-              "value": "",
-              "format": "string",
-              "allowFunc": true,
-              "valueSplit": "",
-              "customConfig": false
-            }
-          },
-          "key": "1717072902303_129466"
-        }
-      ],
-      "key": "1717072902303_118977"
-    },
-    {
-      "hideTitle": false,
-      "options": {
-        "hidden": false,
-        "hiddenOnAdd": false,
-        "fieldNote": "",
-        "required": false
-      },
-      "isContainer": true,
-      "model": "card_1717072902304_736053",
-      "modelType": "main",
-      "type": "card",
-      "isAutoGrid": true,
-      "list": [
-        {
-          "hideTitle": false,
-          "isSubItem": false,
-          "name": "图片上传",
-          "icon": "icon-tupian",
-          "options": {
-            "hidden": false,
-            "defaultValue": [],
-            "length": 9,
-            "multiple": true,
-            "fieldNote": "",
-            "required": false,
-            "token": "",
-            "size": {
-              "width": 100,
-              "height": 100
-            },
-            "tokenFunc": "funcGetToken",
-            "domain": "http://img.h5huodong.com",
-            "hiddenOnAdd": false,
-            "width": "",
-            "autoWidth": 50,
-            "disabled": false
-          },
-          "className": "form-tupian",
-          "model": "imgupload_1717073025137_563739",
-          "rules": [],
-          "modelType": "main",
-          "type": "imgupload",
-          "key": "1717073025137_563739"
-        },
-        {
-          "hideTitle": false,
-          "isSubItem": false,
-          "name": "附件",
-          "icon": "icon-shangchuan",
-          "options": {
-            "buttonText": "添加附件",
-            "hidden": false,
-            "defaultValue": [],
-            "length": 1,
-            "multiple": false,
-            "fieldNote": "",
-            "required": false,
-            "token": "",
-            "tokenFunc": "funcGetToken",
-            "hiddenOnAdd": false,
-            "autoWidth": 50,
-            "disabled": false,
-            "drag": false
-          },
-          "className": "form-file-upload",
-          "model": "file_upload_1717072902304_442777",
-          "rules": [],
-          "modelType": "main",
-          "type": "file-upload",
-          "key": "1717072902304_442777"
-        }
-      ],
-      "key": "1717072902304_736053"
-    },
-    {
-      "isSubItem": false,
-      "remoteAPI": {
-        "url": "",
-        "executed": false
-      },
-      "icon": "icon-link",
-      "className": "form-link-record",
-      "rules": [],
-      "modelType": "main",
-      "type": "link-record",
-      "hideTitle": false,
-      "name": "主表@表单控件",
-      "options": {
-        "sourceCode": "ai_control_main",
-        "showMode": "single",
-        "showType": "card",
-        "titleField": "wen_ben",
-        "showFields": [],
-        "allowView": true,
-        "allowEdit": true,
-        "allowAdd": true,
-        "allowSelect": true,
-        "buttonText": "添加记录",
-        "twoWayModel": "sub_table_design_1717137038626_791984",
-        "dataSelectAuth": "all",
-        "filters": [
-          {
-            "matchType": "AND",
-            "rules": []
-          }
-        ],
-        "search": {
-          "enabled": false,
-          "field": "",
-          "rule": "like",
-          "afterShow": false,
-          "fields": []
-        },
-        "createMode": {
-          "add": true,
-          "select": false,
-          "params": {
-            "selectLinkModel": ""
-          }
-        },
-        "width": "100%",
-        "defaultValue": "",
-        "defaultValType": "none",
-        "required": false,
-        "disabled": false,
-        "hidden": false,
-        "hiddenOnAdd": false,
-        "fieldNote": ""
-      },
-      "model": "link_record_1717137044235_306956",
-      "advancedSetting": {
-        "defaultValue": {
-          "type": "compose",
-          "value": "",
-          "format": "string",
-          "allowFunc": true,
-          "valueSplit": "",
-          "customConfig": true
-        }
-      },
-      "key": "1717137044235_306956"
-    }
-  ],
-  "config": {
-    "jmReportURL": "",
-    "enableComment": true,
-    "dialogOptions": {
-      "padding": {
-        "top": 25,
-        "left": 25,
-        "bottom": 30,
-        "right": 25
-      },
-      "top": 20,
-      "width": 1000
-    },
-    "allowJmReport": false,
-    "labelWidth": 100,
-    "headerImgUrl": "",
-    "noticeMode": "external",
-    "noticeReceiver": "",
-    "designMobileView": false,
-    "labelPosition": "top",
-    "allowPrint": false,
-    "enableNotice": false,
-    "bizRuleConfig": [],
-    "showHeaderTitle": true,
-    "bigDataMode": false,
-    "titleField": "input_1717072902303_477529",
-    "externalTitle": "",
-    "noticeType": "system",
-    "customRequestURL": [
-      {
-        "url": ""
-      }
-    ],
-    "hasWidgets": [
-      "input",
-      "card",
-      "number",
-      "money",
-      "select",
-      "textarea",
-      "imgupload",
-      "file-upload",
-      "link-record"
-    ],
-    "expand": {
-      "css": "",
-      "js": "",
-      "url": {
-        "css": "",
-        "js": ""
-      }
-    },
-    "size": "small",
-    "disabledAutoGrid": false,
-    "allowExternalLink": false,
-    "externalLinkShowData": false,
-    "transactional": true
-  }
-}

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

@@ -40,11 +40,11 @@
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot3-starter</artifactId>
 		</dependency>
-		<!-- 积木报表 csv excel ES JSON mongodbSQL redis支持包-->
+		<!-- 积木报表 csv excel ES JSON mongodbSQL redis支持包
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-nosql-starter</artifactId>
-		</dependency>
+		</dependency>-->
 		<!-- 后台导出接口Echart图表支持包，按需引入 
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java

@@ -21,6 +21,7 @@ import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.config.sign.annotation.SignatureCheck;
 import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.service.ISysTenantPackService;
@@ -260,6 +261,7 @@ public class SysTenantController {
      * @param id
      * @return
      */
+    @SignatureCheck
     @RequestMapping(value = "/queryById", method = RequestMethod.GET)
     public Result<SysTenant> queryById(@RequestParam(name="id",required=true) String id) {
         Result<SysTenant> result = new Result<SysTenant>();
@@ -507,26 +509,26 @@ public class SysTenantController {
         return result;
     }
 
-    /**
-     * 加入租户通过门牌号【低代码应用专用接口】
-     * @param sysTenant
-     */
-    @PostMapping("/joinTenantByHouseNumber")
-    public Result<Integer> joinTenantByHouseNumber(@RequestBody SysTenant sysTenant){
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        Integer tenantId = sysTenantService.joinTenantByHouseNumber(sysTenant, sysUser.getId());
-        Result<Integer> result = new Result<>();
-        if(tenantId != 0){
-            result.setMessage("申请加入组织成功");
-            result.setSuccess(true);
-            result.setResult(tenantId);
-            return result;
-        }else{
-            result.setMessage("该门牌号不存在");
-            result.setSuccess(false);
-            return result;
-        }
-    }
+//    /**
+//     * 加入租户通过门牌号【低代码应用专用接口】
+//     * @param sysTenant
+//     */
+//    @PostMapping("/joinTenantByHouseNumber")
+//    public Result<Integer> joinTenantByHouseNumber(@RequestBody SysTenant sysTenant){
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        Integer tenantId = sysTenantService.joinTenantByHouseNumber(sysTenant, sysUser.getId());
+//        Result<Integer> result = new Result<>();
+//        if(tenantId != 0){
+//            result.setMessage("申请加入组织成功");
+//            result.setSuccess(true);
+//            result.setResult(tenantId);
+//            return result;
+//        }else{
+//            result.setMessage("该门牌号不存在");
+//            result.setSuccess(false);
+//            return result;
+//        }
+//    }
     
     /**
      * 分页获取租户用户数据(vue3用户租户页面)【低代码应用专用接口】
@@ -713,6 +715,7 @@ public class SysTenantController {
      * @return
      */
     @PostMapping("/invitationUser")
+    @RequiresPermissions("system:tenant:invitation:user")
     public Result<String> invitationUser(@RequestParam(name="phone") String phone,
                                          @RequestParam(name="departId",defaultValue = "") String departId){
         return sysTenantService.invitationUser(phone,departId);
@@ -911,43 +914,43 @@ public class SysTenantController {
         return Result.ok(pageList);
     }
 
-    /**
-     * 同意或拒绝加入租户
-     */
-    @PutMapping("/agreeOrRefuseJoinTenant")
-    public Result<String> agreeOrRefuseJoinTenant(@RequestParam("tenantId") Integer tenantId, 
-                                                  @RequestParam("status") String status){
-        //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String userId = sysUser.getId();
-        SysTenant tenant = sysTenantService.getById(tenantId);
-        if(null == tenant){
-            return Result.error("不存在该组织");
-        }
-        SysUserTenant sysUserTenant = relationService.getUserTenantByTenantId(userId, tenantId);
-        if (null == sysUserTenant) {
-            return Result.error("该用户不存在该组织中，无权修改");
-        }
-        String content = "";
-        SysUser user = new SysUser();
-        user.setUsername(sysUserTenant.getCreateBy());
-        String realname = oConvertUtils.getString(sysUser.getRealname(),sysUser.getUsername());
-        //成功加入
-        if(CommonConstant.USER_TENANT_NORMAL.equals(status)){
-            //修改租户状态
-            relationService.agreeJoinTenant(userId,tenantId);
-            content = content + realname + "已同意您发送的加入 " + tenant.getName() + " 的邀请";
-            sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content);
-            return Result.OK("您已同意该组织的邀请");
-        }else if(CommonConstant.USER_TENANT_REFUSE.equals(status)){
-            //直接删除关系表即可
-            relationService.refuseJoinTenant(userId,tenantId);
-            content = content + realname + "拒绝了您发送的加入 " + tenant.getName() + " 的邀请";
-            sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content);
-            return Result.OK("您已成功拒绝该组织的邀请");
-        }
-        return Result.error("类型不匹配，禁止修改数据");
-    }
+//    /**
+//     * 同意或拒绝加入租户
+//     */
+//    @PutMapping("/agreeOrRefuseJoinTenant")
+//    public Result<String> agreeOrRefuseJoinTenant(@RequestParam("tenantId") Integer tenantId, 
+//                                                  @RequestParam("status") String status){
+//        //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        String userId = sysUser.getId();
+//        SysTenant tenant = sysTenantService.getById(tenantId);
+//        if(null == tenant){
+//            return Result.error("不存在该组织");
+//        }
+//        SysUserTenant sysUserTenant = relationService.getUserTenantByTenantId(userId, tenantId);
+//        if (null == sysUserTenant) {
+//            return Result.error("该用户不存在该组织中，无权修改");
+//        }
+//        String content = "";
+//        SysUser user = new SysUser();
+//        user.setUsername(sysUserTenant.getCreateBy());
+//        String realname = oConvertUtils.getString(sysUser.getRealname(),sysUser.getUsername());
+//        //成功加入
+//        if(CommonConstant.USER_TENANT_NORMAL.equals(status)){
+//            //修改租户状态
+//            relationService.agreeJoinTenant(userId,tenantId);
+//            content = content + realname + "已同意您发送的加入 " + tenant.getName() + " 的邀请";
+//            sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content);
+//            return Result.OK("您已同意该组织的邀请");
+//        }else if(CommonConstant.USER_TENANT_REFUSE.equals(status)){
+//            //直接删除关系表即可
+//            relationService.refuseJoinTenant(userId,tenantId);
+//            content = content + realname + "拒绝了您发送的加入 " + tenant.getName() + " 的邀请";
+//            sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content);
+//            return Result.OK("您已成功拒绝该组织的邀请");
+//        }
+//        return Result.error("类型不匹配，禁止修改数据");
+//    }
     
     /**
      * 目前只给敲敲云租户下删除用户使用

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -225,6 +225,42 @@ public class SysUserController {
 		return result;
 	}
 
+    /**
+     * 添加用户【后台租户模式专用，敲敲云不要用这个】
+     *
+     * @param jsonObject
+     * @return
+     */
+    @RequiresPermissions("system:user:addTenantUser")
+    @RequestMapping(value = "/addTenantUser", method = RequestMethod.POST)
+    public Result<SysUser> addTenantUser(@RequestBody JSONObject jsonObject) {
+        Result<SysUser> result = new Result<SysUser>();
+        String selectedRoles = jsonObject.getString("selectedroles");
+        String selectedDeparts = jsonObject.getString("selecteddeparts");
+        try {
+            SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+            user.setCreateTime(new Date());//设置创建时间
+            String salt = oConvertUtils.randomGen(8);
+            user.setSalt(salt);
+            String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
+            user.setPassword(passwordEncode);
+            user.setStatus(1);
+            user.setDelFlag(CommonConstant.DEL_FLAG_0);
+            //用户表字段org_code不能在这里设置他的值
+            user.setOrgCode(null);
+            // 保存用户走一个service 保证事务
+            //获取租户ids
+            String relTenantIds = jsonObject.getString("relTenantIds");
+            sysUserService.saveUser(user, selectedRoles, selectedDeparts, relTenantIds, true);
+            baseCommonService.addLog("添加用户，username： " + user.getUsername(), CommonConstant.LOG_TYPE_2, 2);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
 	/**
 	 * 删除用户
 	 */

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java

@@ -1,9 +1,11 @@
 package org.jeecg.modules.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -20,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,6 +49,7 @@ public class SysUserOnlineController {
     @Resource
     private BaseCommonService baseCommonService;
 
+    @RequiresPermissions("system:online:list")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Result<Page<SysUserOnlineVO>> list(@RequestParam(name="username", required=false) String username,
                                               @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
@@ -100,6 +102,7 @@ public class SysUserOnlineController {
     /**
      * 强退用户
      */
+    @RequiresPermissions("system:online:forceLogout")
     @RequestMapping(value = "/forceLogout",method = RequestMethod.POST)
     public Result<Object> forceLogout(@RequestBody SysUserOnlineVO online) {
         //用户退出逻辑

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -74,17 +74,17 @@
 	<update id="updateUserDepart">
 		UPDATE sys_user SET
 		<if test="orgCode!=null and loginTenantId!=null">
-			 org_code = #{orgCode}
-			,login_tenant_id = #{loginTenantId}
+			 org_code = #{orgCode, jdbcType=VARCHAR}
+			,login_tenant_id = #{loginTenantId, jdbcType=VARCHAR}
 		</if>
 		<if test="orgCode==null and loginTenantId!=null">
-			login_tenant_id = #{loginTenantId}
+			login_tenant_id = #{loginTenantId, jdbcType=VARCHAR}
 		</if>
 		<if test="orgCode!=null and loginTenantId==null">
-			org_code = #{orgCode}
+			org_code = #{orgCode, jdbcType=VARCHAR}
 		</if>
 		<if test="orgCode==null and loginTenantId==null">
-			org_code = #{orgCode}
+			org_code = #{orgCode, jdbcType=VARCHAR}
 		</if>
 		where username = #{username}
 	</update>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -371,11 +371,19 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         if (isCustomDataSource) {
             DynamicDataSourceContextHolder.push(dataSource);
         }
-		List<DictModel> restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues);
-		// 清理自定义的数据源
-		if (isCustomDataSource) {
-			DynamicDataSourceContextHolder.clear();
+		//update-begin---author:jarysun ---date:20251020  for：[issues/#9002]解决表字典查询出现异常之后，数据源不能恢复问题------------
+		List<DictModel> restData = null;
+
+		try {
+			restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues);
+		} finally {
+			// 清理自定义的数据源
+			if (isCustomDataSource) {
+				DynamicDataSourceContextHolder.clear();
+			}
 		}
+		//update-end---author:jarysun ---date:20251020  for：[issues/#9002]解决表字典查询出现异常之后，数据源不能恢复问题------------
+
 		return restData;
 	}
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
 <#assign list_need_category=false>
 <#assign list_need_pca=false>
@@ -33,7 +33,7 @@
           <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
           <j-upload-button type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
    <#if buttonList?size gt 0>
-    <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+    <#list buttonList as btn>
        <#if btn.buttonStyle == 'button'>
          <a-button type="primary" @click="handle${btn.buttonCode?cap_first}" <#if btn.buttonIcon??> preIcon="ant-design:${btn.buttonIcon}" </#if>>${btn.buttonName}</a-button>
        </#if>
@@ -303,7 +303,7 @@
            ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
          }
  <#if buttonList?size gt 0>
-     <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+     <#list buttonList as btn>
         <#if btn.buttonStyle == 'link'>
         ,{
            label: '${btn.buttonName}',
@@ -339,7 +339,7 @@
            auth: '${entityPackage}:${tableName}:delete'
          }
       <#if buttonList?size gt 0>
-         <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+         <#list buttonList as btn>
           <#if btn.buttonStyle == 'link'>
           ,{
              label: '${btn.buttonName}',
@@ -378,7 +378,7 @@
   </#if>
 
 <#if buttonList?size gt 0>
-  <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+  <#list buttonList as btn>
   <#if btn.buttonStyle=='button'>
      function handle${btn.buttonCode?cap_first}(){
         createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!');

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei

@@ -108,7 +108,7 @@
     };
 
 <#if buttonList?size gt 0>
-  <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+  <#list buttonList as btn>
       <#if btn.buttonStyle=='form'>
          function handle${btn.buttonCode?cap_first}(){
             createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!');

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei

@@ -1,4 +1,4 @@
-<#include "/common/utils.ftl">
+<#include "/common/utils.ftl">
 <template>
   <div class="p-2">
 <#assign query_field_no=0>  
@@ -110,7 +110,7 @@
         <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
  <#if buttonList?size gt 0>
-    <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+    <#list buttonList as btn>
        <#if btn.buttonStyle == 'button'>
          <a-button type="primary" @click="handle${btn.buttonCode?cap_first}" <#if btn.buttonIcon??> preIcon="ant-design:${btn.buttonIcon}" </#if>>${btn.buttonName}</a-button>
        </#if>
@@ -368,7 +368,7 @@
           ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
         }
  <#if buttonList?size gt 0>
-     <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+     <#list buttonList as btn>
         <#if btn.buttonStyle == 'link'>
         ,{
            label: '${btn.buttonName}',
@@ -404,7 +404,7 @@
         auth: '${entityPackage}:${tableName}:delete'
       }
 <#if buttonList?size gt 0>
-   <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+   <#list buttonList as btn>
       <#if btn.buttonStyle == 'link'>
       ,{
          label: '${btn.buttonName}',
@@ -484,7 +484,7 @@
   </#if>
 
 <#if buttonList?size gt 0>
-  <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+  <#list buttonList as btn>
   <#if btn.buttonStyle=='button'>
      function handle${btn.buttonCode?cap_first}(){
         createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!');

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei

@@ -78,7 +78,7 @@
     visible.value = false;
   }
 <#if buttonList?size gt 0>
-  <#list buttonList?filter(it -> it.orderNum?? && it.orderNum != null)?sort_by("orderNum") as btn>
+  <#list buttonList as btn>
       <#if btn.buttonStyle=='form'>
          function handle${btn.buttonCode?cap_first}(){
             createMessage.info('点击了${btn.buttonName}按钮，对应的业务逻辑需自行实现!');