mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-30 16:45:32 +08:00
【制作独立jeecg-ai】删除微服务模块，简化使用
This commit is contained in:
JEECG
@ -199,15 +199,3 @@
|
|||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
|
|
||||||
In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
|
|
||||||
|
|
||||||
JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京，地址：中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱：jeecgos@163.com
|
|
||||||
本软件受适用的国家软件著作权法（包括国际条约）和开源协议 双重保护许可。
|
|
||||||
|
|
||||||
开源协议中文释意如下：
|
|
||||||
1.JeecgBoot开源版本无任何限制，在遵循本开源协议条款下，允许商用使用，不会造成侵权行为。
|
|
||||||
2.允许基于本平台软件开展业务系统开发。
|
|
||||||
3.在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件。
|
|
||||||
|
|
||||||
最终解释权归：http://www.jeecg.com
|
|
||||||
@ -1,254 +0,0 @@
|
|||||||
|
|
||||||
JeecgBoot 低代码开发平台
|
|
||||||
===============
|
|
||||||
|
|
||||||
当前最新版本： 3.9.0（发布日期：2025-12-01）
|
|
||||||
|
|
||||||
|
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
|
|
||||||
[](http://jeecg.com/aboutusIndex)
|
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
项目介绍
|
|
||||||
-----------------------------------
|
|
||||||
|
|
||||||
<h3 align="center">企业级AI低代码平台</h3>
|
|
||||||
|
|
||||||
JeecgBoot 是一款基于BPM流程和代码生成的AI低代码平台，助力企业快速实现低代码开发和构建AI应用。
|
|
||||||
采用前后端分离架构（Ant Design&Vue3，SpringBoot3，SpringCloud Alibaba，Mybatis-plus），强大代码生成器实现前后端一键生成，无需手写代码。
|
|
||||||
平台引领AI低代码开发模式：AI生成→在线编码→代码生成→手工合并，解决Java项目80%重复工作，提升效率，节省成本，兼顾灵活性。
|
|
||||||
具备强大且颗粒化的权限控制，支持按钮权限和数据权限设置，满足大型业务系统需求。功能涵盖在线表单、表单设计、流程设计、门户设计、报表与大屏设计、OA办公、AI应用、AI知识库、大模型管理、AI流程编排、AI聊天，支持ChatGPT、DeepSeek、Ollama等多种AI大模型。
|
|
||||||
|
|
||||||
`AI赋能报表:` 积木报表是一款自主研发的强大开源企业级Web报表与大屏工具。它通过零编码的拖拽式操作，赋能用户如同搭积木般轻松构建各类复杂报表和数据大屏，全面满足企业数据可视化与分析需求，助力企业级数据产品的高效打造与应用。
|
|
||||||
|
|
||||||
`AI赋能低代码:` 提供完善成熟的AI应用平台，涵盖AI应用管理、AI模型管理、智能对话助手、知识库问答、流程编排与设计器、AI建表等多项功能。平台兼容多种主流大模型，包括ChatGPT、DeepSeek、Ollama、智普、千问等，助力企业高效构建智能化应用，推动低代码开发与AI深度融合。
|
|
||||||
|
|
||||||
`JEECG宗旨是:` JEECG旨在通过OnlineCoding平台实现简单功能的零代码快速搭建，同时针对复杂功能采用代码生成器生成代码并手工合并，打造智能且灵活的低代码开发模式，有效解决了当前低代码产品普遍缺乏灵活性的问题，提升开发效率的同时兼顾系统的扩展性和定制化能力。
|
|
||||||
|
|
||||||
`JEECG业务流程:` JEECG业务流程采用BPM工作流引擎实现业务审批，扩展任务接口供开发人员编写业务逻辑，表单提供表单设计器、在线配置表单和编码表单等多种解决方案。通过流程与表单的分离设计（松耦合）及任务节点的灵活配置，既保障了企业流程的安全性与保密性，又大幅降低了开发人员的工作量。
|
|
||||||
|
|
||||||
|
|
||||||
适用项目
|
|
||||||
-----------------------------------
|
|
||||||
JeecgBoot低代码平台兼容所有J2EE项目开发，支持信创国产化，特别适用于SAAS、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）及AI知识库等场景。其半智能手工Merge开发模式，可显著提升70%以上的开发效率，极大降低开发成本。同时，JeecgBoot还是一款全栈式AI开发平台，助力企业快速构建和部署个性化AI应用。。
|
|
||||||
|
|
||||||
|
|
||||||
**信创兼容说明**
|
|
||||||
- 操作系统：国产麒麟、银河麒麟等国产系统几乎都是基于 Linux 内核，因此它们具有良好的兼容性。
|
|
||||||
- 数据库：达梦、人大金仓、TiDB
|
|
||||||
- 中间件：东方通 TongWeb、TongRDS，宝兰德 AppServer、CacheDB, [信创配置文档](https://help.jeecg.com/java/tongweb-deploy/)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#### 项目说明
|
|
||||||
|
|
||||||
| 项目名 | 说明 |
|
|
||||||
|--------------------|------------------------------------|
|
|
||||||
| `jeecg-boot` | 后端源码JAVA（SpringBoot3微服务架构） |
|
|
||||||
| `jeecgboot-vue3` | 前端源码VUE3（vue3+vite6+antd4+ts最新技术栈） |
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
启动项目
|
|
||||||
-----------------------------------
|
|
||||||
|
|
||||||
> 默认账号密码： admin/123456
|
|
||||||
|
|
||||||
- [开发环境搭建](https://help.jeecg.com/java/setup/tools)
|
|
||||||
- [IDEA启动前后端(单体模式)](https://help.jeecg.com/java/setup/idea/startup)
|
|
||||||
- [Docker一键启动(单体模式)](https://help.jeecg.com/java/docker/quick)
|
|
||||||
- [IDEA启动前后端(微服务方式)](https://help.jeecg.com/java/springcloud/switchcloud/monomer)
|
|
||||||
- [Docker一键启动(微服务方式)](https://help.jeecg.com/java/docker/quickcloud)
|
|
||||||
|
|
||||||
|
|
||||||
技术文档
|
|
||||||
-----------------------------------
|
|
||||||
|
|
||||||
- 官方网站： [http://www.jeecg.com](http://www.jeecg.com)
|
|
||||||
- 在线演示： [平台演示](https://boot3.jeecg.com) | [APP演示](https://jeecg.com/appIndex)
|
|
||||||
- 入门指南： [快速入门](http://www.jeecg.com/doc/quickstart) | [代码生成使用](https://help.jeecg.com/java/codegen/online) | [开发文档](https://help.jeecg.com) | [AI应用手册](https://help.jeecg.com/aigc) | [视频教程](http://jeecg.com/doc/video)
|
|
||||||
- 技术支持： [反馈问题](https://github.com/jeecgboot/JeecgBoot/issues/new?template=bug_report.md) | [低代码体验一分钟](https://jeecg.blog.csdn.net/article/details/106079007)
|
|
||||||
- QQ交流群 ： 964611995、⑩716488839(满)、⑨808791225(满)、其他(满)
|
|
||||||
|
|
||||||
|
|
||||||
AI 应用平台介绍
|
|
||||||
-----------------------------------
|
|
||||||
|
|
||||||
一个全栈式 AI 开发平台，旨在帮助开发者快速构建和部署个性化的 AI 应用。
|
|
||||||
|
|
||||||
JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类似`Dify`的`AIGC应用开发平台`+`知识库问答`，是一款基于LLM大语言模型AI应用平台和 RAG 的知识库问答系统。
|
|
||||||
其直观的界面结合了 AI 流程编排、RAG 管道、知识库管理、模型管理、对接向量库、实时运行可观察等，让您可以快速从原型到生产，拥有AI服务能力。
|
|
||||||
|
|
||||||
- [详细专题介绍，请点击查看](README-AI.md)
|
|
||||||
|
|
||||||
- AI视频介绍
|
|
||||||
|
|
||||||
[](https://www.bilibili.com/video/BV1zmd7YFE4w)
|
|
||||||
|
|
||||||
|
|
||||||
为什么选择JeecgBoot?
|
|
||||||
-----------------------------------
|
|
||||||
- 1.采用最新主流前后分离框架（Spring Boot3 + MyBatis + Shiro/SpringAuthorizationServer + Ant Design4 + Vue3），容易上手；代码生成器依赖性低，灵活的扩展能力，可快速实现二次开发。
|
|
||||||
- 2.前端大版本换代，最新版采用 Vue3.0 + TypeScript + Vite6 + Ant Design Vue4 等新技术方案。
|
|
||||||
- 3.支持微服务Spring Cloud Alibaba（Nacos、Gateway、Sentinel、Skywalking），提供简易机制，支持单体和微服务自由切换（这样可以满足各类项目需求）。
|
|
||||||
- 4.开发效率高，支持在线建表和AI建表，提供强大代码生成器，单表、树列表、一对多、一对一等数据模型，增删改查功能一键生成，菜单配置直接使用。
|
|
||||||
- 5.代码生成器提供强大模板机制，支持自定义模板，目前提供四套风格模板（单表两套、树模型一套、一对多三套）。
|
|
||||||
- 6.提供强大的报表和大屏可视化工具，支持丰富的数据源连接，能够通过拖拉拽方式快速制作报表、大屏和门户设计；支持多种图表类型：柱形图、折线图、散点图、饼图、环形图、面积图、漏斗图、进度图、仪表盘、雷达图、地图等。
|
|
||||||
- 7.低代码能力：在线表单（无需编码，通过在线配置表单，实现表单的增删改查，支持单表、树、一对多、一对一等模型，实现人人皆可编码），在线配置零代码开发、所见即所得支持23种类控件。
|
|
||||||
- 8.低代码能力：在线报表、在线图表（无需编码，通过在线配置方式，实现数据报表和图形报表，可以快速抽取数据，减轻开发压力，实现人人皆可编码）。
|
|
||||||
- 9.Online支持在线增强开发，提供在线代码编辑器，支持代码高亮、代码提示等功能，支持多种语言（Java、SQL、JavaScript等）。
|
|
||||||
- 10.封装完善的用户、角色、菜单、组织机构、数据字典、在线定时任务等基础功能，支持访问授权、按钮权限、数据权限等功能。
|
|
||||||
- 11.前端UI提供丰富的组件库，支持各种常用组件，如表格、树形控件、下拉框、日期选择器等，满足各种复杂的业务需求 [UI组件库文档](https://help.jeecg.com/category/ui%E7%BB%84%E4%BB%B6%E5%BA%93)。
|
|
||||||
- 12.提供APP配套框架，一份多代码多终端适配，一份代码多终端适配，小程序、H5、安卓、iOS、鸿蒙Next。
|
|
||||||
- 13.新版APP框架采用Uniapp、Vue3.0、Vite、Wot-design-uni、TypeScript等最新技术栈，包括二次封装组件、路由拦截、请求拦截等功能。实现了与JeecgBoot完美对接：目前已经实现登录、用户信息、通讯录、公告、移动首页、九宫格、聊天、Online表单、仪表盘等功能，提供了丰富的组件。
|
|
||||||
- 14.提供了一套成熟的AI应用平台功能，从AI模型、知识库到AI应用搭建，助力企业快速落地AI服务，加速智能化升级。
|
|
||||||
- 15.AI能力：目前JeecgBoot支持AI大模型chatgpt和deepseek，现在最新版默认使用deepseek，速度更快质量更高。目前提供了AI对话助手、AI知识库、AI应用、AI建表、AI报表等功能。
|
|
||||||
- 16.提供新行编辑表格JVXETable，轻松满足各种复杂ERP布局，拥有更高的性能、更灵活的扩展、更强大的功能。
|
|
||||||
- 17.平台首页风格，提供多种组合模式，支持自定义风格；支持门户设计，支持自定义首页。
|
|
||||||
- 18.常用共通封装，各种工具类（定时任务、短信接口、邮件发送、Excel导入导出等），基本满足80%项目需求。
|
|
||||||
- 19.简易Excel导入导出，支持单表导出和一对多表模式导出，生成的代码自带导入导出功能。
|
|
||||||
- 20.集成智能报表工具，报表打印、图像报表和数据导出非常方便，可极其方便地生成PDF、Excel、Word等报表。
|
|
||||||
- 21.采用前后分离技术，页面UI风格精美，针对常用组件做了封装：时间、行表格控件、截取显示控件、报表组件、编辑器等。
|
|
||||||
- 22.查询过滤器：查询功能自动生成，后台动态拼SQL追加查询条件；支持多种匹配方式（全匹配/模糊查询/包含查询/不匹配查询）。
|
|
||||||
- 23.数据权限（精细化数据权限控制，控制到行级、列表级、表单字段级，实现不同人看不同数据，不同人对同一个页面操作不同字段）。
|
|
||||||
- 24.接口安全机制，可细化控制接口授权，非常简便实现不同客户端只看自己数据等控制；也提供了基于AK和SK认证鉴权的OpenAPI功能。
|
|
||||||
- 25.活跃的社区支持；近年来，随着网络威胁的日益增加，团队在安全和漏洞管理方面积累了丰富的经验，能够为企业提供全面的安全解决方案。
|
|
||||||
- 26.权限控制采用RBAC（Role-Based Access Control，基于角色的访问控制）。
|
|
||||||
- 27.页面校验自动生成（必须输入、数字校验、金额校验、时间空间等）。
|
|
||||||
- 28.支持SaaS服务模式，提供SaaS多租户架构方案。
|
|
||||||
- 29.分布式文件服务，集成MinIO、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
|
|
||||||
- 30.主流数据库兼容，一套代码完全兼容MySQL、PostgreSQL、Oracle、SQL Server、MariaDB、达梦、人大金仓等主流数据库。
|
|
||||||
- 31.集成工作流Flowable，并实现了只需在页面配置流程转向，可极大简化BPM工作流的开发；用BPM的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的Java代码。
|
|
||||||
- 32.低代码能力：在线流程设计，采用开源Flowable流程引擎，实现在线画流程、自定义表单、表单挂靠、业务流转。
|
|
||||||
- 33.多数据源：极其简易的使用方式，在线配置数据源配置，便捷地从其他数据抓取数据。
|
|
||||||
- 34.提供单点登录CAS集成方案，项目中已经提供完善的对接代码。
|
|
||||||
- 35.低代码能力：表单设计器，支持用户自定义表单布局，支持单表、一对多表单，支持select、radio、checkbox、textarea、date、popup、列表、宏等控件。
|
|
||||||
- 36.专业接口对接机制，统一采用RESTful接口方式，集成Swagger-UI在线接口文档，JWT token安全验证，方便客户端对接。
|
|
||||||
- 37.高级组合查询功能，在线配置支持主子表关联查询，可保存查询历史。
|
|
||||||
- 38.提供各种系统监控，实时跟踪系统运行情况（监控Redis、Tomcat、JVM、服务器信息、请求追踪、SQL监控）。
|
|
||||||
- 39.消息中心（支持短信、邮件、微信推送等）；集成WebSocket消息通知机制。
|
|
||||||
- 40.支持多语言，提供国际化方案。
|
|
||||||
- 41.数据变更记录日志，可记录数据每次变更内容，通过版本对比功能查看历史变化。
|
|
||||||
- 42.提供简单易用的打印插件，支持谷歌、火狐、IE11+等各种浏览器。
|
|
||||||
- 43.后端采用Maven分模块开发方式；前端支持菜单动态路由。
|
|
||||||
- 44.提供丰富的示例代码，涵盖了常用的业务场景，便于学习和参考。
|
|
||||||
|
|
||||||
|
|
||||||
技术架构：
|
|
||||||
-----------------------------------
|
|
||||||
|
|
||||||
#### 后端
|
|
||||||
|
|
||||||
- IDE建议： IDEA (必须安装lombok插件 )
|
|
||||||
- 语言：Java 默认jdk17(jdk21、jdk24)
|
|
||||||
- 依赖管理：Maven
|
|
||||||
- 基础框架：Spring Boot 3.5.5
|
|
||||||
- 微服务框架： Spring Cloud Alibaba 2023.0.3.3
|
|
||||||
- 持久层框架：MybatisPlus 3.5.12
|
|
||||||
- 报表工具： JimuReport 2.1.3
|
|
||||||
- 安全框架：Apache Shiro 2.0.4，Jwt 4.5.0
|
|
||||||
- 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
|
|
||||||
- 数据库连接池：阿里巴巴Druid 1.2.24
|
|
||||||
- AI大模型：支持 `ChatGPT` `DeepSeek` `千问`等各种常规模式
|
|
||||||
- 日志打印：logback
|
|
||||||
- 缓存：Redis
|
|
||||||
- 其他：autopoi, fastjson，poi，Swagger-ui，quartz, lombok（简化代码）等。
|
|
||||||
- 默认提供MySQL5.7+数据库脚本
|
|
||||||
- [其他数据库，需要自己转](https://my.oschina.net/jeecg/blog/4905722)
|
|
||||||
|
|
||||||
|
|
||||||
#### 前端
|
|
||||||
|
|
||||||
- 前端环境要求：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、动态菜单、权限校验、按钮级别权限控制等功能
|
|
||||||
- 最新技术栈：Vue3.0 + TypeScript + Vite6 + ant-design-vue4 + pinia + echarts + unocss + vxe-table + qiankun + es6
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#### 支持库
|
|
||||||
|
|
||||||
| 数据库 | 支持 |
|
|
||||||
| --- | --- |
|
|
||||||
| MySQL | √ |
|
|
||||||
| Oracle11g | √ |
|
|
||||||
| Sqlserver2017 | √ |
|
|
||||||
| PostgreSQL | √ |
|
|
||||||
| MariaDB | √ |
|
|
||||||
| 达梦 | √ |
|
|
||||||
| 人大金仓 | √ |
|
|
||||||
| TiDB | √ |
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 微服务解决方案
|
|
||||||
|
|
||||||
|
|
||||||
- 1、服务注册和发现 Nacos √
|
|
||||||
- 2、统一配置中心 Nacos √
|
|
||||||
- 3、路由网关 gateway(三种加载方式) √
|
|
||||||
- 4、分布式 http feign √
|
|
||||||
- 5、熔断降级限流 Sentinel √
|
|
||||||
- 6、分布式文件 Minio、阿里OSS √
|
|
||||||
- 7、统一权限控制 JWT + Shiro √
|
|
||||||
- 8、服务监控 SpringBootAdmin√
|
|
||||||
- 9、链路跟踪 Skywalking [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking)
|
|
||||||
- 10、消息中间件 RabbitMQ √
|
|
||||||
- 11、分布式任务 xxl-job √
|
|
||||||
- 12、分布式事务 Seata
|
|
||||||
- 13、轻量分布式日志 Loki+grafana套件
|
|
||||||
- 14、支持 docker-compose、k8s、jenkins
|
|
||||||
- 15、CAS 单点登录 √
|
|
||||||
- 16、路由限流 √
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
后台目录结构
|
|
||||||
-----------------------------------
|
|
||||||
```
|
|
||||||
项目结构
|
|
||||||
├─jeecg-boot-parent（父POM： 项目依赖、modules组织）
|
|
||||||
│ ├─jeecg-boot-base-core（共通模块： 工具类、config、权限、查询过滤器、注解等）
|
|
||||||
│ ├─jeecg-module-demo 示例代码
|
|
||||||
│ ├─jeecg-module-system System系统管理目录
|
|
||||||
│ │ ├─jeecg-system-biz System系统管理权限等功能
|
|
||||||
│ │ ├─jeecg-system-start System单体启动项目(8080）
|
|
||||||
│ │ ├─jeecg-system-api System系统管理模块对外api
|
|
||||||
│ │ │ ├─jeecg-system-cloud-api System模块对外提供的微服务接口
|
|
||||||
│ │ │ ├─jeecg-system-local-api System模块对外提供的单体接口
|
|
||||||
│ ├─jeecg-server-cloud --微服务模块
|
|
||||||
├─jeecg-cloud-gateway --微服务网关模块(9999)
|
|
||||||
├─jeecg-cloud-nacos --Nacos服务模块(8848)
|
|
||||||
├─jeecg-system-cloud-start --System微服务启动项目(7001)
|
|
||||||
├─jeecg-demo-cloud-start --Demo微服务启动项目(7002)
|
|
||||||
├─jeecg-visual
|
|
||||||
├─jeecg-cloud-monitor --微服务监控模块 (9111)
|
|
||||||
├─jeecg-cloud-xxljob --微服务xxljob定时任务服务端 (9080)
|
|
||||||
├─jeecg-cloud-sentinel --sentinel服务端 (9000)
|
|
||||||
├─jeecg-cloud-test -- 微服务测试示例（各种例子）
|
|
||||||
├─jeecg-cloud-test-more -- 微服务测试示例（feign、熔断降级、xxljob、分布式锁）
|
|
||||||
├─jeecg-cloud-test-rabbitmq -- 微服务测试示例（rabbitmq）
|
|
||||||
├─jeecg-cloud-test-seata -- 微服务测试示例（seata分布式事务）
|
|
||||||
├─jeecg-cloud-test-shardingsphere -- 微服务测试示例（分库分表）
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#### 微服务架构图
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because one or more lines are too long
@ -1,360 +0,0 @@
|
|||||||
#
|
|
||||||
# XXL-JOB v2.4.0
|
|
||||||
# Copyright (c) 2015-present, xuxueli.
|
|
||||||
|
|
||||||
CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_general_ci;
|
|
||||||
use `xxl_job`;
|
|
||||||
|
|
||||||
/*
|
|
||||||
Navicat Premium Data Transfer
|
|
||||||
|
|
||||||
Source Server : mysql5.7
|
|
||||||
Source Server Type : MySQL
|
|
||||||
Source Server Version : 50738 (5.7.38)
|
|
||||||
Source Host : 127.0.0.1:3306
|
|
||||||
Source Schema : xxl_job
|
|
||||||
|
|
||||||
Target Server Type : MySQL
|
|
||||||
Target Server Version : 50738 (5.7.38)
|
|
||||||
File Encoding : 65001
|
|
||||||
|
|
||||||
Date: 10/02/2025 13:49:31
|
|
||||||
*/
|
|
||||||
|
|
||||||
SET NAMES utf8mb4;
|
|
||||||
SET FOREIGN_KEY_CHECKS = 0;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_group
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_group`;
|
|
||||||
CREATE TABLE `xxl_job_group` (
|
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
|
||||||
`app_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '执行器AppName',
|
|
||||||
`title` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '执行器名称',
|
|
||||||
`address_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '执行器地址类型：0=自动注册、1=手动录入',
|
|
||||||
`address_list` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '执行器地址列表，多地址逗号分隔',
|
|
||||||
`update_time` datetime NULL DEFAULT NULL,
|
|
||||||
PRIMARY KEY (`id`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_group
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `xxl_job_group` VALUES (1, 'xxl-job-executor-sample', '示例执行器', 0, NULL, '2025-02-10 13:49:04');
|
|
||||||
INSERT INTO `xxl_job_group` VALUES (2, 'jeecg-demo', '测试Demo模块', 0, NULL, '2025-02-10 13:49:04');
|
|
||||||
INSERT INTO `xxl_job_group` VALUES (3, 'jeecg-system', '系统System模块', 0, NULL, '2025-02-10 13:49:04');
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_info
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_info`;
|
|
||||||
CREATE TABLE `xxl_job_info` (
|
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
|
||||||
`job_group` int(11) NOT NULL COMMENT '执行器主键ID',
|
|
||||||
`job_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
|
||||||
`add_time` datetime NULL DEFAULT NULL,
|
|
||||||
`update_time` datetime NULL DEFAULT NULL,
|
|
||||||
`author` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '作者',
|
|
||||||
`alarm_email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报警邮件',
|
|
||||||
`schedule_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'NONE' COMMENT '调度类型',
|
|
||||||
`schedule_conf` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型',
|
|
||||||
`misfire_strategy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略',
|
|
||||||
`executor_route_strategy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器路由策略',
|
|
||||||
`executor_handler` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务handler',
|
|
||||||
`executor_param` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务参数',
|
|
||||||
`executor_block_strategy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '阻塞处理策略',
|
|
||||||
`executor_timeout` int(11) NOT NULL DEFAULT 0 COMMENT '任务执行超时时间，单位秒',
|
|
||||||
`executor_fail_retry_count` int(11) NOT NULL DEFAULT 0 COMMENT '失败重试次数',
|
|
||||||
`glue_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'GLUE类型',
|
|
||||||
`glue_source` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'GLUE源代码',
|
|
||||||
`glue_remark` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'GLUE备注',
|
|
||||||
`glue_updatetime` datetime NULL DEFAULT NULL COMMENT 'GLUE更新时间',
|
|
||||||
`child_jobid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子任务ID，多个逗号分隔',
|
|
||||||
`trigger_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '调度状态：0-停止，1-运行',
|
|
||||||
`trigger_last_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上次调度时间',
|
|
||||||
`trigger_next_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '下次调度时间',
|
|
||||||
PRIMARY KEY (`id`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_info
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `xxl_job_info` VALUES (1, 1, '测试任务1', '2018-11-03 22:21:31', '2024-08-21 22:30:30', 'XXL', '', 'CRON', '0 0 0 * * ? *', 'DO_NOTHING', 'FIRST', 'demoJob', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '', 1, 1729353600000, 1739203200000);
|
|
||||||
INSERT INTO `xxl_job_info` VALUES (2, 3, '测试jeecg xxljob', '2024-08-21 22:41:10', '2024-08-21 22:41:30', 'JEECG', '', 'CRON', '* * * * * ?', 'DO_NOTHING', 'FIRST', 'demoJob', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2024-08-21 22:41:10', '', 1, 1739166572000, 1739166573000);
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_lock
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_lock`;
|
|
||||||
CREATE TABLE `xxl_job_lock` (
|
|
||||||
`lock_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '锁名称',
|
|
||||||
PRIMARY KEY (`lock_name`) USING BTREE
|
|
||||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_lock
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `xxl_job_lock` VALUES ('schedule_lock');
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_log
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_log`;
|
|
||||||
CREATE TABLE `xxl_job_log` (
|
|
||||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
|
||||||
`job_group` int(11) NOT NULL COMMENT '执行器主键ID',
|
|
||||||
`job_id` int(11) NOT NULL COMMENT '任务，主键ID',
|
|
||||||
`executor_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器地址，本次执行的地址',
|
|
||||||
`executor_handler` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务handler',
|
|
||||||
`executor_param` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务参数',
|
|
||||||
`executor_sharding_param` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2',
|
|
||||||
`executor_fail_retry_count` int(11) NOT NULL DEFAULT 0 COMMENT '失败重试次数',
|
|
||||||
`trigger_time` datetime NULL DEFAULT NULL COMMENT '调度-时间',
|
|
||||||
`trigger_code` int(11) NOT NULL COMMENT '调度-结果',
|
|
||||||
`trigger_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '调度-日志',
|
|
||||||
`handle_time` datetime NULL DEFAULT NULL COMMENT '执行-时间',
|
|
||||||
`handle_code` int(11) NOT NULL COMMENT '执行-状态',
|
|
||||||
`handle_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '执行-日志',
|
|
||||||
`alarm_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败',
|
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
|
||||||
INDEX `I_trigger_time`(`trigger_time`) USING BTREE,
|
|
||||||
INDEX `I_handle_code`(`handle_code`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 6761 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_log
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6618, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:09', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6619, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:10', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6620, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:11', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6621, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:12', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6622, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:13', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6623, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:14', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6624, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:15', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6625, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:16', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6626, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:17', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6627, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:18', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6628, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:19', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6629, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:20', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6630, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:21', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6631, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:22', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6632, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:23', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6633, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:24', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6634, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:25', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6635, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:26', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6636, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:27', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6637, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:28', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6638, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:29', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6639, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:30', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6640, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:31', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6641, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:32', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6642, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:33', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6643, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:34', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6644, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:35', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6645, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:36', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6646, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:37', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6647, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:38', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6648, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:39', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6649, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:40', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6650, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:41', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6651, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:42', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6652, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:43', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6653, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:44', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6654, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:45', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6655, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:46', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6656, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:47', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6657, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:48', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6658, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:49', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6659, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:50', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6660, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:51', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6661, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:52', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6662, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:53', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6663, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:54', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6664, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:55', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6665, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:56', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6666, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:57', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6667, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:58', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6668, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:47:59', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6669, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:00', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6670, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:01', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6671, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:02', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6672, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:03', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6673, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:04', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6674, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:05', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6675, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:06', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6676, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:07', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6677, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:08', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6678, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:09', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6679, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:10', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6680, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:11', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6681, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:12', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6682, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:13', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6683, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:14', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6684, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:15', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6685, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:16', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6686, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:17', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6687, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:18', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6688, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:19', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6689, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:20', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6690, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:21', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6691, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:22', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6692, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:23', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6693, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:24', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6694, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:25', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6695, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:26', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6696, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:27', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6697, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:28', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6698, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:29', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6699, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:30', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6700, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:31', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6701, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:32', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6702, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:33', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6703, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:34', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6704, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:35', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6705, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:36', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6706, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:37', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6707, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:38', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6708, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:39', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6709, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:40', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6710, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:41', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6711, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:42', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6712, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:43', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6713, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:44', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6714, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:45', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6715, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:46', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6716, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:47', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6717, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:48', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6718, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:49', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6719, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:50', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6720, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:51', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6721, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:52', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6722, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:53', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6723, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:54', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6724, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:55', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6725, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:56', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6726, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:57', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6727, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:58', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6728, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:48:59', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6729, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:00', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6730, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:01', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6731, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:02', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6732, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:03', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6733, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:04', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6734, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:05', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6735, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:06', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6736, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:07', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6737, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:08', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6738, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:09', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6739, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:10', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6740, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:11', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6741, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:12', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6742, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:13', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6743, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:14', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6744, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:15', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6745, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:16', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6746, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:17', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6747, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:18', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6748, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:19', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6749, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:20', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6750, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:21', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6751, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:22', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6752, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:23', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6753, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:24', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 2);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6754, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:25', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6755, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:26', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6756, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:27', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6757, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:28', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6758, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:29', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6759, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:30', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
INSERT INTO `xxl_job_log` VALUES (6760, 3, 2, NULL, 'demoJob', '', NULL, 0, '2025-02-10 13:49:31', 500, '任务触发类型：Cron触发<br>调度机器：192.168.1.11<br>执行器-注册方式：自动注册<br>执行器-地址列表：null<br>路由策略：第一个<br>阻塞处理策略：单机串行<br>任务超时时间：0<br>失败重试次数：0<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>触发调度<<<<<<<<<<< </span><br>调度失败：执行器地址为空<br><br>', NULL, 0, NULL, 0);
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_log_report
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_log_report`;
|
|
||||||
CREATE TABLE `xxl_job_log_report` (
|
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
|
||||||
`trigger_day` datetime NULL DEFAULT NULL COMMENT '调度-时间',
|
|
||||||
`running_count` int(11) NOT NULL DEFAULT 0 COMMENT '运行中-日志数量',
|
|
||||||
`suc_count` int(11) NOT NULL DEFAULT 0 COMMENT '执行成功-日志数量',
|
|
||||||
`fail_count` int(11) NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量',
|
|
||||||
`update_time` datetime NULL DEFAULT NULL,
|
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
|
||||||
UNIQUE INDEX `i_trigger_day`(`trigger_day`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_log_report
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (1, '2024-08-21 00:00:00', 70, 0, 5, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (2, '2024-08-20 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (3, '2024-08-19 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (4, '2024-09-10 00:00:00', 0, 0, 56, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (5, '2024-09-09 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (6, '2024-09-08 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (7, '2024-10-19 00:00:00', 0, 0, 6391, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (8, '2024-10-18 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (9, '2024-10-17 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (10, '2025-02-10 00:00:00', 0, 0, 116, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (11, '2025-02-09 00:00:00', 0, 0, 0, NULL);
|
|
||||||
INSERT INTO `xxl_job_log_report` VALUES (12, '2025-02-08 00:00:00', 0, 0, 0, NULL);
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_logglue
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_logglue`;
|
|
||||||
CREATE TABLE `xxl_job_logglue` (
|
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
|
||||||
`job_id` int(11) NOT NULL COMMENT '任务，主键ID',
|
|
||||||
`glue_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'GLUE类型',
|
|
||||||
`glue_source` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'GLUE源代码',
|
|
||||||
`glue_remark` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'GLUE备注',
|
|
||||||
`add_time` datetime NULL DEFAULT NULL,
|
|
||||||
`update_time` datetime NULL DEFAULT NULL,
|
|
||||||
PRIMARY KEY (`id`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_logglue
|
|
||||||
-- ----------------------------
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_registry
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_registry`;
|
|
||||||
CREATE TABLE `xxl_job_registry` (
|
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
|
||||||
`registry_group` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
|
||||||
`registry_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
|
||||||
`registry_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
|
||||||
`update_time` datetime NULL DEFAULT NULL,
|
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
|
||||||
INDEX `i_g_k_v`(`registry_group`, `registry_key`, `registry_value`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_registry
|
|
||||||
-- ----------------------------
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Table structure for xxl_job_user
|
|
||||||
-- ----------------------------
|
|
||||||
DROP TABLE IF EXISTS `xxl_job_user`;
|
|
||||||
CREATE TABLE `xxl_job_user` (
|
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
|
||||||
`username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '账号',
|
|
||||||
`password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '密码',
|
|
||||||
`role` tinyint(4) NOT NULL COMMENT '角色：0-普通用户、1-管理员',
|
|
||||||
`permission` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割',
|
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
|
||||||
UNIQUE INDEX `i_username`(`username`) USING BTREE
|
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of xxl_job_user
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `xxl_job_user` VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL);
|
|
||||||
|
|
||||||
SET FOREIGN_KEY_CHECKS = 1;
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
# 版本升级方法
|
|
||||||
|
|
||||||
> JeecgBoot属于平台级产品，每次升级改动较大，目前做不到平滑升级。
|
|
||||||
|
|
||||||
### 增量升级方案
|
|
||||||
|
|
||||||
#### 1.代码合并
|
|
||||||
本地通过svn或git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比合并代码；
|
|
||||||
|
|
||||||
#### 2.数据库升级
|
|
||||||
- 从3.6.2+版本增加flyway自动升级数据库机制，支持 mysql5.7、mysql8;
|
|
||||||
- 其他库请手工执行SQL, 目录： `jeecg-module-system\jeecg-system-start\src\main\resources\flyway\sql\mysql`
|
|
||||||
> 注意： 升级sql只提供mysql版本；如果有权限升级, 还需要手工角色授权，退出重新登录才好使。
|
|
||||||
|
|
||||||
#### 3.其他数据库脚本说明
|
|
||||||
原先官方默认提供oracle和SqlServer的脚本，但是维护成本太高，未提供脚本的数据库，可以参考下面的文档自己转
|
|
||||||
https://my.oschina.net/jeecg/blog/4905722
|
|
||||||
（注意：定时任务的表qrtz_*，需要删掉用原始的脚本重新执行一下）
|
|
||||||
quartz-2.2.3-distribution.tar.gz放到百度网盘中，大家自己下载，执行所需数据库脚本
|
|
||||||
https://pan.baidu.com/s/1WrmZdUuAPg3iBwJ-LoHWyg?pwd=8mdz
|
|
||||||
|
|
||||||
#### 4.兼容问题
|
|
||||||
每次发版，会针对不兼容地方重点说明。
|
|
||||||
@ -1,122 +0,0 @@
|
|||||||
version: '2'
|
|
||||||
services:
|
|
||||||
jeecg-boot-mysql:
|
|
||||||
build:
|
|
||||||
context: ../db
|
|
||||||
environment:
|
|
||||||
MYSQL_ROOT_PASSWORD: root
|
|
||||||
MYSQL_ROOT_HOST: '%'
|
|
||||||
TZ: Asia/Shanghai
|
|
||||||
restart: always
|
|
||||||
container_name: jeecg-boot-mysql
|
|
||||||
command:
|
|
||||||
--character-set-server=utf8mb4
|
|
||||||
--collation-server=utf8mb4_general_ci
|
|
||||||
--explicit_defaults_for_timestamp=true
|
|
||||||
--lower_case_table_names=1
|
|
||||||
--max_allowed_packet=128M
|
|
||||||
--default-authentication-plugin=caching_sha2_password
|
|
||||||
ports:
|
|
||||||
- 3306:3306
|
|
||||||
networks:
|
|
||||||
- jeecg-boot
|
|
||||||
|
|
||||||
jeecg-boot-redis:
|
|
||||||
image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
restart: always
|
|
||||||
container_name: jeecg-boot-redis
|
|
||||||
hostname: jeecg-boot-redis
|
|
||||||
networks:
|
|
||||||
- jeecg-boot
|
|
||||||
|
|
||||||
# jeecg-boot-rabbitmq:
|
|
||||||
# image: rabbitmq:3.7.7-management
|
|
||||||
# ports:
|
|
||||||
# - 5672:5672
|
|
||||||
# - 15672:15672
|
|
||||||
# restart: always
|
|
||||||
# container_name: jeecg-boot-rabbitmq
|
|
||||||
# hostname: jeecg-boot-rabbitmq
|
|
||||||
# environment:
|
|
||||||
# RABBITMQ_DEFAULT_USER: guest
|
|
||||||
# RABBITMQ_DEFAULT_PASS: guest
|
|
||||||
|
|
||||||
|
|
||||||
jeecg-boot-nacos:
|
|
||||||
restart: always
|
|
||||||
build:
|
|
||||||
context: ./jeecg-cloud-nacos
|
|
||||||
ports:
|
|
||||||
- 8848:8848
|
|
||||||
container_name: jeecg-boot-nacos
|
|
||||||
hostname: jeecg-boot-nacos
|
|
||||||
networks:
|
|
||||||
- jeecg-boot
|
|
||||||
|
|
||||||
jeecg-boot-system:
|
|
||||||
depends_on:
|
|
||||||
- jeecg-boot-nacos
|
|
||||||
build:
|
|
||||||
context: ./jeecg-system-cloud-start
|
|
||||||
container_name: jeecg-system-start
|
|
||||||
hostname: jeecg-boot-system
|
|
||||||
restart: on-failure
|
|
||||||
environment:
|
|
||||||
- TZ=Asia/Shanghai
|
|
||||||
networks:
|
|
||||||
- jeecg-boot
|
|
||||||
|
|
||||||
jeecg-boot-demo:
|
|
||||||
depends_on:
|
|
||||||
- jeecg-boot-nacos
|
|
||||||
build:
|
|
||||||
context: ./jeecg-demo-cloud-start
|
|
||||||
container_name: jeecg-demo-start
|
|
||||||
hostname: jeecg-boot-demo
|
|
||||||
restart: on-failure
|
|
||||||
environment:
|
|
||||||
- TZ=Asia/Shanghai
|
|
||||||
networks:
|
|
||||||
- jeecg-boot
|
|
||||||
|
|
||||||
jeecg-boot-gateway:
|
|
||||||
restart: on-failure
|
|
||||||
build:
|
|
||||||
context: ./jeecg-cloud-gateway
|
|
||||||
ports:
|
|
||||||
- 9999:9999
|
|
||||||
depends_on:
|
|
||||||
- jeecg-boot-nacos
|
|
||||||
- jeecg-boot-system
|
|
||||||
container_name: jeecg-boot-gateway
|
|
||||||
hostname: jeecg-boot-gateway
|
|
||||||
networks:
|
|
||||||
- jeecg-boot
|
|
||||||
|
|
||||||
networks:
|
|
||||||
jeecg-boot:
|
|
||||||
name: jeecg_boot
|
|
||||||
|
|
||||||
# jeecg-boot-sentinel:
|
|
||||||
# restart: on-failure
|
|
||||||
# build:
|
|
||||||
# context: ./jeecg-visual/jeecg-cloud-sentinel
|
|
||||||
# ports:
|
|
||||||
# - 9000:9000
|
|
||||||
# depends_on:
|
|
||||||
# - jeecg-boot-nacos
|
|
||||||
# - jeecg-boot-demo
|
|
||||||
# - jeecg-boot-system
|
|
||||||
# - jeecg-boot-gateway
|
|
||||||
# container_name: jeecg-boot-sentinel
|
|
||||||
# hostname: jeecg-boot-sentinel
|
|
||||||
#
|
|
||||||
# jeecg-boot-xxljob:
|
|
||||||
# build:
|
|
||||||
# context: ./jeecg-visual/jeecg-cloud-xxljob
|
|
||||||
# ports:
|
|
||||||
# - 9080:9080
|
|
||||||
# container_name: jeecg-boot-xxljob
|
|
||||||
# hostname: jeecg-boot-xxljob
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
|
|
||||||
|
|
||||||
MAINTAINER jeecgos@163.com
|
|
||||||
|
|
||||||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
|
|
||||||
|
|
||||||
RUN mkdir -p /jeecg-cloud-gateway
|
|
||||||
|
|
||||||
WORKDIR /jeecg-cloud-gateway
|
|
||||||
|
|
||||||
EXPOSE 9999
|
|
||||||
|
|
||||||
ADD ./target/jeecg-cloud-gateway-3.9.0.jar ./
|
|
||||||
|
|
||||||
CMD sleep 100;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.9.0.jar
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
http://localhost:9999
|
|
||||||
|
|
||||||
提示：在未启动服务实例情况下，看的接口文档为空
|
|
||||||
@ -1,95 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>jeecg-server-cloud</artifactId>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jeecg-cloud-gateway</artifactId>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!-- jeecg 微服务基础依赖-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-cloud</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-system-cloud-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<!-- Gateway网关依赖,内置webflux-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- redis方式限流 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--sentinel 限流熔点降级-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>fastjson</artifactId>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<!-- sentinel集成nacos作为数据源 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-datasource-nacos</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--- sentinel流控链路不生效 -->
|
|
||||||
<!--<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-web-servlet</artifactId>
|
|
||||||
</dependency>-->
|
|
||||||
|
|
||||||
|
|
||||||
<!--健康监控-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Swagger API文档 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.xiaoymin</groupId>
|
|
||||||
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
|
|
||||||
<version>${knife4j-spring-boot-starter.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.commons</groupId>
|
|
||||||
<artifactId>commons-lang3</artifactId>
|
|
||||||
<version>3.18.0</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
<filtering>true</filtering>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
package org.jeecg;
|
|
||||||
|
|
||||||
import org.jeecg.loader.DynamicRouteLoader;
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.boot.CommandLineRunner;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
import org.springframework.context.ConfigurableApplicationContext;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.web.reactive.function.server.RouterFunction;
|
|
||||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
|
||||||
|
|
||||||
import jakarta.annotation.Resource;
|
|
||||||
|
|
||||||
import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
|
|
||||||
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
|
|
||||||
import static org.springframework.web.reactive.function.server.ServerResponse.ok;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author jeecg
|
|
||||||
*/
|
|
||||||
@EnableFeignClients
|
|
||||||
@EnableDiscoveryClient
|
|
||||||
@SpringBootApplication
|
|
||||||
public class JeecgGatewayApplication implements CommandLineRunner {
|
|
||||||
@Resource
|
|
||||||
private DynamicRouteLoader dynamicRouteLoader;
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
ConfigurableApplicationContext applicationContext = SpringApplication.run(JeecgGatewayApplication.class, args);
|
|
||||||
//String userName = applicationContext.getEnvironment().getProperty("jeecg.test");
|
|
||||||
//System.err.println("user name :" +userName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 容器初始化后加载路由
|
|
||||||
* @param strings
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void run(String... strings) {
|
|
||||||
dynamicRouteLoader.refresh(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 接口地址（通过9999端口直接访问）
|
|
||||||
* 已使用knife4j-gateway支持该功能
|
|
||||||
* @param indexHtml
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public RouterFunction<ServerResponse> indexRouter(@Value("classpath:/META-INF/resources/doc.html") final org.springframework.core.io.Resource indexHtml) {
|
|
||||||
return route(GET("/"), request -> ok().contentType(MediaType.TEXT_HTML).syncBody(indexHtml));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
package org.jeecg.config;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author scott
|
|
||||||
* @date 2020/05/26
|
|
||||||
* 路由配置信息
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
@RefreshScope
|
|
||||||
public class GatewayRoutersConfig {
|
|
||||||
/**
|
|
||||||
* 路由配置方式：database，yml，nacos
|
|
||||||
*/
|
|
||||||
public String dataType;
|
|
||||||
public String serverAddr;
|
|
||||||
public String namespace;
|
|
||||||
public String dataId;
|
|
||||||
public String routeGroup;
|
|
||||||
public String username;
|
|
||||||
public String password;
|
|
||||||
|
|
||||||
@Value("${jeecg.route.config.data-type:#{null}}")
|
|
||||||
public void setDataType(String dataType) {
|
|
||||||
this.dataType = dataType;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Value("${jeecg.route.config.data-id:#{null}}")
|
|
||||||
public void setRouteDataId(String dataId) {
|
|
||||||
this.dataId = dataId + ".json";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Value("${spring.cloud.nacos.config.group:DEFAULT_GROUP:#{null}}")
|
|
||||||
public void setRouteGroup(String routeGroup) {
|
|
||||||
this.routeGroup = routeGroup;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Value("${spring.cloud.nacos.discovery.server-addr}")
|
|
||||||
public void setServerAddr(String serverAddr) {
|
|
||||||
this.serverAddr = serverAddr;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Value("${spring.cloud.nacos.config.namespace:#{null}}")
|
|
||||||
public void setNamespace(String namespace) {
|
|
||||||
this.namespace = namespace;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Value("${spring.cloud.nacos.config.username:#{null}}")
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Value("${spring.cloud.nacos.config.password:#{null}}")
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDataType() {
|
|
||||||
return dataType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getServerAddr() {
|
|
||||||
return serverAddr;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getNamespace() {
|
|
||||||
return namespace;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDataId() {
|
|
||||||
return dataId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getRouteGroup() {
|
|
||||||
return routeGroup;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
package org.jeecg.config;
|
|
||||||
|
|
||||||
import org.jeecg.filter.GlobalAccessTokenFilter;
|
|
||||||
import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
|
||||||
import reactor.core.publisher.Mono;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author scott
|
|
||||||
* @date 2020/5/26
|
|
||||||
* 路由限流配置
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
public class RateLimiterConfiguration {
|
|
||||||
/**
|
|
||||||
* IP限流 (通过exchange对象可以获取到请求信息，这边用了HostName)
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
@Primary
|
|
||||||
public KeyResolver ipKeyResolver() {
|
|
||||||
return exchange -> Mono.just(exchange.getRequest().getRemoteAddress().getAddress().getHostAddress());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 用户限流 (通过exchange对象可以获取到请求信息，获取当前请求的用户 TOKEN)
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public KeyResolver userKeyResolver() {
|
|
||||||
//使用这种方式限流，请求Header中必须携带X-Access-Token参数
|
|
||||||
return exchange -> Mono.just(exchange.getRequest().getHeaders().getFirst(GlobalAccessTokenFilter.X_ACCESS_TOKEN));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 接口限流 (获取请求地址的uri作为限流key)
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public KeyResolver apiKeyResolver() {
|
|
||||||
return exchange -> Mono.just(exchange.getRequest().getPath().value());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
package org.jeecg.config;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* nocos配置方式枚举
|
|
||||||
* @author zyf
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
public enum RouterDataType {
|
|
||||||
/**
|
|
||||||
* 数据库加载路由配置
|
|
||||||
*/
|
|
||||||
database,
|
|
||||||
/**
|
|
||||||
* 本地yml加载路由配置
|
|
||||||
*/
|
|
||||||
yml,
|
|
||||||
/**
|
|
||||||
* nacos加载路由配置
|
|
||||||
*/
|
|
||||||
nacos
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
//package org.jeecg.fallback;
|
|
||||||
//
|
|
||||||
//import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
//import org.springframework.web.bind.annotation.RestController;
|
|
||||||
//import reactor.core.publisher.Mono;
|
|
||||||
//
|
|
||||||
///**
|
|
||||||
// * 响应超时熔断处理器【升级springboot2.6.6后，此类作废】
|
|
||||||
// *
|
|
||||||
// * @author zyf
|
|
||||||
// */
|
|
||||||
//@RestController
|
|
||||||
//public class FallbackController {
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * 全局熔断处理
|
|
||||||
// * @return
|
|
||||||
// */
|
|
||||||
// @RequestMapping("/fallback")
|
|
||||||
// public Mono<String> fallback() {
|
|
||||||
// return Mono.just("访问超时，请稍后再试!");
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * demo熔断处理
|
|
||||||
// * @return
|
|
||||||
// */
|
|
||||||
// @RequestMapping("/demo/fallback")
|
|
||||||
// public Mono<String> fallback2() {
|
|
||||||
// return Mono.just("访问超时，请稍后再试!");
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
//package org.jeecg.fallback;
|
|
||||||
//
|
|
||||||
//import lombok.extern.slf4j.Slf4j;
|
|
||||||
//import org.springframework.http.HttpStatus;
|
|
||||||
//import org.springframework.stereotype.Component;
|
|
||||||
//import org.springframework.web.reactive.function.BodyInserters;
|
|
||||||
//import org.springframework.web.reactive.function.server.HandlerFunction;
|
|
||||||
//import org.springframework.web.reactive.function.server.ServerRequest;
|
|
||||||
//import org.springframework.web.reactive.function.server.ServerResponse;
|
|
||||||
//import reactor.core.publisher.Mono;
|
|
||||||
//
|
|
||||||
//import java.util.Optional;
|
|
||||||
//
|
|
||||||
//import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR;
|
|
||||||
//
|
|
||||||
///**
|
|
||||||
// * @author scott
|
|
||||||
// * @date 2020/05/26
|
|
||||||
// * Hystrix 降级处理
|
|
||||||
// */
|
|
||||||
//@Slf4j
|
|
||||||
//@Component
|
|
||||||
//public class HystrixFallbackHandler implements HandlerFunction<ServerResponse> {
|
|
||||||
// @Override
|
|
||||||
// public Mono<ServerResponse> handle(ServerRequest serverRequest) {
|
|
||||||
// Optional<Object> originalUris = serverRequest.attribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
|
|
||||||
//
|
|
||||||
// originalUris.ifPresent(originalUri -> log.error("网关执行请求:{}失败,hystrix服务降级处理", originalUri));
|
|
||||||
//
|
|
||||||
// return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR.value())
|
|
||||||
// .header("Content-Type","text/plain; charset=utf-8").body(BodyInserters.fromObject("访问超时,请稍后再试"));
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
package org.jeecg.fallback.sentinel;
|
|
||||||
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler;
|
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
|
|
||||||
import org.jeecg.common.enums.SentinelErrorInfoEnum;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.web.reactive.function.BodyInserters;
|
|
||||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
|
||||||
|
|
||||||
import jakarta.annotation.PostConstruct;
|
|
||||||
import java.util.HashMap;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description: 自定义Sentinel全局异常(需要启动Sentinel客户端)
|
|
||||||
* @author: zyf
|
|
||||||
* @date: 2022/02/18
|
|
||||||
* @version: V1.0
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
public class GatewaySentinelExceptionConfig {
|
|
||||||
|
|
||||||
@PostConstruct
|
|
||||||
public void init() {
|
|
||||||
|
|
||||||
BlockRequestHandler blockRequestHandler = (serverWebExchange, ex) -> {
|
|
||||||
String msg;
|
|
||||||
SentinelErrorInfoEnum errorInfoEnum = SentinelErrorInfoEnum.getErrorByException(ex);
|
|
||||||
if (ObjectUtil.isNotEmpty(errorInfoEnum)) {
|
|
||||||
msg = errorInfoEnum.getError();
|
|
||||||
} else {
|
|
||||||
msg = "未知限流降级";
|
|
||||||
}
|
|
||||||
HashMap<String, String> map = new HashMap(5);
|
|
||||||
map.put("code", HttpStatus.TOO_MANY_REQUESTS.toString());
|
|
||||||
map.put("message", msg);
|
|
||||||
//自定义异常处理
|
|
||||||
return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(BodyInserters.fromValue(map));
|
|
||||||
};
|
|
||||||
|
|
||||||
GatewayCallbackManager.setBlockHandler(blockRequestHandler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
//package org.jeecg.fallback.sentinel;
|
|
||||||
//import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler;
|
|
||||||
//import com.alibaba.csp.sentinel.transport.config.TransportConfig;
|
|
||||||
//import lombok.extern.slf4j.Slf4j;
|
|
||||||
//import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
//import org.springframework.cloud.commons.util.InetUtils;
|
|
||||||
//import org.springframework.http.HttpStatus;
|
|
||||||
//import org.springframework.http.MediaType;
|
|
||||||
//import org.springframework.stereotype.Component;
|
|
||||||
//import org.springframework.web.reactive.function.BodyInserters;
|
|
||||||
//import org.springframework.web.reactive.function.server.ServerResponse;
|
|
||||||
//import org.springframework.web.server.ServerWebExchange;
|
|
||||||
//import reactor.core.publisher.Mono;
|
|
||||||
//
|
|
||||||
//import javax.annotation.PostConstruct;
|
|
||||||
//
|
|
||||||
///**
|
|
||||||
// * 自定义限流返回信息
|
|
||||||
// * @author scott
|
|
||||||
// */
|
|
||||||
//@Slf4j
|
|
||||||
//@Component
|
|
||||||
//public class SentinelBlockRequestHandler implements BlockRequestHandler {
|
|
||||||
// @Autowired
|
|
||||||
// private InetUtils inetUtils;
|
|
||||||
//
|
|
||||||
// @PostConstruct
|
|
||||||
// public void doInit() {
|
|
||||||
// System.setProperty(TransportConfig.HEARTBEAT_CLIENT_IP, inetUtils.findFirstNonLoopbackAddress().getHostAddress());
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public Mono<ServerResponse> handleRequest(ServerWebExchange exchange, Throwable ex) {
|
|
||||||
// String resultString = "{\"code\":403,\"message\":\"服务开启限流保护,请稍后再试!\"}";
|
|
||||||
// return ServerResponse.status(HttpStatus.TOO_MANY_REQUESTS).contentType(MediaType.APPLICATION_JSON_UTF8).body(BodyInserters.fromObject(resultString));
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//}
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
package org.jeecg.filter;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
|
|
||||||
import org.springframework.cloud.gateway.filter.GlobalFilter;
|
|
||||||
import org.springframework.core.Ordered;
|
|
||||||
import org.springframework.http.server.reactive.ServerHttpRequest;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
import org.springframework.web.server.ServerWebExchange;
|
|
||||||
import reactor.core.publisher.Mono;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
|
|
||||||
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.addOriginalRequestUrl;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 全局拦截器，作用所有的微服务
|
|
||||||
*
|
|
||||||
* 1.重写StripPrefix(获取真实的URL)
|
|
||||||
* 2.将现在的request，添加当前身份
|
|
||||||
* @author: scott
|
|
||||||
* @date: 2022/4/8 10:55
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Component
|
|
||||||
public class GlobalAccessTokenFilter implements GlobalFilter, Ordered {
|
|
||||||
public final static String X_ACCESS_TOKEN = "X-Access-Token";
|
|
||||||
public final static String X_GATEWAY_BASE_PATH = "X_GATEWAY_BASE_PATH";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
|
||||||
|
|
||||||
String scheme = exchange.getRequest().getURI().getScheme();
|
|
||||||
String host = exchange.getRequest().getURI().getHost();
|
|
||||||
int port = exchange.getRequest().getURI().getPort();
|
|
||||||
// 代码逻辑说明: 地址中没有带端口(http/https默认)时port是-1------------
|
|
||||||
String basePath = scheme + "://" + host;
|
|
||||||
if (port != -1) {
|
|
||||||
basePath += ":" + port;
|
|
||||||
}
|
|
||||||
// 1. 重写StripPrefix(获取真实的URL)
|
|
||||||
addOriginalRequestUrl(exchange, exchange.getRequest().getURI());
|
|
||||||
String rawPath = exchange.getRequest().getURI().getRawPath();
|
|
||||||
String newPath = "/" + Arrays.stream(StringUtils.tokenizeToStringArray(rawPath, "/")).skip(1L).collect(Collectors.joining("/"));
|
|
||||||
ServerHttpRequest newRequest = exchange.getRequest().mutate().path(newPath).build();
|
|
||||||
exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, newRequest.getURI());
|
|
||||||
//2.将现在的request，添加当前身份
|
|
||||||
ServerHttpRequest mutableReq = exchange.getRequest().mutate().header("Authorization-UserName", "").header(X_GATEWAY_BASE_PATH,basePath).build();
|
|
||||||
ServerWebExchange mutableExchange = exchange.mutate().request(mutableReq).build();
|
|
||||||
return chain.filter(mutableExchange);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getOrder() {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
//package org.jeecg.filter;
|
|
||||||
//
|
|
||||||
//import com.alibaba.csp.sentinel.adapter.servlet.CommonFilter;
|
|
||||||
//import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
|
||||||
//import org.springframework.context.annotation.Bean;
|
|
||||||
//import org.springframework.context.annotation.Configuration;
|
|
||||||
//
|
|
||||||
///** 升级spring boot 3后，无法找到平替
|
|
||||||
// * @author: zyf
|
|
||||||
// * @date: 20210715
|
|
||||||
// */
|
|
||||||
//@Configuration
|
|
||||||
//public class SentinelFilterContextConfig {
|
|
||||||
// @Bean
|
|
||||||
// public FilterRegistrationBean sentinelFilterRegistration() {
|
|
||||||
// FilterRegistrationBean registration = new FilterRegistrationBean();
|
|
||||||
// registration.setFilter(new CommonFilter());
|
|
||||||
// registration.addUrlPatterns("/*");
|
|
||||||
// // 入口资源关闭聚合
|
|
||||||
// registration.addInitParameter(CommonFilter.WEB_CONTEXT_UNIFY, "false");
|
|
||||||
// registration.setName("sentinelFilter");
|
|
||||||
// registration.setOrder(1);
|
|
||||||
// return registration;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
package org.jeecg.handler;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.jeecg.common.base.BaseMap;
|
|
||||||
import org.jeecg.common.constant.GlobalConstants;
|
|
||||||
import org.jeecg.common.modules.redis.listener.JeecgRedisListener;
|
|
||||||
import org.jeecg.loader.DynamicRouteLoader;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import jakarta.annotation.Resource;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 路由刷新监听（实现方式：redis监听handler）
|
|
||||||
* @author zyf
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Component(GlobalConstants.LODER_ROUDER_HANDLER)
|
|
||||||
public class LoderRouderHandler implements JeecgRedisListener {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private DynamicRouteLoader dynamicRouteLoader;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMessage(BaseMap message) {
|
|
||||||
dynamicRouteLoader.refresh(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
package org.jeecg.handler.swagger;
|
|
||||||
|
|
||||||
import cn.hutool.core.util.ArrayUtil;
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
|
||||||
import com.alibaba.nacos.api.naming.NamingFactory;
|
|
||||||
import com.alibaba.nacos.api.naming.NamingService;
|
|
||||||
import com.alibaba.nacos.api.naming.pojo.Instance;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.cloud.gateway.route.RouteLocator;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import springfox.documentation.swagger.web.SwaggerResource;
|
|
||||||
import springfox.documentation.swagger.web.SwaggerResourcesProvider;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
/** 已使用knife4j-gateway支持该功能
|
|
||||||
* 聚合各个服务的swagger接口
|
|
||||||
* @author zyf
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
@Slf4j
|
|
||||||
@Primary
|
|
||||||
public class MySwaggerResourceProvider implements SwaggerResourcesProvider {
|
|
||||||
/**
|
|
||||||
* swagger2默认的url后缀
|
|
||||||
*/
|
|
||||||
private static final String SWAGGER2URL = "/v3/api-docs";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关路由
|
|
||||||
*/
|
|
||||||
private final RouteLocator routeLocator;
|
|
||||||
/**
|
|
||||||
* Nacos名字服务
|
|
||||||
*/
|
|
||||||
private NamingService naming;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* nacos服务地址
|
|
||||||
*/
|
|
||||||
@Value("${spring.cloud.nacos.discovery.server-addr}")
|
|
||||||
private String serverAddr;
|
|
||||||
/**
|
|
||||||
* nacos namespace
|
|
||||||
*/
|
|
||||||
@Value("${spring.cloud.nacos.discovery.namespace:#{null}}")
|
|
||||||
private String namespace;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* nacos groupName
|
|
||||||
*/
|
|
||||||
@Value("${spring.cloud.nacos.config.group:DEFAULT_GROUP:#{null}}")
|
|
||||||
private String group;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* nacos username
|
|
||||||
*/
|
|
||||||
@Value("${spring.cloud.nacos.discovery.username:#{null}}")
|
|
||||||
private String username;
|
|
||||||
/**
|
|
||||||
* nacos password
|
|
||||||
*/
|
|
||||||
@Value("${spring.cloud.nacos.discovery.password:#{null}}")
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swagger中需要排除的服务
|
|
||||||
*/
|
|
||||||
private String[] excludeServiceIds=new String[]{"jeecg-cloud-monitor"};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关应用名称
|
|
||||||
*/
|
|
||||||
@Value("${spring.application.name}")
|
|
||||||
private String self;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public MySwaggerResourceProvider(RouteLocator routeLocator) {
|
|
||||||
this.routeLocator = routeLocator;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<SwaggerResource> get() {
|
|
||||||
List<SwaggerResource> resources = new ArrayList<>();
|
|
||||||
List<String> routeHosts = new ArrayList<>();
|
|
||||||
// 获取所有可用的host：serviceId
|
|
||||||
routeLocator.getRoutes().filter(route -> route.getUri().getHost() != null)
|
|
||||||
.filter(route -> !self.equals(route.getUri().getHost()))
|
|
||||||
.subscribe(route ->{
|
|
||||||
// 代码逻辑说明: 过滤掉无效路由,避免接口文档报错无法打开
|
|
||||||
boolean hasRoute=checkRoute(route.getId());
|
|
||||||
if(hasRoute){
|
|
||||||
routeHosts.add(route.getUri().getHost());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 记录已经添加过的server，存在同一个应用注册了多个服务在nacos上
|
|
||||||
Set<String> dealed = new HashSet<>();
|
|
||||||
routeHosts.forEach(instance -> {
|
|
||||||
// 拼接url
|
|
||||||
String url = "/" + instance.toLowerCase() + SWAGGER2URL;
|
|
||||||
if (!dealed.contains(url)) {
|
|
||||||
dealed.add(url);
|
|
||||||
log.info(" Gateway add SwaggerResource: {}",url);
|
|
||||||
SwaggerResource swaggerResource = new SwaggerResource();
|
|
||||||
swaggerResource.setUrl(url);
|
|
||||||
swaggerResource.setSwaggerVersion("2.0");
|
|
||||||
swaggerResource.setName(instance);
|
|
||||||
//Swagger排除不展示的服务
|
|
||||||
if(!ArrayUtil.contains(excludeServiceIds,instance)){
|
|
||||||
resources.add(swaggerResource);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return resources;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 检测nacos中是否有健康实例
|
|
||||||
* @param routeId
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private Boolean checkRoute(String routeId) {
|
|
||||||
Boolean hasRoute = false;
|
|
||||||
try {
|
|
||||||
//修复使用带命名空间启动网关swagger看不到接口文档的问题
|
|
||||||
Properties properties=new Properties();
|
|
||||||
properties.setProperty("serverAddr",serverAddr);
|
|
||||||
if(namespace!=null && !"".equals(namespace)){
|
|
||||||
log.info("nacos.discovery.namespace = {}", namespace);
|
|
||||||
properties.setProperty("namespace",namespace);
|
|
||||||
}
|
|
||||||
if(username!=null && !"".equals(username)){
|
|
||||||
properties.setProperty("username",username);
|
|
||||||
}
|
|
||||||
if(password!=null && !"".equals(password)){
|
|
||||||
properties.setProperty("password",password);
|
|
||||||
}
|
|
||||||
//【issues/5115】因swagger文档导致gateway内存溢出
|
|
||||||
if (this.naming == null) {
|
|
||||||
this.naming = NamingFactory.createNamingService(properties);
|
|
||||||
}
|
|
||||||
log.info(" config.group : {}", group);
|
|
||||||
List<Instance> list = this.naming.selectInstances(routeId, group , true);
|
|
||||||
if (ObjectUtil.isNotEmpty(list)) {
|
|
||||||
hasRoute = true;
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return hasRoute;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
package org.jeecg.handler.swagger;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import springfox.documentation.swagger.web.*;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/** 已使用knife4j-gateway支持该功能
|
|
||||||
* swagger聚合接口，三个接口都是 doc.html需要访问的接口
|
|
||||||
* @author zyf
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/swagger-resources")
|
|
||||||
public class SwaggerResourceController {
|
|
||||||
private MySwaggerResourceProvider swaggerResourceProvider;
|
|
||||||
|
|
||||||
@Value("${knife4j.gateway.enabled:true}")
|
|
||||||
private Boolean enableSwagger;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
public SwaggerResourceController(MySwaggerResourceProvider swaggerResourceProvider) {
|
|
||||||
this.swaggerResourceProvider = swaggerResourceProvider;
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping(value = "/configuration/security")
|
|
||||||
public ResponseEntity<SecurityConfiguration> securityConfiguration() {
|
|
||||||
return new ResponseEntity<>(SecurityConfigurationBuilder.builder().build(), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping(value = "/configuration/ui")
|
|
||||||
public ResponseEntity<UiConfiguration> uiConfiguration() {
|
|
||||||
return new ResponseEntity<>(UiConfigurationBuilder.builder().build(), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping
|
|
||||||
public ResponseEntity<List<SwaggerResource>> swaggerResources() {
|
|
||||||
if (!enableSwagger) {
|
|
||||||
return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
return new ResponseEntity<>(swaggerResourceProvider.get(), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,381 +0,0 @@
|
|||||||
package org.jeecg.loader;
|
|
||||||
|
|
||||||
import cn.hutool.core.util.ArrayUtil;
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import com.alibaba.fastjson.JSONArray;
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
|
||||||
import com.alibaba.nacos.api.NacosFactory;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import com.alibaba.nacos.api.config.listener.Listener;
|
|
||||||
import com.alibaba.nacos.api.exception.NacosException;
|
|
||||||
import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.apache.commons.lang3.ObjectUtils;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.jeecg.common.base.BaseMap;
|
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
|
||||||
import org.jeecg.common.util.RedisUtil;
|
|
||||||
import org.jeecg.config.GatewayRoutersConfig;
|
|
||||||
import org.jeecg.config.RouterDataType;
|
|
||||||
import org.jeecg.loader.repository.DynamicRouteService;
|
|
||||||
import org.jeecg.loader.repository.MyInMemoryRouteDefinitionRepository;
|
|
||||||
import org.jeecg.loader.vo.MyRouteDefinition;
|
|
||||||
import org.jeecg.loader.vo.PredicatesVo;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
|
||||||
import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
|
|
||||||
import org.springframework.cloud.gateway.filter.FilterDefinition;
|
|
||||||
import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
|
|
||||||
import org.springframework.cloud.gateway.route.RouteDefinition;
|
|
||||||
import org.springframework.context.ApplicationEventPublisher;
|
|
||||||
import org.springframework.context.ApplicationEventPublisherAware;
|
|
||||||
import org.springframework.context.annotation.DependsOn;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import reactor.core.publisher.Mono;
|
|
||||||
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 动态路由加载器
|
|
||||||
*
|
|
||||||
* @author : zyf
|
|
||||||
* @date :2020-11-10
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Component
|
|
||||||
@RefreshScope
|
|
||||||
@DependsOn({"gatewayRoutersConfig"})
|
|
||||||
public class DynamicRouteLoader implements ApplicationEventPublisherAware {
|
|
||||||
|
|
||||||
public static final long DEFAULT_TIMEOUT = 30000;
|
|
||||||
@Autowired
|
|
||||||
private GatewayRoutersConfig gatewayRoutersConfig;
|
|
||||||
private MyInMemoryRouteDefinitionRepository repository;
|
|
||||||
private ApplicationEventPublisher publisher;
|
|
||||||
private DynamicRouteService dynamicRouteService;
|
|
||||||
private ConfigService configService;
|
|
||||||
private RedisUtil redisUtil;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 需要拼接key的路由条件
|
|
||||||
*/
|
|
||||||
private static String[] GEN_KEY_ROUTERS = new String[]{"Path", "Host", "Method", "After", "Before", "Between", "RemoteAddr"};
|
|
||||||
|
|
||||||
public DynamicRouteLoader(MyInMemoryRouteDefinitionRepository repository, DynamicRouteService dynamicRouteService, RedisUtil redisUtil) {
|
|
||||||
|
|
||||||
this.repository = repository;
|
|
||||||
this.dynamicRouteService = dynamicRouteService;
|
|
||||||
this.redisUtil = redisUtil;
|
|
||||||
}
|
|
||||||
|
|
||||||
// @PostConstruct
|
|
||||||
// public void init() {
|
|
||||||
// init(null);
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
public void init(BaseMap baseMap) {
|
|
||||||
log.info("初始化路由模式，dataType："+ gatewayRoutersConfig.getDataType());
|
|
||||||
if (RouterDataType.nacos.toString().endsWith(gatewayRoutersConfig.getDataType())) {
|
|
||||||
loadRoutesByNacos();
|
|
||||||
}
|
|
||||||
//从数据库加载路由
|
|
||||||
if (RouterDataType.database.toString().endsWith(gatewayRoutersConfig.getDataType())) {
|
|
||||||
loadRoutesByRedis(baseMap);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* 刷新路由
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public Mono<Void> refresh(BaseMap baseMap) {
|
|
||||||
log.info("初始化路由模式，dataType："+ gatewayRoutersConfig.getDataType());
|
|
||||||
if (!RouterDataType.yml.toString().endsWith(gatewayRoutersConfig.getDataType())) {
|
|
||||||
this.init(baseMap);
|
|
||||||
}
|
|
||||||
return Mono.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 从nacos中读取路由配置
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private void loadRoutesByNacos() {
|
|
||||||
List<RouteDefinition> routes = Lists.newArrayList();
|
|
||||||
configService = createConfigService();
|
|
||||||
if (configService == null) {
|
|
||||||
log.warn("initConfigService fail");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
log.info("jeecg.route.config.data-id = {}", gatewayRoutersConfig.getDataId());
|
|
||||||
log.info("nacos.config.group = {}", gatewayRoutersConfig.getRouteGroup());
|
|
||||||
String configInfo = configService.getConfig(gatewayRoutersConfig.getDataId(), gatewayRoutersConfig.getRouteGroup(), DEFAULT_TIMEOUT);
|
|
||||||
if (StringUtils.isNotBlank(configInfo)) {
|
|
||||||
log.info("获取网关当前配置:\r\n{}", configInfo);
|
|
||||||
routes = JSON.parseArray(configInfo, RouteDefinition.class);
|
|
||||||
}else{
|
|
||||||
log.warn("ERROR: 从Nacos获取网关配置为空，请确认Nacos配置是否正确！");
|
|
||||||
}
|
|
||||||
} catch (NacosException e) {
|
|
||||||
log.error("初始化网关路由时发生错误", e);
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
for (RouteDefinition definition : routes) {
|
|
||||||
log.info("update route : {}", definition.toString());
|
|
||||||
dynamicRouteService.add(definition);
|
|
||||||
}
|
|
||||||
this.publisher.publishEvent(new RefreshRoutesEvent(this));
|
|
||||||
dynamicRouteByNacosListener(gatewayRoutersConfig.getDataId(), gatewayRoutersConfig.getRouteGroup());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 从redis中读取路由配置
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private void loadRoutesByRedis(BaseMap baseMap) {
|
|
||||||
List<MyRouteDefinition> routes = Lists.newArrayList();
|
|
||||||
configService = createConfigService();
|
|
||||||
if (configService == null) {
|
|
||||||
log.warn("initConfigService fail");
|
|
||||||
}
|
|
||||||
Object configInfo = redisUtil.get(CacheConstant.GATEWAY_ROUTES);
|
|
||||||
if (ObjectUtil.isNotEmpty(configInfo)) {
|
|
||||||
log.info("获取网关当前配置:\r\n{}", configInfo);
|
|
||||||
JSONArray array = JSON.parseArray(configInfo.toString());
|
|
||||||
try {
|
|
||||||
routes = getRoutesByJson(array);
|
|
||||||
} catch (URISyntaxException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
log.warn("ERROR: 从Redis获取网关配置为空，请确认system服务是否启动成功！");
|
|
||||||
}
|
|
||||||
|
|
||||||
for (MyRouteDefinition definition : routes) {
|
|
||||||
log.info("update route : {}", definition.toString());
|
|
||||||
Integer status=definition.getStatus();
|
|
||||||
if(status.equals(0)){
|
|
||||||
dynamicRouteService.delete(definition.getId());
|
|
||||||
}else{
|
|
||||||
dynamicRouteService.add(definition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(ObjectUtils.isNotEmpty(baseMap)){
|
|
||||||
String delRouterId = baseMap.get("delRouterId");
|
|
||||||
if (ObjectUtils.isNotEmpty(delRouterId)) {
|
|
||||||
dynamicRouteService.delete(delRouterId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.publisher.publishEvent(new RefreshRoutesEvent(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* redis中的信息需要处理下 转成RouteDefinition对象
|
|
||||||
* - id: login
|
|
||||||
* uri: lb://cloud-jeecg-system
|
|
||||||
* predicates:
|
|
||||||
* - Path=/jeecg-boot/sys/**,
|
|
||||||
*
|
|
||||||
* @param array
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
|
|
||||||
public static List<MyRouteDefinition> getRoutesByJson(JSONArray array) throws URISyntaxException {
|
|
||||||
List<MyRouteDefinition> ls = new ArrayList<>();
|
|
||||||
for (int i = 0; i < array.size(); i++) {
|
|
||||||
JSONObject obj = array.getJSONObject(i);
|
|
||||||
MyRouteDefinition route = new MyRouteDefinition();
|
|
||||||
route.setId(obj.getString("routerId"));
|
|
||||||
route.setStatus(obj.getInteger("status"));
|
|
||||||
Object uri = obj.get("uri");
|
|
||||||
if (uri == null) {
|
|
||||||
route.setUri(new URI("lb://" + obj.getString("name")));
|
|
||||||
} else {
|
|
||||||
route.setUri(new URI(obj.getString("uri")));
|
|
||||||
}
|
|
||||||
Object predicates = obj.get("predicates");
|
|
||||||
if (predicates != null) {
|
|
||||||
// 代码逻辑说明: [issues/5331]网关路由配置问题
|
|
||||||
List<PredicatesVo> list = JSON.parseArray(predicates.toString(), PredicatesVo.class);
|
|
||||||
//获取合并后的Predicates，防止配置多个path导致路径失效的问题
|
|
||||||
Map<String, List<String>> groupedPredicates = new HashMap<>();
|
|
||||||
for (PredicatesVo predicatesVo : list) {
|
|
||||||
String name = predicatesVo.getName();
|
|
||||||
List<String> args = predicatesVo.getArgs();
|
|
||||||
groupedPredicates.computeIfAbsent(name, k -> new ArrayList<>()).addAll(args);
|
|
||||||
}
|
|
||||||
//合并后的list
|
|
||||||
list = new ArrayList<>();
|
|
||||||
for (Map.Entry<String, List<String>> entry : groupedPredicates.entrySet()) {
|
|
||||||
String name = entry.getKey();
|
|
||||||
List<String> args = entry.getValue();
|
|
||||||
list.add(new PredicatesVo(name, args));
|
|
||||||
}
|
|
||||||
List<PredicateDefinition> predicateDefinitionList = new ArrayList<>();
|
|
||||||
for (Object map : list) {
|
|
||||||
JSONObject json = JSON.parseObject(JSON.toJSONString(map));
|
|
||||||
PredicateDefinition predicateDefinition = new PredicateDefinition();
|
|
||||||
// 代码逻辑说明: 【VUEN-762】路由条件添加异常问题,原因是部分路由条件参数需要设置固定key
|
|
||||||
String name=json.getString("name");
|
|
||||||
predicateDefinition.setName(name);
|
|
||||||
//路由条件是否拼接Key
|
|
||||||
if(ArrayUtil.contains(GEN_KEY_ROUTERS,name)) {
|
|
||||||
JSONArray jsonArray = json.getJSONArray("args");
|
|
||||||
for (int j = 0; j < jsonArray.size(); j++) {
|
|
||||||
predicateDefinition.addArg("_genkey" + j, jsonArray.get(j).toString());
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
JSONObject jsonObject = json.getJSONObject("args");
|
|
||||||
if(ObjectUtil.isNotEmpty(jsonObject)){
|
|
||||||
for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
|
|
||||||
Object valueObj=entry.getValue();
|
|
||||||
if(ObjectUtil.isNotEmpty(valueObj)) {
|
|
||||||
predicateDefinition.addArg(entry.getKey(), valueObj.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
predicateDefinitionList.add(predicateDefinition);
|
|
||||||
}
|
|
||||||
route.setPredicates(predicateDefinitionList);
|
|
||||||
}
|
|
||||||
|
|
||||||
Object filters = obj.get("filters");
|
|
||||||
if (filters != null) {
|
|
||||||
JSONArray list = JSON.parseArray(filters.toString());
|
|
||||||
List<FilterDefinition> filterDefinitionList = new ArrayList<>();
|
|
||||||
if (ObjectUtil.isNotEmpty(list)) {
|
|
||||||
for (Object map : list) {
|
|
||||||
JSONObject json = (JSONObject) map;
|
|
||||||
JSONArray jsonArray = json.getJSONArray("args");
|
|
||||||
String name = json.getString("name");
|
|
||||||
FilterDefinition filterDefinition = new FilterDefinition();
|
|
||||||
for (Object o : jsonArray) {
|
|
||||||
JSONObject params = (JSONObject) o;
|
|
||||||
filterDefinition.addArg(params.getString("key"), params.get("value").toString());
|
|
||||||
}
|
|
||||||
filterDefinition.setName(name);
|
|
||||||
filterDefinitionList.add(filterDefinition);
|
|
||||||
}
|
|
||||||
route.setFilters(filterDefinitionList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ls.add(route);
|
|
||||||
}
|
|
||||||
return ls;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// private void loadRoutesByDataBase() {
|
|
||||||
// List<GatewayRouteVo> routeList = jdbcTemplate.query(SELECT_ROUTES, new RowMapper<GatewayRouteVo>() {
|
|
||||||
// @Override
|
|
||||||
// public GatewayRouteVo mapRow(ResultSet rs, int i) throws SQLException {
|
|
||||||
// GatewayRouteVo result = new GatewayRouteVo();
|
|
||||||
// result.setId(rs.getString("id"));
|
|
||||||
// result.setName(rs.getString("name"));
|
|
||||||
// result.setUri(rs.getString("uri"));
|
|
||||||
// result.setStatus(rs.getInt("status"));
|
|
||||||
// result.setRetryable(rs.getInt("retryable"));
|
|
||||||
// result.setPredicates(rs.getString("predicates"));
|
|
||||||
// result.setStripPrefix(rs.getInt("strip_prefix"));
|
|
||||||
// result.setPersist(rs.getInt("persist"));
|
|
||||||
// return result;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// if (ObjectUtil.isNotEmpty(routeList)) {
|
|
||||||
// // 加载路由
|
|
||||||
// routeList.forEach(route -> {
|
|
||||||
// RouteDefinition definition = new RouteDefinition();
|
|
||||||
// List<PredicateDefinition> predicatesList = Lists.newArrayList();
|
|
||||||
// List<FilterDefinition> filtersList = Lists.newArrayList();
|
|
||||||
// definition.setId(route.getId());
|
|
||||||
// String predicates = route.getPredicates();
|
|
||||||
// String filters = route.getFilters();
|
|
||||||
// if (StringUtils.isNotEmpty(predicates)) {
|
|
||||||
// predicatesList = JSON.parseArray(predicates, PredicateDefinition.class);
|
|
||||||
// definition.setPredicates(predicatesList);
|
|
||||||
// }
|
|
||||||
// if (StringUtils.isNotEmpty(filters)) {
|
|
||||||
// filtersList = JSON.parseArray(filters, FilterDefinition.class);
|
|
||||||
// definition.setFilters(filtersList);
|
|
||||||
// }
|
|
||||||
// URI uri = UriComponentsBuilder.fromUriString(route.getUri()).build().toUri();
|
|
||||||
// definition.setUri(uri);
|
|
||||||
// this.repository.save(Mono.just(definition)).subscribe();
|
|
||||||
// });
|
|
||||||
// log.info("加载路由:{}==============", routeList.size());
|
|
||||||
// Mono.empty();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 监听Nacos下发的动态路由配置
|
|
||||||
*
|
|
||||||
* @param dataId
|
|
||||||
* @param group
|
|
||||||
*/
|
|
||||||
public void dynamicRouteByNacosListener(String dataId, String group) {
|
|
||||||
try {
|
|
||||||
configService.addListener(dataId, group, new Listener() {
|
|
||||||
@Override
|
|
||||||
public void receiveConfigInfo(String configInfo) {
|
|
||||||
log.info("进行网关更新:\n\r{}", configInfo);
|
|
||||||
List<MyRouteDefinition> definitionList = JSON.parseArray(configInfo, MyRouteDefinition.class);
|
|
||||||
for (MyRouteDefinition definition : definitionList) {
|
|
||||||
log.info("update route : {}", definition.toString());
|
|
||||||
dynamicRouteService.update(definition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Executor getExecutor() {
|
|
||||||
log.info("getExecutor\n\r");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("从nacos接收动态路由配置出错!!!", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 创建ConfigService
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private ConfigService createConfigService() {
|
|
||||||
try {
|
|
||||||
Properties properties = new Properties();
|
|
||||||
properties.setProperty("serverAddr", gatewayRoutersConfig.getServerAddr());
|
|
||||||
if(StringUtils.isNotBlank(gatewayRoutersConfig.getNamespace())){
|
|
||||||
properties.setProperty("namespace", gatewayRoutersConfig.getNamespace());
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotBlank( gatewayRoutersConfig.getUsername())){
|
|
||||||
properties.setProperty("username", gatewayRoutersConfig.getUsername());
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotBlank(gatewayRoutersConfig.getPassword())){
|
|
||||||
properties.setProperty("password", gatewayRoutersConfig.getPassword());
|
|
||||||
}
|
|
||||||
return configService = NacosFactory.createConfigService(properties);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("创建ConfigService异常", e);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
|
|
||||||
this.publisher = applicationEventPublisher;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
package org.jeecg.loader.repository;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.jeecg.loader.repository.MyInMemoryRouteDefinitionRepository;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
|
|
||||||
import org.springframework.cloud.gateway.route.RouteDefinition;
|
|
||||||
import org.springframework.context.ApplicationEventPublisher;
|
|
||||||
import org.springframework.context.ApplicationEventPublisherAware;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import reactor.core.publisher.Mono;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 动态更新路由网关service
|
|
||||||
* 1）实现一个Spring提供的事件推送接口ApplicationEventPublisherAware
|
|
||||||
* 2）提供动态路由的基础方法，可通过获取bean操作该类的方法。该类提供新增路由、更新路由、删除路由，然后实现发布的功能。
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Service
|
|
||||||
public class DynamicRouteService implements ApplicationEventPublisherAware {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MyInMemoryRouteDefinitionRepository repository;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 发布事件
|
|
||||||
*/
|
|
||||||
|
|
||||||
private ApplicationEventPublisher publisher;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
|
|
||||||
this.publisher = applicationEventPublisher;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除路由
|
|
||||||
*
|
|
||||||
* @param id
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public synchronized void delete(String id) {
|
|
||||||
try {
|
|
||||||
repository.delete(Mono.just(id)).subscribe();
|
|
||||||
this.publisher.publishEvent(new RefreshRoutesEvent(this));
|
|
||||||
}catch (Exception e){
|
|
||||||
log.warn(e.getMessage(),e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 更新路由
|
|
||||||
*
|
|
||||||
* @param definition
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public synchronized String update(RouteDefinition definition) {
|
|
||||||
try {
|
|
||||||
log.info("gateway update route {}", definition);
|
|
||||||
} catch (Exception e) {
|
|
||||||
return "update fail,not find route routeId: " + definition.getId();
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
repository.save(Mono.just(definition)).subscribe();
|
|
||||||
this.publisher.publishEvent(new RefreshRoutesEvent(this));
|
|
||||||
return "success";
|
|
||||||
} catch (Exception e) {
|
|
||||||
return "update route fail";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 增加路由
|
|
||||||
*
|
|
||||||
* @param definition
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public synchronized String add(RouteDefinition definition) {
|
|
||||||
log.info("gateway add route {}", definition);
|
|
||||||
try {
|
|
||||||
repository.save(Mono.just(definition)).subscribe();
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.warn(e.getMessage(),e);
|
|
||||||
}
|
|
||||||
return "success";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
//
|
|
||||||
// Source code recreated from a .class file by IntelliJ IDEA
|
|
||||||
// (powered by Fernflower decompiler)
|
|
||||||
//
|
|
||||||
|
|
||||||
package org.jeecg.loader.repository;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
import ch.qos.logback.classic.Logger;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.cloud.gateway.route.RouteDefinition;
|
|
||||||
import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
|
|
||||||
import org.springframework.cloud.gateway.support.NotFoundException;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import org.springframework.util.ObjectUtils;
|
|
||||||
import reactor.core.publisher.Flux;
|
|
||||||
import reactor.core.publisher.Mono;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author qinfeng
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@Component
|
|
||||||
public class MyInMemoryRouteDefinitionRepository implements RouteDefinitionRepository {
|
|
||||||
private final Map<String, RouteDefinition> routes = Collections.synchronizedMap(new LinkedHashMap());
|
|
||||||
|
|
||||||
public MyInMemoryRouteDefinitionRepository() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Mono<Void> save(Mono<RouteDefinition> route) {
|
|
||||||
return route.flatMap((r) -> {
|
|
||||||
if (ObjectUtils.isEmpty(r.getId())) {
|
|
||||||
return Mono.error(new IllegalArgumentException("id may not be empty"));
|
|
||||||
} else {
|
|
||||||
this.routes.put(r.getId(), r);
|
|
||||||
return Mono.empty();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Mono<Void> delete(Mono<String> routeId) {
|
|
||||||
return routeId.flatMap((id) -> {
|
|
||||||
if (this.routes.containsKey(id)) {
|
|
||||||
this.routes.remove(id);
|
|
||||||
return Mono.empty();
|
|
||||||
} else {
|
|
||||||
log.warn("RouteDefinition not found: " + routeId);
|
|
||||||
return Mono.empty();
|
|
||||||
// return Mono.defer(() -> {
|
|
||||||
// return Mono.error(new NotFoundException("RouteDefinition not found: " + routeId));
|
|
||||||
// });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Flux<RouteDefinition> getRouteDefinitions() {
|
|
||||||
Map<String, RouteDefinition> routesSafeCopy = new LinkedHashMap(this.routes);
|
|
||||||
return Flux.fromIterable(routesSafeCopy.values());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
package org.jeecg.loader.vo;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 路由参数模型
|
|
||||||
* @author zyf
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class GatewayRouteVo {
|
|
||||||
private String id;
|
|
||||||
private String name;
|
|
||||||
private String uri;
|
|
||||||
private String predicates;
|
|
||||||
private String filters;
|
|
||||||
private Integer stripPrefix;
|
|
||||||
private Integer retryable;
|
|
||||||
private Integer persist;
|
|
||||||
private Integer status;
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package org.jeecg.loader.vo;
|
|
||||||
|
|
||||||
import org.springframework.cloud.gateway.route.RouteDefinition;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 自定义RouteDefinition
|
|
||||||
* @author zyf
|
|
||||||
*/
|
|
||||||
public class MyRouteDefinition extends RouteDefinition {
|
|
||||||
/**
|
|
||||||
* 路由状态
|
|
||||||
*/
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
public Integer getStatus() {
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStatus(Integer status) {
|
|
||||||
this.status = status;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package org.jeecg.loader.vo;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 路由配置VO
|
|
||||||
* @author lsq
|
|
||||||
* @Date 2023/10/15
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
public class PredicatesVo {
|
|
||||||
private String name;
|
|
||||||
private List<String> args;
|
|
||||||
}
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
server:
|
|
||||||
port: 9999
|
|
||||||
|
|
||||||
knife4j:
|
|
||||||
gateway:
|
|
||||||
enabled: true
|
|
||||||
|
|
||||||
spring:
|
|
||||||
application:
|
|
||||||
name: jeecg-gateway
|
|
||||||
main:
|
|
||||||
allow-circular-references: true
|
|
||||||
config:
|
|
||||||
import:
|
|
||||||
- optional:nacos:${spring.application.name}-@profile.name@.yaml
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
config:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
group: @config.group@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
username: @config.username@
|
|
||||||
password: @config.password@
|
|
||||||
discovery:
|
|
||||||
server-addr: ${spring.cloud.nacos.config.server-addr}
|
|
||||||
group: @config.group@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
username: @config.username@
|
|
||||||
password: @config.password@
|
|
||||||
gateway:
|
|
||||||
server:
|
|
||||||
webflux:
|
|
||||||
discovery:
|
|
||||||
locator:
|
|
||||||
enabled: true
|
|
||||||
globalcors:
|
|
||||||
cors-configurations:
|
|
||||||
'[/**]':
|
|
||||||
allow-credentials: true
|
|
||||||
allowed-origin-patterns:
|
|
||||||
- "*"
|
|
||||||
allowed-methods:
|
|
||||||
- "*"
|
|
||||||
allowed-headers:
|
|
||||||
- "*"
|
|
||||||
#Sentinel配置
|
|
||||||
sentinel:
|
|
||||||
transport:
|
|
||||||
dashboard: jeecg-boot-sentinel:9000
|
|
||||||
# 支持链路限流
|
|
||||||
web-context-unify: false
|
|
||||||
filter:
|
|
||||||
enabled: false
|
|
||||||
# 取消Sentinel控制台懒加载
|
|
||||||
eager: false
|
|
||||||
datasource:
|
|
||||||
#流控规则
|
|
||||||
flow: # 指定数据源名称
|
|
||||||
# 指定nacos数据源
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
# 指定配置文件
|
|
||||||
dataId: ${spring.application.name}-flow-rules
|
|
||||||
# 指定分组
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
# 指定配置文件规则类型
|
|
||||||
rule-type: flow
|
|
||||||
# 指定配置文件数据格式
|
|
||||||
data-type: json
|
|
||||||
#降级规则
|
|
||||||
degrade:
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
dataId: ${spring.application.name}-degrade-rules
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
rule-type: degrade
|
|
||||||
data-type: json
|
|
||||||
#系统规则
|
|
||||||
system:
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
dataId: ${spring.application.name}-system-rules
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
rule-type: system
|
|
||||||
data-type: json
|
|
||||||
#授权规则
|
|
||||||
authority:
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
dataId: ${spring.application.name}-authority-rules
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
rule-type: authority
|
|
||||||
data-type: json
|
|
||||||
#热点参数
|
|
||||||
param-flow:
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
dataId: ${spring.application.name}-param-rules
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
rule-type: param-flow
|
|
||||||
data-type: json
|
|
||||||
#网关流控规则
|
|
||||||
gw-flow:
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
dataId: ${spring.application.name}-flow-rules
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
rule-type: gw-flow
|
|
||||||
data-type: json
|
|
||||||
#API流控规则
|
|
||||||
gw-api-group:
|
|
||||||
nacos:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
dataId: ${spring.application.name}-api-rules
|
|
||||||
groupId: SENTINEL_GROUP
|
|
||||||
rule-type: gw-api-group
|
|
||||||
data-type: json
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration debug="false">
|
|
||||||
<!--定义日志文件的存储地址 -->
|
|
||||||
<property name="LOG_HOME" value="../logs" />
|
|
||||||
|
|
||||||
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 按照每天生成日志文件 -->
|
|
||||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
|
||||||
<!--日志文件输出的文件名 -->
|
|
||||||
<FileNamePattern>${LOG_HOME}/jeecg-gateway-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
|
|
||||||
<!--日志文件保留天数 -->
|
|
||||||
<MaxHistory>30</MaxHistory>
|
|
||||||
<maxFileSize>10MB</maxFileSize>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
|
|
||||||
<!--myibatis log configure -->
|
|
||||||
<logger name="com.apache.ibatis" level="TRACE" />
|
|
||||||
<logger name="java.sql.Connection" level="DEBUG" />
|
|
||||||
<logger name="java.sql.Statement" level="DEBUG" />
|
|
||||||
<logger name="java.sql.PreparedStatement" level="DEBUG" />
|
|
||||||
|
|
||||||
<!-- 日志输出级别 -->
|
|
||||||
<root level="INFO">
|
|
||||||
<appender-ref ref="STDOUT" />
|
|
||||||
<appender-ref ref="FILE" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
</configuration>
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
import org.jeecg.loader.vo.PredicatesVo;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description: 测试
|
|
||||||
* @author: lsq
|
|
||||||
* @date: 2023年10月13日 11:32
|
|
||||||
*/
|
|
||||||
public class TestRoutes {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void TestRoutes() {
|
|
||||||
List<PredicatesVo> list = new ArrayList<>();
|
|
||||||
PredicatesVo a = new PredicatesVo();
|
|
||||||
a.setName("path");
|
|
||||||
String[] aArr={"/sys/**","/eoa/**"};
|
|
||||||
a.setArgs(Arrays.asList(aArr));
|
|
||||||
list.add(a);
|
|
||||||
|
|
||||||
PredicatesVo b = new PredicatesVo();
|
|
||||||
b.setName("path");
|
|
||||||
String[] bArr={"/sys/**","/demo/**"};
|
|
||||||
b.setArgs(Arrays.asList(bArr));
|
|
||||||
list.add(b);
|
|
||||||
|
|
||||||
Map<String, List<String>> groupedPredicates = new HashMap<>();
|
|
||||||
for (PredicatesVo predicatesVo : list) {
|
|
||||||
String name = predicatesVo.getName();
|
|
||||||
List<String> args1 = predicatesVo.getArgs();
|
|
||||||
groupedPredicates.computeIfAbsent(name, k -> new ArrayList<>()).addAll(args1);
|
|
||||||
}
|
|
||||||
System.out.println(groupedPredicates);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:21-anolis
|
|
||||||
|
|
||||||
MAINTAINER jeecgos@163.com
|
|
||||||
|
|
||||||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
|
|
||||||
|
|
||||||
RUN mkdir -p /jeecg-cloud-nacos
|
|
||||||
|
|
||||||
WORKDIR /jeecg-cloud-nacos
|
|
||||||
|
|
||||||
EXPOSE 8848
|
|
||||||
|
|
||||||
ADD ./target/jeecg-cloud-nacos-3.9.0.jar ./
|
|
||||||
|
|
||||||
CMD sleep 30;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.9.0.jar
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
访问地址: http://localhost:8848/nacos
|
|
||||||
账号密码：nacos/nacos
|
|
||||||
|
|
||||||
|
|
||||||
# 使用方法
|
|
||||||
|
|
||||||
- 1、目前只做了关闭鉴权模式
|
|
||||||
- 2、此项目与官方同步，只是为了简化微服务部署
|
|
||||||
- 3、如何不用此模块，使用自己的naocs，请创建下面目录中的配置文件
|
|
||||||
目录：jeecg-cloud-nacos/docs/config
|
|
||||||
配置文件： YAML
|
|
||||||
|
|
||||||
|
|
||||||
# 常见问题
|
|
||||||
- UnsupportedOperationException: Cannot determine JNI library name for ARCH='x86' OS='windows 10'
|
|
||||||
解决方案：http://t.zoukankan.com/mindzone-p-15808190.html
|
|
||||||
@ -1,147 +0,0 @@
|
|||||||
spring:
|
|
||||||
datasource:
|
|
||||||
druid:
|
|
||||||
stat-view-servlet:
|
|
||||||
enabled: true
|
|
||||||
loginUsername: admin
|
|
||||||
loginPassword: 123456
|
|
||||||
allow:
|
|
||||||
web-stat-filter:
|
|
||||||
enabled: true
|
|
||||||
dynamic:
|
|
||||||
druid:
|
|
||||||
initial-size: 5
|
|
||||||
min-idle: 5
|
|
||||||
maxActive: 20
|
|
||||||
maxWait: 60000
|
|
||||||
timeBetweenEvictionRunsMillis: 60000
|
|
||||||
minEvictableIdleTimeMillis: 300000
|
|
||||||
validationQuery: SELECT 1 FROM DUAL
|
|
||||||
testWhileIdle: true
|
|
||||||
testOnBorrow: false
|
|
||||||
testOnReturn: false
|
|
||||||
poolPreparedStatements: true
|
|
||||||
maxPoolPreparedStatementPerConnectionSize: 20
|
|
||||||
filters: stat,wall,slf4j
|
|
||||||
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
|
||||||
datasource:
|
|
||||||
master:
|
|
||||||
url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
||||||
username: root
|
|
||||||
password: root
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
data:
|
|
||||||
redis:
|
|
||||||
database: 0
|
|
||||||
host: jeecg-boot-redis
|
|
||||||
password:
|
|
||||||
port: 6379
|
|
||||||
rabbitmq:
|
|
||||||
host: jeecg-boot-rabbitmq
|
|
||||||
username: guest
|
|
||||||
password: guest
|
|
||||||
port: 5672
|
|
||||||
publisher-confirms: true
|
|
||||||
publisher-returns: true
|
|
||||||
virtual-host: /
|
|
||||||
listener:
|
|
||||||
simple:
|
|
||||||
acknowledge-mode: manual
|
|
||||||
concurrency: 1
|
|
||||||
max-concurrency: 1
|
|
||||||
retry:
|
|
||||||
enabled: true
|
|
||||||
minidao:
|
|
||||||
base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
|
|
||||||
jeecg:
|
|
||||||
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
|
|
||||||
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
|
|
||||||
uploadType: local
|
|
||||||
domainUrl:
|
|
||||||
pc: http://localhost:3100
|
|
||||||
app: http://localhost:8051
|
|
||||||
path:
|
|
||||||
upload: /opt/upFiles
|
|
||||||
webapp: /opt/webapp
|
|
||||||
shiro:
|
|
||||||
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
|
|
||||||
oss:
|
|
||||||
endpoint: oss-cn-beijing.aliyuncs.com
|
|
||||||
accessKey: ??
|
|
||||||
secretKey: ??
|
|
||||||
bucketName: jeecgdev
|
|
||||||
staticDomain: ??
|
|
||||||
elasticsearch:
|
|
||||||
cluster-name: jeecg-ES
|
|
||||||
cluster-nodes: jeecg-boot-es:9200
|
|
||||||
check-enabled: false
|
|
||||||
file-view-domain: 127.0.0.1:8012
|
|
||||||
minio:
|
|
||||||
minio_url: http://minio.jeecg.com
|
|
||||||
minio_name: ??
|
|
||||||
minio_pass: ??
|
|
||||||
bucketName: otatest
|
|
||||||
jmreport:
|
|
||||||
mode: dev
|
|
||||||
is_verify_token: false
|
|
||||||
verify_methods: remove,delete,save,add,update
|
|
||||||
wps:
|
|
||||||
domain: https://wwo.wps.cn/office/
|
|
||||||
appid: ??
|
|
||||||
appsecret: ??
|
|
||||||
xxljob:
|
|
||||||
enabled: false
|
|
||||||
adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin
|
|
||||||
appname: ${spring.application.name}
|
|
||||||
accessToken: ''
|
|
||||||
logPath: logs/jeecg/job/jobhandler/
|
|
||||||
logRetentionDays: 30
|
|
||||||
redisson:
|
|
||||||
address: jeecg-boot-redis:6379
|
|
||||||
password:
|
|
||||||
type: STANDALONE
|
|
||||||
enabled: true
|
|
||||||
logging:
|
|
||||||
level:
|
|
||||||
org.jeecg.modules.system.mapper : info
|
|
||||||
cas:
|
|
||||||
prefixUrl: http://localhost:8888/cas
|
|
||||||
knife4j:
|
|
||||||
production: false
|
|
||||||
basic:
|
|
||||||
enable: false
|
|
||||||
username: jeecg
|
|
||||||
password: jeecg1314
|
|
||||||
justauth:
|
|
||||||
enabled: true
|
|
||||||
type:
|
|
||||||
GITHUB:
|
|
||||||
client-id: ??
|
|
||||||
client-secret: ??
|
|
||||||
redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback
|
|
||||||
WECHAT_ENTERPRISE:
|
|
||||||
client-id: ??
|
|
||||||
client-secret: ??
|
|
||||||
redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback
|
|
||||||
agent-id: ??
|
|
||||||
DINGTALK:
|
|
||||||
client-id: ??
|
|
||||||
client-secret: ??
|
|
||||||
redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback
|
|
||||||
cache:
|
|
||||||
type: default
|
|
||||||
prefix: 'demo::'
|
|
||||||
timeout: 1h
|
|
||||||
third-app:
|
|
||||||
enabled: false
|
|
||||||
type:
|
|
||||||
WECHAT_ENTERPRISE:
|
|
||||||
enabled: false
|
|
||||||
client-id: ??
|
|
||||||
client-secret: ??
|
|
||||||
agent-id: ??
|
|
||||||
DINGTALK:
|
|
||||||
enabled: false
|
|
||||||
client-id: ??
|
|
||||||
client-secret: ??
|
|
||||||
agent-id: ??
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
jeecg:
|
|
||||||
route:
|
|
||||||
config:
|
|
||||||
#type:database nacos yml
|
|
||||||
data-type: database
|
|
||||||
group: DEFAULT_GROUP
|
|
||||||
data-id: jeecg-gateway-router
|
|
||||||
spring:
|
|
||||||
data:
|
|
||||||
redis:
|
|
||||||
database: 0
|
|
||||||
host: jeecg-boot-redis
|
|
||||||
port: 6379
|
|
||||||
password:
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
[{
|
|
||||||
"id": "jeecg-system",
|
|
||||||
"order": 0,
|
|
||||||
"predicates": [{
|
|
||||||
"name": "Path",
|
|
||||||
"args": {
|
|
||||||
"_genkey_0": "/sys/**",
|
|
||||||
"_genkey_1": "/jmreport/**",
|
|
||||||
"_genkey_3": "/online/**",
|
|
||||||
"_genkey_4": "/generic/**"
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
"filters": [],
|
|
||||||
"uri": "lb://jeecg-system"
|
|
||||||
}, {
|
|
||||||
"id": "jeecg-demo",
|
|
||||||
"order": 1,
|
|
||||||
"predicates": [{
|
|
||||||
"name": "Path",
|
|
||||||
"args": {
|
|
||||||
"_genkey_0": "/mock/**",
|
|
||||||
"_genkey_1": "/test/**",
|
|
||||||
"_genkey_2": "/bigscreen/template1/**",
|
|
||||||
"_genkey_3": "/bigscreen/template2/**"
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
"filters": [],
|
|
||||||
"uri": "lb://jeecg-demo"
|
|
||||||
}, {
|
|
||||||
"id": "jeecg-system-websocket",
|
|
||||||
"order": 2,
|
|
||||||
"predicates": [{
|
|
||||||
"name": "Path",
|
|
||||||
"args": {
|
|
||||||
"_genkey_0": "/websocket/**",
|
|
||||||
"_genkey_1": "/newsWebsocket/**"
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
"filters": [],
|
|
||||||
"uri": "lb:ws://jeecg-system"
|
|
||||||
}, {
|
|
||||||
"id": "jeecg-demo-websocket",
|
|
||||||
"order": 3,
|
|
||||||
"predicates": [{
|
|
||||||
"name": "Path",
|
|
||||||
"args": {
|
|
||||||
"_genkey_0": "/vxeSocket/**"
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
"filters": [],
|
|
||||||
"uri": "lb:ws://jeecg-demo"
|
|
||||||
}]
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
server:
|
|
||||||
tomcat:
|
|
||||||
max-swallow-size: -1
|
|
||||||
error:
|
|
||||||
include-exception: true
|
|
||||||
include-stacktrace: ALWAYS
|
|
||||||
include-message: ALWAYS
|
|
||||||
compression:
|
|
||||||
enabled: true
|
|
||||||
min-response-size: 1024
|
|
||||||
mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
|
|
||||||
management:
|
|
||||||
health:
|
|
||||||
mail:
|
|
||||||
enabled: false
|
|
||||||
endpoints:
|
|
||||||
web:
|
|
||||||
exposure:
|
|
||||||
include: "*"
|
|
||||||
health:
|
|
||||||
sensitive: true
|
|
||||||
endpoint:
|
|
||||||
health:
|
|
||||||
show-details: ALWAYS
|
|
||||||
spring:
|
|
||||||
servlet:
|
|
||||||
multipart:
|
|
||||||
max-file-size: 10MB
|
|
||||||
max-request-size: 10MB
|
|
||||||
mail:
|
|
||||||
host: smtp.163.com
|
|
||||||
username: jeecgos@163.com
|
|
||||||
password: ??
|
|
||||||
properties:
|
|
||||||
mail:
|
|
||||||
smtp:
|
|
||||||
auth: true
|
|
||||||
starttls:
|
|
||||||
enable: true
|
|
||||||
required: true
|
|
||||||
quartz:
|
|
||||||
job-store-type: jdbc
|
|
||||||
initialize-schema: embedded
|
|
||||||
auto-startup: false
|
|
||||||
startup-delay: 1s
|
|
||||||
overwrite-existing-jobs: true
|
|
||||||
properties:
|
|
||||||
org:
|
|
||||||
quartz:
|
|
||||||
scheduler:
|
|
||||||
instanceName: MyScheduler
|
|
||||||
instanceId: AUTO
|
|
||||||
jobStore:
|
|
||||||
class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
|
|
||||||
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
|
|
||||||
tablePrefix: QRTZ_
|
|
||||||
isClustered: true
|
|
||||||
misfireThreshold: 12000
|
|
||||||
clusterCheckinInterval: 15000
|
|
||||||
threadPool:
|
|
||||||
class: org.quartz.simpl.SimpleThreadPool
|
|
||||||
threadCount: 10
|
|
||||||
threadPriority: 5
|
|
||||||
threadsInheritContextClassLoaderOfInitializingThread: true
|
|
||||||
jackson:
|
|
||||||
date-format: yyyy-MM-dd HH:mm:ss
|
|
||||||
time-zone: GMT+8
|
|
||||||
aop:
|
|
||||||
proxy-target-class: true
|
|
||||||
activiti:
|
|
||||||
check-process-definitions: false
|
|
||||||
async-executor-activate: false
|
|
||||||
job-executor-activate: false
|
|
||||||
jpa:
|
|
||||||
open-in-view: false
|
|
||||||
freemarker:
|
|
||||||
suffix: .ftl
|
|
||||||
content-type: text/html
|
|
||||||
charset: UTF-8
|
|
||||||
cache: false
|
|
||||||
prefer-file-system-access: false
|
|
||||||
template-loader-path:
|
|
||||||
- classpath:/templates
|
|
||||||
mvc:
|
|
||||||
static-path-pattern: /**
|
|
||||||
pathmatch:
|
|
||||||
matching-strategy: ant_path_matcher
|
|
||||||
resource:
|
|
||||||
static-locations: classpath:/static/,classpath:/public/
|
|
||||||
autoconfigure:
|
|
||||||
exclude: com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure
|
|
||||||
mybatis-plus:
|
|
||||||
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
|
|
||||||
global-config:
|
|
||||||
banner: false
|
|
||||||
db-config:
|
|
||||||
id-type: ASSIGN_ID
|
|
||||||
table-underline: true
|
|
||||||
configuration:
|
|
||||||
call-setters-on-nulls: true
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,98 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jeecg-cloud-nacos</artifactId>
|
|
||||||
<name>jeecg-cloud-nacos</name>
|
|
||||||
<description>nacos启动模块</description>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>2.7.18</version>
|
|
||||||
<relativePath/>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>aliyun</id>
|
|
||||||
<name>aliyun Repository</name>
|
|
||||||
<url>https://maven.aliyun.com/repository/public</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>jeecg</id>
|
|
||||||
<name>jeecg Repository</name>
|
|
||||||
<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<log4j2.version>2.17.0</log4j2.version>
|
|
||||||
<nacos.version>2.3.2</nacos.version>
|
|
||||||
<dm8.version>8.1.3.140</dm8.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.tomcat.embed</groupId>
|
|
||||||
<artifactId>tomcat-embed-jasper</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.nacos</groupId>
|
|
||||||
<artifactId>nacos-naming</artifactId>
|
|
||||||
<version>${nacos.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.nacos</groupId>
|
|
||||||
<artifactId>nacos-istio</artifactId>
|
|
||||||
<version>${nacos.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.nacos</groupId>
|
|
||||||
<artifactId>nacos-config</artifactId>
|
|
||||||
<version>${nacos.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.nacos</groupId>
|
|
||||||
<artifactId>nacos-console</artifactId>
|
|
||||||
<version>${nacos.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--达梦数据库驱动 版本号1-3-26-2023.07.26-197096-20046-ENT -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.dameng</groupId>
|
|
||||||
<artifactId>DmJdbcDriver18</artifactId>
|
|
||||||
<version>${dm8.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.dameng</groupId>
|
|
||||||
<artifactId>DmDialect-for-hibernate5.0</artifactId>
|
|
||||||
<version>${dm8.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
package com.alibaba.nacos;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.boot.web.servlet.ServletComponentScan;
|
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
||||||
import org.springframework.ui.Model;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Nacos 启动类
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
*/
|
|
||||||
@SpringBootApplication(scanBasePackages = "com.alibaba.nacos")
|
|
||||||
@ServletComponentScan
|
|
||||||
@EnableScheduling
|
|
||||||
public class JeecgNacosApplication {
|
|
||||||
|
|
||||||
/** 是否单机模式启动 */
|
|
||||||
private static String standalone = "true";
|
|
||||||
/** 是否开启鉴权 */
|
|
||||||
private static String enabled = "false";
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
System.setProperty("nacos.standalone", standalone);
|
|
||||||
System.setProperty("nacos.core.auth.enabled", enabled);
|
|
||||||
// //一旦Nacos初始化，用户名nacos将不能被修改，但你可以通过控制台或API来修改密码 https://nacos.io/en/blog/faq/nacos-user-question-history8420
|
|
||||||
// System.setProperty("nacos.core.auth.default.username", "nacos");
|
|
||||||
// System.setProperty("nacos.core.auth.default.password", "nacos");
|
|
||||||
System.setProperty("server.tomcat.basedir","logs");
|
|
||||||
//自定义启动端口号
|
|
||||||
System.setProperty("server.port","8848");
|
|
||||||
SpringApplication.run(JeecgNacosApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 默认跳转首页
|
|
||||||
*
|
|
||||||
* @param model
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@GetMapping("/")
|
|
||||||
public String index(Model model, HttpServletResponse response) {
|
|
||||||
// 视图重定向 - 跳转
|
|
||||||
return "/nacos";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
server:
|
|
||||||
servlet:
|
|
||||||
contextPath: /nacos
|
|
||||||
tomcat:
|
|
||||||
accesslog:
|
|
||||||
enabled: true
|
|
||||||
pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
|
|
||||||
basedir: ''
|
|
||||||
spring:
|
|
||||||
sql:
|
|
||||||
init:
|
|
||||||
platform: dm
|
|
||||||
db:
|
|
||||||
pool:
|
|
||||||
config:
|
|
||||||
driverClassName: dm.jdbc.driver.DmDriver
|
|
||||||
num: 1
|
|
||||||
password:
|
|
||||||
'0': SYSDBA
|
|
||||||
url:
|
|
||||||
'0': jdbc:dm://192.168.1.188:30236/DMSERVER?schema=NACOS&compatibleMode=mysql&ignoreCase=true&ENCODING=utf-8
|
|
||||||
user:
|
|
||||||
'0': SYSDBA
|
|
||||||
management:
|
|
||||||
metrics:
|
|
||||||
export:
|
|
||||||
elastic:
|
|
||||||
enabled: false
|
|
||||||
influx:
|
|
||||||
enabled: false
|
|
||||||
nacos:
|
|
||||||
core:
|
|
||||||
auth:
|
|
||||||
enabled: false
|
|
||||||
caching:
|
|
||||||
enabled: true
|
|
||||||
server:
|
|
||||||
identity:
|
|
||||||
key: example
|
|
||||||
value: example
|
|
||||||
plugin:
|
|
||||||
nacos:
|
|
||||||
token:
|
|
||||||
expire:
|
|
||||||
seconds: 18000
|
|
||||||
secret:
|
|
||||||
key: SecretKey01234567890123456789012345345678999987654901234567890123456789
|
|
||||||
system:
|
|
||||||
type: nacos
|
|
||||||
istio:
|
|
||||||
mcp:
|
|
||||||
server:
|
|
||||||
enabled: false
|
|
||||||
naming:
|
|
||||||
empty-service:
|
|
||||||
auto-clean: true
|
|
||||||
clean:
|
|
||||||
initial-delay-ms: 50000
|
|
||||||
period-time-ms: 30000
|
|
||||||
security:
|
|
||||||
ignore:
|
|
||||||
urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
|
|
||||||
standalone: true
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
server:
|
|
||||||
servlet:
|
|
||||||
contextPath: /nacos
|
|
||||||
tomcat:
|
|
||||||
accesslog:
|
|
||||||
enabled: true
|
|
||||||
pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
|
|
||||||
basedir: ''
|
|
||||||
spring:
|
|
||||||
sql:
|
|
||||||
init:
|
|
||||||
platform: mysql
|
|
||||||
db:
|
|
||||||
num: 1
|
|
||||||
password:
|
|
||||||
'0': ${MYSQL-PWD:root}
|
|
||||||
url:
|
|
||||||
'0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
|
|
||||||
user:
|
|
||||||
'0': ${MYSQL-USER:root}
|
|
||||||
management:
|
|
||||||
metrics:
|
|
||||||
export:
|
|
||||||
elastic:
|
|
||||||
enabled: false
|
|
||||||
influx:
|
|
||||||
enabled: false
|
|
||||||
nacos:
|
|
||||||
core:
|
|
||||||
auth:
|
|
||||||
enabled: false
|
|
||||||
caching:
|
|
||||||
enabled: true
|
|
||||||
server:
|
|
||||||
identity:
|
|
||||||
key: nacos
|
|
||||||
value: nacos
|
|
||||||
plugin:
|
|
||||||
nacos:
|
|
||||||
token:
|
|
||||||
expire:
|
|
||||||
seconds: 18000
|
|
||||||
secret:
|
|
||||||
key: VGhpc0lzTXlDdXN0b21TZWNyZXRLZXkwMTIzNDU2Nzg=
|
|
||||||
system:
|
|
||||||
type: nacos
|
|
||||||
istio:
|
|
||||||
mcp:
|
|
||||||
server:
|
|
||||||
enabled: false
|
|
||||||
naming:
|
|
||||||
empty-service:
|
|
||||||
auto-clean: true
|
|
||||||
clean:
|
|
||||||
initial-delay-ms: 50000
|
|
||||||
period-time-ms: 30000
|
|
||||||
security:
|
|
||||||
ignore:
|
|
||||||
urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
|
|
||||||
standalone: true
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
spring:
|
|
||||||
profiles:
|
|
||||||
active: mysql
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
|
|
||||||
|
|
||||||
MAINTAINER jeecgos@163.com
|
|
||||||
|
|
||||||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
|
|
||||||
|
|
||||||
RUN mkdir -p /jeecg-demo-cloud
|
|
||||||
|
|
||||||
WORKDIR /jeecg-demo-cloud
|
|
||||||
|
|
||||||
EXPOSE 7002
|
|
||||||
|
|
||||||
ADD ./target/jeecg-demo-cloud-start-3.9.0.jar ./
|
|
||||||
|
|
||||||
CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.9.0.jar
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
采用jar启动必须设置-Dfile.encoding=utf-8 ，不然会加载不到naocs文件
|
|
||||||
|
|
||||||
java -Dfile.encoding=utf-8 -jar xxxx.jar
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>jeecg-server-cloud</artifactId>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<artifactId>jeecg-demo-cloud-start</artifactId>
|
|
||||||
<description>Demo微服务启动</description>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!--引入微服务启动依赖 starter-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-cloud</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--system cloud api-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-system-cloud-api</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-job</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 引入demo模块 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-module-demo</artifactId>
|
|
||||||
<version>${jeecgboot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
package org.jeecg;
|
|
||||||
|
|
||||||
import com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration;
|
|
||||||
import org.jeecg.common.base.BaseMap;
|
|
||||||
import org.jeecg.common.constant.GlobalConstants;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.CommandLineRunner;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
@EnableFeignClients
|
|
||||||
@ImportAutoConfiguration(JustAuthAutoConfiguration.class) // spring boot 3.x justauth 兼容性处理
|
|
||||||
public class JeecgDemoCloudApplication implements CommandLineRunner {
|
|
||||||
@Autowired
|
|
||||||
private RedisTemplate<String, Object> redisTemplate;
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(JeecgDemoCloudApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 启动的时候，触发下gateway网关刷新
|
|
||||||
*
|
|
||||||
* 解决： 先启动gateway后启动服务，Swagger接口文档访问不通的问题
|
|
||||||
* @param args
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void run(String... args) {
|
|
||||||
BaseMap params = new BaseMap();
|
|
||||||
params.put(GlobalConstants.HANDLER_NAME, GlobalConstants.LODER_ROUDER_HANDLER);
|
|
||||||
//刷新网关
|
|
||||||
redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
server:
|
|
||||||
port: 7002
|
|
||||||
|
|
||||||
spring:
|
|
||||||
application:
|
|
||||||
name: jeecg-demo
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
config:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
group: @config.group@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
username: @config.username@
|
|
||||||
password: @config.password@
|
|
||||||
discovery:
|
|
||||||
server-addr: ${spring.cloud.nacos.config.server-addr}
|
|
||||||
group: @config.group@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
username: @config.username@
|
|
||||||
password: @config.password@
|
|
||||||
config:
|
|
||||||
import:
|
|
||||||
- optional:nacos:jeecg.yaml
|
|
||||||
- optional:nacos:jeecg-@profile.name@.yaml
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration debug="false">
|
|
||||||
<!--定义日志文件的存储地址 -->
|
|
||||||
<property name="LOG_HOME" value="../logs" />
|
|
||||||
|
|
||||||
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 按照每天生成日志文件 -->
|
|
||||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
|
||||||
<!--日志文件输出的文件名 -->
|
|
||||||
<FileNamePattern>${LOG_HOME}/jeecg-demo-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
|
|
||||||
<!--日志文件保留天数 -->
|
|
||||||
<MaxHistory>30</MaxHistory>
|
|
||||||
<maxFileSize>10MB</maxFileSize>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 生成 error html格式日志开始 -->
|
|
||||||
<appender name="HTML" class="ch.qos.logback.core.FileAppender">
|
|
||||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
|
||||||
<!--设置日志级别,过滤掉info日志,只输入error日志-->
|
|
||||||
<level>ERROR</level>
|
|
||||||
</filter>
|
|
||||||
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
|
|
||||||
<layout class="ch.qos.logback.classic.html.HTMLLayout">
|
|
||||||
<pattern>%p%d%msg%M%F{32}%L</pattern>
|
|
||||||
</layout>
|
|
||||||
</encoder>
|
|
||||||
<file>${LOG_HOME}/error-log.html</file>
|
|
||||||
</appender>
|
|
||||||
<!-- 生成 error html格式日志结束 -->
|
|
||||||
|
|
||||||
<!-- 每天生成一个html格式的日志开始 -->
|
|
||||||
<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
|
||||||
<!--日志文件输出的文件名 -->
|
|
||||||
<FileNamePattern>${LOG_HOME}/jeecg-demo-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
|
|
||||||
<!--日志文件保留天数 -->
|
|
||||||
<MaxHistory>30</MaxHistory>
|
|
||||||
<MaxFileSize>10MB</MaxFileSize>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
|
|
||||||
<layout class="ch.qos.logback.classic.html.HTMLLayout">
|
|
||||||
<pattern>%p%d%msg%M%F{32}%L</pattern>
|
|
||||||
</layout>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
<!-- 每天生成一个html格式的日志结束 -->
|
|
||||||
|
|
||||||
<!--myibatis log configure -->
|
|
||||||
<logger name="com.apache.ibatis" level="TRACE" />
|
|
||||||
<logger name="java.sql.Connection" level="DEBUG" />
|
|
||||||
<logger name="java.sql.Statement" level="DEBUG" />
|
|
||||||
<logger name="java.sql.PreparedStatement" level="DEBUG" />
|
|
||||||
|
|
||||||
<!-- 日志输出级别 -->
|
|
||||||
<root level="INFO">
|
|
||||||
<appender-ref ref="STDOUT" />
|
|
||||||
<appender-ref ref="FILE" />
|
|
||||||
<appender-ref ref="HTML" />
|
|
||||||
<appender-ref ref="FILE_HTML" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
</configuration>
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
|
|
||||||
|
|
||||||
MAINTAINER jeecgos@163.com
|
|
||||||
|
|
||||||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
|
|
||||||
|
|
||||||
RUN mkdir -p /jeecg-system-cloud
|
|
||||||
|
|
||||||
WORKDIR /jeecg-system-cloud
|
|
||||||
|
|
||||||
EXPOSE 7001
|
|
||||||
|
|
||||||
ADD ./target/jeecg-system-cloud-start-3.9.0.jar ./
|
|
||||||
|
|
||||||
CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.9.0.jar
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
采用jar启动必须设置-Dfile.encoding=utf-8 ，不然会加载不到naocs文件
|
|
||||||
|
|
||||||
java -Dfile.encoding=utf-8 -jar xxxx.jar
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>jeecg-server-cloud</artifactId>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jeecg-system-cloud-start</artifactId>
|
|
||||||
<description>System项目微服务启动</description>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!-- 引入jeecg-boot-starter-cloud依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-cloud</artifactId>
|
|
||||||
<!-- 3.2版本号后，可选择是否排除jeecg-system-cloud-api，不排除会优先通过fegin调用接口
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-system-cloud-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>-->
|
|
||||||
</dependency>
|
|
||||||
<!-- jeecg-system-biz依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-system-biz</artifactId>
|
|
||||||
<!-- 排除demo模块，demo模块采用微服务独立启动 -->
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-module-demo</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-job</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- feign 熔断限流、分布式锁、xxljob示例
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-cloud-test-more</artifactId>
|
|
||||||
<version>${jeecgboot.version}</version>
|
|
||||||
</dependency>-->
|
|
||||||
<!-- rabbitmq例子
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-cloud-test-rabbitmq</artifactId>
|
|
||||||
<version>${jeecgboot.version}</version>
|
|
||||||
</dependency>-->
|
|
||||||
<!-- rocketmq例子-->
|
|
||||||
<!--<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-cloud-test-rocketmq</artifactId>
|
|
||||||
<version>${jeecgboot.version}</version>
|
|
||||||
</dependency>-->
|
|
||||||
<!-- 分布式事务例子
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-cloud-test-seata</artifactId>
|
|
||||||
<version>${jeecgboot.version}</version>
|
|
||||||
</dependency>-->
|
|
||||||
<!-- 分库分表例子
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-cloud-test-shardingsphere</artifactId>
|
|
||||||
<version>${jeecgboot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-shardingsphere-nacos</artifactId>
|
|
||||||
</dependency>-->
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
package org.jeecg;
|
|
||||||
|
|
||||||
import com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.jeecg.common.base.BaseMap;
|
|
||||||
import org.jeecg.common.constant.GlobalConstants;
|
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.CommandLineRunner;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
|
|
||||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
|
||||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
import org.springframework.context.ConfigurableApplicationContext;
|
|
||||||
import org.springframework.core.env.Environment;
|
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 微服务启动类（采用此类启动项目为微服务模式）
|
|
||||||
* 特别提醒:
|
|
||||||
* 1、需要先初始化Nacos的数据库脚本，db/tables_nacos.sql
|
|
||||||
* 2.需要集成mogodb请删除 exclude={MongoAutoConfiguration.class}
|
|
||||||
*
|
|
||||||
* @author jeecg
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@SpringBootApplication
|
|
||||||
@EnableFeignClients(basePackages = {"org.jeecg"})
|
|
||||||
@EnableScheduling
|
|
||||||
@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
|
|
||||||
@ImportAutoConfiguration(JustAuthAutoConfiguration.class) // spring boot 3.x justauth 兼容性处理
|
|
||||||
public class JeecgSystemCloudApplication extends SpringBootServletInitializer implements CommandLineRunner {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private RedisTemplate<String, Object> redisTemplate;
|
|
||||||
@Override
|
|
||||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
|
||||||
return application.sources(JeecgSystemCloudApplication.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void main(String[] args) throws UnknownHostException {
|
|
||||||
ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemCloudApplication.class, args);
|
|
||||||
Environment env = application.getEnvironment();
|
|
||||||
String ip = InetAddress.getLocalHost().getHostAddress();
|
|
||||||
String port = env.getProperty("server.port");
|
|
||||||
String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
|
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
|
||||||
"Application Jeecg-Boot is running! Access URLs:\n\t" +
|
|
||||||
"Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
|
|
||||||
"External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
|
||||||
"Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
|
|
||||||
"----------------------------------------------------------");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 启动的时候，触发下gateway网关刷新
|
|
||||||
*
|
|
||||||
* 解决： 先启动gateway后启动服务，Swagger接口文档访问不通的问题
|
|
||||||
* @param args
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void run(String... args) {
|
|
||||||
BaseMap params = new BaseMap();
|
|
||||||
params.put(GlobalConstants.HANDLER_NAME, GlobalConstants.LODER_ROUDER_HANDLER);
|
|
||||||
//刷新网关
|
|
||||||
redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
server:
|
|
||||||
port: 7001
|
|
||||||
|
|
||||||
spring:
|
|
||||||
application:
|
|
||||||
name: jeecg-system
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
config:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
group: @config.group@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
username: @config.username@
|
|
||||||
password: @config.password@
|
|
||||||
discovery:
|
|
||||||
server-addr: ${spring.cloud.nacos.config.server-addr}
|
|
||||||
group: @config.group@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
username: @config.username@
|
|
||||||
password: @config.password@
|
|
||||||
config:
|
|
||||||
import:
|
|
||||||
- optional:classpath:config/application-liteflow.yml
|
|
||||||
- optional:nacos:jeecg.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@
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#code_generate_project_path
|
|
||||||
project_path=E:\\workspace\\jeecg-boot
|
|
||||||
#bussi_package[User defined]
|
|
||||||
bussi_package=org.jeecg.modules.demo
|
|
||||||
|
|
||||||
|
|
||||||
#default code path
|
|
||||||
#source_root_package=src
|
|
||||||
#webroot_package=WebRoot
|
|
||||||
|
|
||||||
#maven code path
|
|
||||||
source_root_package=src.main.java
|
|
||||||
webroot_package=src.main.webapp
|
|
||||||
|
|
||||||
#ftl resource url
|
|
||||||
templatepath=/jeecg/code-template
|
|
||||||
system_encoding=utf-8
|
|
||||||
|
|
||||||
#db Table id [User defined]
|
|
||||||
db_table_id=id
|
|
||||||
|
|
||||||
#db convert flag[true/false]
|
|
||||||
db_filed_convert=true
|
|
||||||
|
|
||||||
#page Search Field num [User defined]
|
|
||||||
page_search_filed_num=1
|
|
||||||
#page_filter_fields
|
|
||||||
page_filter_fields=create_time,create_by,update_time,update_by
|
|
||||||
exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
#mysql
|
|
||||||
diver_name=com.mysql.jdbc.Driver
|
|
||||||
url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
|
|
||||||
username=root
|
|
||||||
password=root
|
|
||||||
database_name=jeecg-boot
|
|
||||||
|
|
||||||
#oracle
|
|
||||||
#diver_name=oracle.jdbc.driver.OracleDriver
|
|
||||||
#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL
|
|
||||||
#username=scott
|
|
||||||
#password=tiger
|
|
||||||
#database_name=ORCL
|
|
||||||
|
|
||||||
#postgre
|
|
||||||
#diver_name=org.postgresql.Driver
|
|
||||||
#url=jdbc:postgresql://localhost:5432/jeecg
|
|
||||||
#username=postgres
|
|
||||||
#password=postgres
|
|
||||||
#database_name=jeecg
|
|
||||||
|
|
||||||
#SQLServer2005\u4ee5\u4e0a
|
|
||||||
#diver_name=org.hibernate.dialect.SQLServerDialect
|
|
||||||
#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
|
|
||||||
#username=sa
|
|
||||||
#password=SA
|
|
||||||
#database_name=jeecg
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration debug="false">
|
|
||||||
<!--定义日志文件的存储地址 -->
|
|
||||||
<property name="LOG_HOME" value="../logs" />
|
|
||||||
|
|
||||||
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 按照每天生成日志文件 -->
|
|
||||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
|
||||||
<!--日志文件输出的文件名 -->
|
|
||||||
<FileNamePattern>${LOG_HOME}/jeecg-system-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
|
|
||||||
<!--日志文件保留天数 -->
|
|
||||||
<MaxHistory>30</MaxHistory>
|
|
||||||
<maxFileSize>10MB</maxFileSize>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
|
||||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
|
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 生成 error html格式日志开始 -->
|
|
||||||
<appender name="HTML" class="ch.qos.logback.core.FileAppender">
|
|
||||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
|
||||||
<!--设置日志级别,过滤掉info日志,只输入error日志-->
|
|
||||||
<level>ERROR</level>
|
|
||||||
</filter>
|
|
||||||
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
|
|
||||||
<layout class="ch.qos.logback.classic.html.HTMLLayout">
|
|
||||||
<pattern>%p%d%msg%M%F{32}%L</pattern>
|
|
||||||
</layout>
|
|
||||||
</encoder>
|
|
||||||
<file>${LOG_HOME}/error-log.html</file>
|
|
||||||
</appender>
|
|
||||||
<!-- 生成 error html格式日志结束 -->
|
|
||||||
|
|
||||||
<!-- 每天生成一个html格式的日志开始 -->
|
|
||||||
<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
|
||||||
<!--日志文件输出的文件名 -->
|
|
||||||
<FileNamePattern>${LOG_HOME}/jeecg-system-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
|
|
||||||
<!--日志文件保留天数 -->
|
|
||||||
<MaxHistory>30</MaxHistory>
|
|
||||||
<MaxFileSize>10MB</MaxFileSize>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
|
|
||||||
<layout class="ch.qos.logback.classic.html.HTMLLayout">
|
|
||||||
<pattern>%p%d%msg%M%F{32}%L</pattern>
|
|
||||||
</layout>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
<!-- 每天生成一个html格式的日志结束 -->
|
|
||||||
|
|
||||||
<!--myibatis log configure -->
|
|
||||||
<logger name="com.apache.ibatis" level="TRACE" />
|
|
||||||
<logger name="java.sql.Connection" level="DEBUG" />
|
|
||||||
<logger name="java.sql.Statement" level="DEBUG" />
|
|
||||||
<logger name="java.sql.PreparedStatement" level="DEBUG" />
|
|
||||||
|
|
||||||
<!-- 日志输出级别 -->
|
|
||||||
<root level="INFO">
|
|
||||||
<appender-ref ref="STDOUT" />
|
|
||||||
<appender-ref ref="FILE" />
|
|
||||||
<appender-ref ref="HTML" />
|
|
||||||
<appender-ref ref="FILE_HTML" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
</configuration>
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
http://localhost:9111
|
|
||||||
账号密码：admin/admin
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>jeecg-visual</artifactId>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jeecg-cloud-monitor</artifactId>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!--Spring Boot Admin Server监控服务端-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.codecentric</groupId>
|
|
||||||
<artifactId>spring-boot-admin-starter-server</artifactId>
|
|
||||||
<version>3.5.2</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-properties-migrator</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--安全模块-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<!--undertow容器-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-undertow</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
<filtering>true</filtering>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package org.jeecg.monitor;
|
|
||||||
|
|
||||||
import de.codecentric.boot.admin.server.config.EnableAdminServer;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 监控服务
|
|
||||||
* @author zyf
|
|
||||||
* @date: 2022/4/21 10:55
|
|
||||||
*/
|
|
||||||
@SpringBootApplication
|
|
||||||
@EnableAdminServer
|
|
||||||
public class JeecgMonitorApplication {
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(JeecgMonitorApplication.class, args);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
package org.jeecg.monitor.config;
|
|
||||||
|
|
||||||
import de.codecentric.boot.admin.server.config.AdminServerProperties;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.security.config.Customizer;
|
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
|
||||||
import org.springframework.security.web.SecurityFilterChain;
|
|
||||||
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
|
|
||||||
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author scott
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
public class SecuritySecureConfig {
|
|
||||||
|
|
||||||
private final String adminContextPath;
|
|
||||||
|
|
||||||
public SecuritySecureConfig(AdminServerProperties adminServerProperties) {
|
|
||||||
this.adminContextPath = adminServerProperties.getContextPath();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public SecurityFilterChain configure(HttpSecurity http) throws Exception {
|
|
||||||
// 登录成功处理类
|
|
||||||
SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
|
|
||||||
successHandler.setTargetUrlParameter("redirectTo");
|
|
||||||
successHandler.setDefaultTargetUrl(adminContextPath + "/");
|
|
||||||
|
|
||||||
http.authorizeRequests(authorize -> {
|
|
||||||
try {
|
|
||||||
authorize
|
|
||||||
|
|
||||||
//静态文件允许访问
|
|
||||||
.requestMatchers(adminContextPath + "/assets/**").permitAll()
|
|
||||||
//登录页面允许访问
|
|
||||||
.requestMatchers(adminContextPath + "/login", "/css/**", "/js/**", "/image/*").permitAll()
|
|
||||||
//其他所有请求需要登录
|
|
||||||
.anyRequest().authenticated()
|
|
||||||
.and()
|
|
||||||
//登录页面配置，用于替换security默认页面
|
|
||||||
.formLogin(formLogin -> formLogin.loginPage(adminContextPath + "/login").successHandler(successHandler))
|
|
||||||
//登出页面配置，用于替换security默认页面
|
|
||||||
.logout(logout -> logout.logoutUrl(adminContextPath + "/logout"))
|
|
||||||
.httpBasic(Customizer.withDefaults())
|
|
||||||
.csrf(csrf -> csrf.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
|
|
||||||
.ignoringRequestMatchers(
|
|
||||||
"/instances",
|
|
||||||
"/actuator/**")
|
|
||||||
);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
return http.build();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
server:
|
|
||||||
port: 9111
|
|
||||||
spring:
|
|
||||||
boot:
|
|
||||||
admin:
|
|
||||||
ui:
|
|
||||||
title: JeecgCloud监控中心
|
|
||||||
client:
|
|
||||||
instance:
|
|
||||||
metadata:
|
|
||||||
tags:
|
|
||||||
environment: local
|
|
||||||
security:
|
|
||||||
user:
|
|
||||||
name: "admin"
|
|
||||||
password: "admin"
|
|
||||||
application:
|
|
||||||
name: jeecg-monitor
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
discovery:
|
|
||||||
server-addr: @config.server-addr@
|
|
||||||
namespace: @config.namespace@
|
|
||||||
metadata:
|
|
||||||
user.name: ${spring.security.user.name}
|
|
||||||
user.password: ${spring.security.user.password}
|
|
||||||
# 服务端点检查
|
|
||||||
management:
|
|
||||||
httpexchanges:
|
|
||||||
recording:
|
|
||||||
enabled: true
|
|
||||||
endpoints:
|
|
||||||
web:
|
|
||||||
exposure:
|
|
||||||
include: "*"
|
|
||||||
endpoint:
|
|
||||||
health:
|
|
||||||
show-details: always
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
|
|
||||||
|
|
||||||
MAINTAINER jeecgos@163.com
|
|
||||||
|
|
||||||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
|
|
||||||
|
|
||||||
RUN mkdir -p /jeecg-cloud-sentinel
|
|
||||||
|
|
||||||
WORKDIR /jeecg-cloud-sentinel
|
|
||||||
|
|
||||||
EXPOSE 8848
|
|
||||||
|
|
||||||
ADD ./target/jeecg-cloud-sentinel-3.9.0.jar ./
|
|
||||||
|
|
||||||
CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.9.0.jar
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
访问地址: http://localhost:9000
|
|
||||||
账号密码：sentinel/sentinel
|
|
||||||
|
|
||||||
|
|
||||||
# 使用方法
|
|
||||||
|
|
||||||
- 1、第一次登录sentinel内容是空的，必须访问了微服务实例的请求才会出现配置
|
|
||||||
- 2、sentinel做了深度改造，支持持久化到nacos中
|
|
||||||
- 3、目前只针对gateway做的控制，其他服务不需要
|
|
||||||
@ -1,233 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>2.7.18</version>
|
|
||||||
<relativePath/>
|
|
||||||
</parent>
|
|
||||||
<artifactId>jeecg-cloud-sentinel</artifactId>
|
|
||||||
<name>jeecg-cloud-sentinel</name>
|
|
||||||
<description>sentinel启动模块</description>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.cloud</groupId>
|
|
||||||
<artifactId>sentinel-dashboard</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-web-servlet</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-transport-simple-http</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-parameter-flow-control</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-core</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-api-gateway-adapter-common</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-datasource-nacos</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-core</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-core</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-web-servlet</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-core</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-transport-simple-http</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-parameter-flow-control</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-core</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
<artifactId>sentinel-api-gateway-adapter-common</artifactId>
|
|
||||||
<version>1.8.3</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-parameter-flow-control</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>sentinel-core</artifactId>
|
|
||||||
<groupId>com.alibaba.csp</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--undertow容器-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-undertow</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-lang</groupId>
|
|
||||||
<artifactId>commons-lang</artifactId>
|
|
||||||
<version>2.6</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpclient</artifactId>
|
|
||||||
<version>4.5.14</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpcore</artifactId>
|
|
||||||
<version>4.4.5</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpasyncclient</artifactId>
|
|
||||||
<version>4.1.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpcore-nio</artifactId>
|
|
||||||
<version>4.4.6</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<!-- 环境 -->
|
|
||||||
<profiles>
|
|
||||||
<!-- 开发 -->
|
|
||||||
<profile>
|
|
||||||
<id>dev</id>
|
|
||||||
<activation>
|
|
||||||
<!--默认激活配置-->
|
|
||||||
<activeByDefault>true</activeByDefault>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<!--当前环境-->
|
|
||||||
<profile.name>dev</profile.name>
|
|
||||||
<!--Nacos服务地址-->
|
|
||||||
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
|
|
||||||
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
|
|
||||||
<config.namespace>springboot3</config.namespace>
|
|
||||||
<!--Nacos配置分组名称-->
|
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
|
||||||
<!--Nacos用户名-->
|
|
||||||
<config.username></config.username>
|
|
||||||
<!--Nacos密码-->
|
|
||||||
<config.password></config.password>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<!-- 测试 -->
|
|
||||||
<profile>
|
|
||||||
<id>test</id>
|
|
||||||
<properties>
|
|
||||||
<!--当前环境-->
|
|
||||||
<profile.name>test</profile.name>
|
|
||||||
<!--Nacos服务地址-->
|
|
||||||
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
|
|
||||||
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
|
|
||||||
<config.namespace>springboot3</config.namespace>
|
|
||||||
<!--Nacos配置分组名称-->
|
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
|
||||||
<!--Nacos用户名-->
|
|
||||||
<config.username></config.username>
|
|
||||||
<!--Nacos密码-->
|
|
||||||
<config.password></config.password>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<!-- docker打包用 -->
|
|
||||||
<profile>
|
|
||||||
<id>docker</id>
|
|
||||||
<properties>
|
|
||||||
<!--当前环境-->
|
|
||||||
<profile.name>docker</profile.name>
|
|
||||||
<!--Nacos服务地址-->
|
|
||||||
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
|
|
||||||
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
|
|
||||||
<config.namespace>springboot3</config.namespace>
|
|
||||||
<!--Nacos配置分组名称-->
|
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
|
||||||
<!--Nacos用户名-->
|
|
||||||
<config.username></config.username>
|
|
||||||
<!--Nacos密码-->
|
|
||||||
<config.password></config.password>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<!-- 生产 -->
|
|
||||||
<profile>
|
|
||||||
<id>prod</id>
|
|
||||||
<properties>
|
|
||||||
<!--当前环境-->
|
|
||||||
<profile.name>prod</profile.name>
|
|
||||||
<!--Nacos服务地址-->
|
|
||||||
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
|
|
||||||
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
|
|
||||||
<config.namespace>springboot3</config.namespace>
|
|
||||||
<!--Nacos配置分组名称-->
|
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
|
||||||
<!--Nacos用户名-->
|
|
||||||
<config.username></config.username>
|
|
||||||
<!--Nacos密码-->
|
|
||||||
<config.password></config.password>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1999-2018 Alibaba Group Holding Ltd.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.alibaba.csp.sentinel.dashboard;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.context.ConfigurableApplicationContext;
|
|
||||||
import org.springframework.core.env.Environment;
|
|
||||||
import com.alibaba.csp.sentinel.init.InitExecutor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sentinel dashboard application.
|
|
||||||
*
|
|
||||||
* @author Carpenter Lee
|
|
||||||
*/
|
|
||||||
@SpringBootApplication
|
|
||||||
@Slf4j
|
|
||||||
public class JeecgSentinelApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
System.setProperty("csp.sentinel.app.type", "1");
|
|
||||||
triggerSentinelInit();
|
|
||||||
ConfigurableApplicationContext application = SpringApplication.run(JeecgSentinelApplication.class, args);
|
|
||||||
Environment env = application.getEnvironment();
|
|
||||||
// 目前jeecg-sentinel 1.8.3 版本存在alibaba-sentinel 1.8.3版本 启动nacos数据源导致配置不生效的问题，以下为临时处理办法
|
|
||||||
System.getProperties().setProperty("sentinel.dashboard.auth.username", env.getProperty("sentinel.dashboard.auth.username"));
|
|
||||||
System.getProperties().setProperty("sentinel.dashboard.auth.password", env.getProperty("sentinel.dashboard.auth.password"));
|
|
||||||
String port = env.getProperty("server.port");
|
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
|
||||||
"Application SentinelDashboard is running! Access URLs:\n\t" +
|
|
||||||
"Local: \t\thttp://localhost:" + port + "/\n\t" +
|
|
||||||
"----------------------------------------------------------");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void triggerSentinelInit() {
|
|
||||||
new Thread(() -> InitExecutor.doInit()).start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.constants;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* sentinel常量配置
|
|
||||||
* @author zyf
|
|
||||||
*/
|
|
||||||
public class SentinelConStants {
|
|
||||||
public static final String GROUP_ID = "SENTINEL_GROUP";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 流控规则
|
|
||||||
*/
|
|
||||||
public static final String FLOW_DATA_ID_POSTFIX = "-flow-rules";
|
|
||||||
/**
|
|
||||||
* 热点参数
|
|
||||||
*/
|
|
||||||
public static final String PARAM_FLOW_DATA_ID_POSTFIX = "-param-rules";
|
|
||||||
/**
|
|
||||||
* 降级规则
|
|
||||||
*/
|
|
||||||
public static final String DEGRADE_DATA_ID_POSTFIX = "-degrade-rules";
|
|
||||||
/**
|
|
||||||
* 系统规则
|
|
||||||
*/
|
|
||||||
public static final String SYSTEM_DATA_ID_POSTFIX = "-system-rules";
|
|
||||||
/**
|
|
||||||
* 授权规则
|
|
||||||
*/
|
|
||||||
public static final String AUTHORITY_DATA_ID_POSTFIX = "-authority-rules";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关API
|
|
||||||
*/
|
|
||||||
public static final String GETEWAY_API_DATA_ID_POSTFIX = "-api-rules";
|
|
||||||
/**
|
|
||||||
* 网关流控规则
|
|
||||||
*/
|
|
||||||
public static final String GETEWAY_FLOW_DATA_ID_POSTFIX = "-flow-rules";
|
|
||||||
}
|
|
||||||
@ -1,181 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 授权规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping(value = "/authority")
|
|
||||||
public class AuthorityRuleController extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(AuthorityRuleController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private RuleRepository<AuthorityRuleEntity, Long> repository;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("authorityRuleNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<AuthorityRuleEntity>> ruleProvider;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("authorityRuleNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<AuthorityRuleEntity>> rulePublisher;
|
|
||||||
|
|
||||||
@GetMapping("/rules")
|
|
||||||
@AuthAction(PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<AuthorityRuleEntity>> apiQueryAllRulesForMachine(@RequestParam String app,
|
|
||||||
@RequestParam String ip,
|
|
||||||
@RequestParam Integer port) {
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app cannot be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isEmpty(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip cannot be null or empty");
|
|
||||||
}
|
|
||||||
if (port == null || port <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid parameter: port");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
List<AuthorityRuleEntity> rules = ruleProvider.getRules(app);
|
|
||||||
rules = repository.saveAll(rules);
|
|
||||||
return Result.ofSuccess(rules);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Error when querying authority rules", throwable);
|
|
||||||
return Result.ofFail(-1, throwable.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private <R> Result<R> checkEntityInternal(AuthorityRuleEntity entity) {
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "bad rule body");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getApp())) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getIp())) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (entity.getPort() == null || entity.getPort() <= 0) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
if (entity.getRule() == null) {
|
|
||||||
return Result.ofFail(-1, "rule can't be null");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getResource())) {
|
|
||||||
return Result.ofFail(-1, "resource name cannot be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getLimitApp())) {
|
|
||||||
return Result.ofFail(-1, "limitApp should be valid");
|
|
||||||
}
|
|
||||||
if (entity.getStrategy() != RuleConstant.AUTHORITY_WHITE
|
|
||||||
&& entity.getStrategy() != RuleConstant.AUTHORITY_BLACK) {
|
|
||||||
return Result.ofFail(-1, "Unknown strategy (must be blacklist or whitelist)");
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/rule")
|
|
||||||
@AuthAction(PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<AuthorityRuleEntity> apiAddAuthorityRule(@RequestBody AuthorityRuleEntity entity) {
|
|
||||||
Result<AuthorityRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
entity.setId(null);
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Failed to add authority rule", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/rule/{id}")
|
|
||||||
@AuthAction(PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<AuthorityRuleEntity> apiUpdateParamFlowRule(@PathVariable("id") Long id,
|
|
||||||
@RequestBody AuthorityRuleEntity entity) {
|
|
||||||
if (id == null || id <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid id");
|
|
||||||
}
|
|
||||||
Result<AuthorityRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
entity.setId(id);
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(null);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "Failed to save authority rule");
|
|
||||||
}
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Failed to save authority rule", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/rule/{id}")
|
|
||||||
@AuthAction(PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<Long> apiDeleteRule(@PathVariable("id") Long id) {
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id cannot be null");
|
|
||||||
}
|
|
||||||
AuthorityRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
publishRules(oldEntity.getApp());
|
|
||||||
} catch (Exception e) {
|
|
||||||
return Result.ofFail(-1, e.getMessage());
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void publishRules(String app) throws Exception {
|
|
||||||
List<AuthorityRuleEntity> rules = repository.findAllByApp(app);
|
|
||||||
rulePublisher.publish(app, rules);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,209 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreakerStrategy;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 降级规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/degrade")
|
|
||||||
public class DegradeController extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(DegradeController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private RuleRepository<DegradeRuleEntity, Long> repository;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("degradeRuleNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<DegradeRuleEntity>> ruleProvider;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("degradeRuleNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<DegradeRuleEntity>> rulePublisher;
|
|
||||||
|
|
||||||
@GetMapping("/rules.json")
|
|
||||||
@AuthAction(PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<DegradeRuleEntity>> apiQueryMachineRules(String app, String ip, Integer port) {
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isEmpty(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (port == null) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
List<DegradeRuleEntity> rules = ruleProvider.getRules(app);
|
|
||||||
rules = repository.saveAll(rules);
|
|
||||||
return Result.ofSuccess(rules);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("queryApps error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/rule")
|
|
||||||
@AuthAction(PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<DegradeRuleEntity> apiAddRule(@RequestBody DegradeRuleEntity entity) {
|
|
||||||
Result<DegradeRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
} catch (Throwable t) {
|
|
||||||
logger.error("Failed to add new degrade rule, app={}, ip={}", entity.getApp(), entity.getIp(), t);
|
|
||||||
return Result.ofThrowable(-1, t);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/rule/{id}")
|
|
||||||
@AuthAction(PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<DegradeRuleEntity> apiUpdateRule(@PathVariable("id") Long id,
|
|
||||||
@RequestBody DegradeRuleEntity entity) {
|
|
||||||
if (id == null || id <= 0) {
|
|
||||||
return Result.ofFail(-1, "id can't be null or negative");
|
|
||||||
}
|
|
||||||
DegradeRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofFail(-1, "Degrade rule does not exist, id=" + id);
|
|
||||||
}
|
|
||||||
entity.setApp(oldEntity.getApp());
|
|
||||||
entity.setIp(oldEntity.getIp());
|
|
||||||
entity.setPort(oldEntity.getPort());
|
|
||||||
entity.setId(oldEntity.getId());
|
|
||||||
Result<DegradeRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
entity.setGmtCreate(oldEntity.getGmtCreate());
|
|
||||||
entity.setGmtModified(new Date());
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
} catch (Throwable t) {
|
|
||||||
logger.error("Failed to save degrade rule, id={}, rule={}", id, entity, t);
|
|
||||||
return Result.ofThrowable(-1, t);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/rule/{id}")
|
|
||||||
@AuthAction(PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<Long> delete(@PathVariable("id") Long id) {
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
DegradeRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
publishRules(oldEntity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Failed to delete degrade rule, id={}", id, throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void publishRules(/*@NonNull*/ String app) throws Exception {
|
|
||||||
List<DegradeRuleEntity> rules = repository.findAllByApp(app);
|
|
||||||
rulePublisher.publish(app, rules);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
private <R> Result<R> checkEntityInternal(DegradeRuleEntity entity) {
|
|
||||||
if (StringUtil.isBlank(entity.getApp())) {
|
|
||||||
return Result.ofFail(-1, "app can't be blank");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getIp())) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (entity.getPort() == null || entity.getPort() <= 0) {
|
|
||||||
return Result.ofFail(-1, "invalid port: " + entity.getPort());
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getLimitApp())) {
|
|
||||||
return Result.ofFail(-1, "limitApp can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getResource())) {
|
|
||||||
return Result.ofFail(-1, "resource can't be null or empty");
|
|
||||||
}
|
|
||||||
Double threshold = entity.getCount();
|
|
||||||
if (threshold == null || threshold < 0) {
|
|
||||||
return Result.ofFail(-1, "invalid threshold: " + threshold);
|
|
||||||
}
|
|
||||||
Integer recoveryTimeoutSec = entity.getTimeWindow();
|
|
||||||
if (recoveryTimeoutSec == null || recoveryTimeoutSec <= 0) {
|
|
||||||
return Result.ofFail(-1, "recoveryTimeout should be positive");
|
|
||||||
}
|
|
||||||
Integer strategy = entity.getGrade();
|
|
||||||
if (strategy == null) {
|
|
||||||
return Result.ofFail(-1, "circuit breaker strategy cannot be null");
|
|
||||||
}
|
|
||||||
if (strategy < CircuitBreakerStrategy.SLOW_REQUEST_RATIO.getType()
|
|
||||||
|| strategy > RuleConstant.DEGRADE_GRADE_EXCEPTION_COUNT) {
|
|
||||||
return Result.ofFail(-1, "Invalid circuit breaker strategy: " + strategy);
|
|
||||||
}
|
|
||||||
if (entity.getMinRequestAmount() == null || entity.getMinRequestAmount() <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid minRequestAmount");
|
|
||||||
}
|
|
||||||
if (entity.getStatIntervalMs() == null || entity.getStatIntervalMs() <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid statInterval");
|
|
||||||
}
|
|
||||||
if (strategy == RuleConstant.DEGRADE_GRADE_RT) {
|
|
||||||
Double slowRatio = entity.getSlowRatioThreshold();
|
|
||||||
if (slowRatio == null) {
|
|
||||||
return Result.ofFail(-1, "SlowRatioThreshold is required for slow request ratio strategy");
|
|
||||||
} else if (slowRatio < 0 || slowRatio > 1) {
|
|
||||||
return Result.ofFail(-1, "SlowRatioThreshold should be in range: [0.0, 1.0]");
|
|
||||||
}
|
|
||||||
} else if (strategy == RuleConstant.DEGRADE_GRADE_EXCEPTION_RATIO) {
|
|
||||||
if (threshold > 1) {
|
|
||||||
return Result.ofFail(-1, "Ratio threshold should be in range: [0.0, 1.0]");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,253 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.util.VersionUtils;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
/**
|
|
||||||
* 热点参数规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping(value = "/paramFlow")
|
|
||||||
public class ParamFlowRuleController extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(ParamFlowRuleController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private AppManagement appManagement;
|
|
||||||
@Autowired
|
|
||||||
private RuleRepository<ParamFlowRuleEntity, Long> repository;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("paramFlowRuleNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<ParamFlowRuleEntity>> ruleProvider;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("paramFlowRuleNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<ParamFlowRuleEntity>> rulePublisher;
|
|
||||||
|
|
||||||
private boolean checkIfSupported(String app, String ip, int port) {
|
|
||||||
try {
|
|
||||||
return Optional.ofNullable(appManagement.getDetailApp(app))
|
|
||||||
.flatMap(e -> e.getMachine(ip, port))
|
|
||||||
.flatMap(m -> VersionUtils.parseVersion(m.getVersion())
|
|
||||||
.map(v -> v.greaterOrEqual(version020)))
|
|
||||||
.orElse(true);
|
|
||||||
// If error occurred or cannot retrieve machine info, return true.
|
|
||||||
} catch (Exception ex) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/rules")
|
|
||||||
@AuthAction(PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<ParamFlowRuleEntity>> apiQueryAllRulesForMachine(@RequestParam String app,
|
|
||||||
@RequestParam String ip,
|
|
||||||
@RequestParam Integer port) {
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app cannot be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isEmpty(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip cannot be null or empty");
|
|
||||||
}
|
|
||||||
if (port == null || port <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid parameter: port");
|
|
||||||
}
|
|
||||||
if (!checkIfSupported(app, ip, port)) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
List<ParamFlowRuleEntity> rules = ruleProvider.getRules(app);
|
|
||||||
rules = repository.saveAll(rules);
|
|
||||||
return Result.ofSuccess(rules);
|
|
||||||
} catch (ExecutionException ex) {
|
|
||||||
logger.error("Error when querying parameter flow rules", ex.getCause());
|
|
||||||
if (isNotSupported(ex.getCause())) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
} else {
|
|
||||||
return Result.ofThrowable(-1, ex.getCause());
|
|
||||||
}
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Error when querying parameter flow rules", throwable);
|
|
||||||
return Result.ofFail(-1, throwable.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isNotSupported(Throwable ex) {
|
|
||||||
return ex instanceof CommandNotFoundException;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/rule")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<ParamFlowRuleEntity> apiAddParamFlowRule(@RequestBody ParamFlowRuleEntity entity) {
|
|
||||||
Result<ParamFlowRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
if (!checkIfSupported(entity.getApp(), entity.getIp(), entity.getPort())) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
}
|
|
||||||
entity.setId(null);
|
|
||||||
entity.getRule().setResource(entity.getResource().trim());
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
} catch (ExecutionException ex) {
|
|
||||||
logger.error("Error when adding new parameter flow rules", ex.getCause());
|
|
||||||
if (isNotSupported(ex.getCause())) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
} else {
|
|
||||||
return Result.ofThrowable(-1, ex.getCause());
|
|
||||||
}
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Error when adding new parameter flow rules", throwable);
|
|
||||||
return Result.ofFail(-1, throwable.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private <R> Result<R> checkEntityInternal(ParamFlowRuleEntity entity) {
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "bad rule body");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getApp())) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getIp())) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (entity.getPort() == null || entity.getPort() <= 0) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
if (entity.getRule() == null) {
|
|
||||||
return Result.ofFail(-1, "rule can't be null");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getResource())) {
|
|
||||||
return Result.ofFail(-1, "resource name cannot be null or empty");
|
|
||||||
}
|
|
||||||
if (entity.getCount() < 0) {
|
|
||||||
return Result.ofFail(-1, "count should be valid");
|
|
||||||
}
|
|
||||||
if (entity.getGrade() != RuleConstant.FLOW_GRADE_QPS) {
|
|
||||||
return Result.ofFail(-1, "Unknown mode (blockGrade) for parameter flow control");
|
|
||||||
}
|
|
||||||
if (entity.getParamIdx() == null || entity.getParamIdx() < 0) {
|
|
||||||
return Result.ofFail(-1, "paramIdx should be valid");
|
|
||||||
}
|
|
||||||
if (entity.getDurationInSec() <= 0) {
|
|
||||||
return Result.ofFail(-1, "durationInSec should be valid");
|
|
||||||
}
|
|
||||||
if (entity.getControlBehavior() < 0) {
|
|
||||||
return Result.ofFail(-1, "controlBehavior should be valid");
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/rule/{id}")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<ParamFlowRuleEntity> apiUpdateParamFlowRule(@PathVariable("id") Long id,
|
|
||||||
@RequestBody ParamFlowRuleEntity entity) {
|
|
||||||
if (id == null || id <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid id");
|
|
||||||
}
|
|
||||||
ParamFlowRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofFail(-1, "id " + id + " does not exist");
|
|
||||||
}
|
|
||||||
|
|
||||||
Result<ParamFlowRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
if (!checkIfSupported(entity.getApp(), entity.getIp(), entity.getPort())) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
}
|
|
||||||
entity.setId(id);
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(oldEntity.getGmtCreate());
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
} catch (ExecutionException ex) {
|
|
||||||
logger.error("Error when updating parameter flow rules, id=" + id, ex.getCause());
|
|
||||||
if (isNotSupported(ex.getCause())) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
} else {
|
|
||||||
return Result.ofThrowable(-1, ex.getCause());
|
|
||||||
}
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Error when updating parameter flow rules, id=" + id, throwable);
|
|
||||||
return Result.ofFail(-1, throwable.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/rule/{id}")
|
|
||||||
@AuthAction(PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<Long> apiDeleteRule(@PathVariable("id") Long id) {
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id cannot be null");
|
|
||||||
}
|
|
||||||
ParamFlowRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
publishRules(oldEntity.getApp());
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
} catch (ExecutionException ex) {
|
|
||||||
logger.error("Error when deleting parameter flow rules", ex.getCause());
|
|
||||||
if (isNotSupported(ex.getCause())) {
|
|
||||||
return unsupportedVersion();
|
|
||||||
} else {
|
|
||||||
return Result.ofThrowable(-1, ex.getCause());
|
|
||||||
}
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Error when deleting parameter flow rules", throwable);
|
|
||||||
return Result.ofFail(-1, throwable.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void publishRules(String app) throws Exception {
|
|
||||||
List<ParamFlowRuleEntity> rules = repository.findAllByApp(app);
|
|
||||||
rulePublisher.publish(app, rules);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
private <R> Result<R> unsupportedVersion() {
|
|
||||||
return Result.ofFail(4041,
|
|
||||||
"Sentinel client not supported for parameter flow control (unsupported version or dependency absent)");
|
|
||||||
}
|
|
||||||
|
|
||||||
private final SentinelVersion version020 = new SentinelVersion().setMinorVersion(2);
|
|
||||||
}
|
|
||||||
@ -1,242 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 系统规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/system")
|
|
||||||
public class SystemController extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(SystemController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private RuleRepository<SystemRuleEntity, Long> repository;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("systemRuleNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<SystemRuleEntity>> ruleProvider;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("systemRuleNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<SystemRuleEntity>> rulePublisher;
|
|
||||||
|
|
||||||
private <R> Result<R> checkBasicParams(String app, String ip, Integer port) {
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isEmpty(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (port == null) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
if (port <= 0 || port > 65535) {
|
|
||||||
return Result.ofFail(-1, "port should be in (0, 65535)");
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/rules.json")
|
|
||||||
@AuthAction(PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<SystemRuleEntity>> apiQueryMachineRules(String app, String ip,
|
|
||||||
Integer port) {
|
|
||||||
Result<List<SystemRuleEntity>> checkResult = checkBasicParams(app, ip, port);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
List<SystemRuleEntity> rules = ruleProvider.getRules(app);
|
|
||||||
rules = repository.saveAll(rules);
|
|
||||||
return Result.ofSuccess(rules);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Query machine system rules error", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int countNotNullAndNotNegative(Number... values) {
|
|
||||||
int notNullCount = 0;
|
|
||||||
for (int i = 0; i < values.length; i++) {
|
|
||||||
if (values[i] != null && values[i].doubleValue() >= 0) {
|
|
||||||
notNullCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return notNullCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping("/new.json")
|
|
||||||
@AuthAction(PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<SystemRuleEntity> apiAdd(String app, String ip, Integer port,
|
|
||||||
Double highestSystemLoad, Double highestCpuUsage, Long avgRt,
|
|
||||||
Long maxThread, Double qps) {
|
|
||||||
|
|
||||||
Result<SystemRuleEntity> checkResult = checkBasicParams(app, ip, port);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
int notNullCount = countNotNullAndNotNegative(highestSystemLoad, avgRt, maxThread, qps, highestCpuUsage);
|
|
||||||
if (notNullCount != 1) {
|
|
||||||
return Result.ofFail(-1, "only one of [highestSystemLoad, avgRt, maxThread, qps,highestCpuUsage] "
|
|
||||||
+ "value must be set > 0, but " + notNullCount + " values get");
|
|
||||||
}
|
|
||||||
if (null != highestCpuUsage && highestCpuUsage > 1) {
|
|
||||||
return Result.ofFail(-1, "highestCpuUsage must between [0.0, 1.0]");
|
|
||||||
}
|
|
||||||
SystemRuleEntity entity = new SystemRuleEntity();
|
|
||||||
entity.setApp(app.trim());
|
|
||||||
entity.setIp(ip.trim());
|
|
||||||
entity.setPort(port);
|
|
||||||
// -1 is a fake value
|
|
||||||
if (null != highestSystemLoad) {
|
|
||||||
entity.setHighestSystemLoad(highestSystemLoad);
|
|
||||||
} else {
|
|
||||||
entity.setHighestSystemLoad(-1D);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null != highestCpuUsage) {
|
|
||||||
entity.setHighestCpuUsage(highestCpuUsage);
|
|
||||||
} else {
|
|
||||||
entity.setHighestCpuUsage(-1D);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (avgRt != null) {
|
|
||||||
entity.setAvgRt(avgRt);
|
|
||||||
} else {
|
|
||||||
entity.setAvgRt(-1L);
|
|
||||||
}
|
|
||||||
if (maxThread != null) {
|
|
||||||
entity.setMaxThread(maxThread);
|
|
||||||
} else {
|
|
||||||
entity.setMaxThread(-1L);
|
|
||||||
}
|
|
||||||
if (qps != null) {
|
|
||||||
entity.setQps(qps);
|
|
||||||
} else {
|
|
||||||
entity.setQps(-1D);
|
|
||||||
}
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(app);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Add SystemRule error", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/save.json")
|
|
||||||
@AuthAction(PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<SystemRuleEntity> apiUpdateIfNotNull(Long id, String app, Double highestSystemLoad,
|
|
||||||
Double highestCpuUsage, Long avgRt, Long maxThread, Double qps) {
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
SystemRuleEntity entity = repository.findById(id);
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "id " + id + " dose not exist");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (StringUtil.isNotBlank(app)) {
|
|
||||||
entity.setApp(app.trim());
|
|
||||||
}
|
|
||||||
if (highestSystemLoad != null) {
|
|
||||||
if (highestSystemLoad < 0) {
|
|
||||||
return Result.ofFail(-1, "highestSystemLoad must >= 0");
|
|
||||||
}
|
|
||||||
entity.setHighestSystemLoad(highestSystemLoad);
|
|
||||||
}
|
|
||||||
if (highestCpuUsage != null) {
|
|
||||||
if (highestCpuUsage < 0) {
|
|
||||||
return Result.ofFail(-1, "highestCpuUsage must >= 0");
|
|
||||||
}
|
|
||||||
if (highestCpuUsage > 1) {
|
|
||||||
return Result.ofFail(-1, "highestCpuUsage must <= 1");
|
|
||||||
}
|
|
||||||
entity.setHighestCpuUsage(highestCpuUsage);
|
|
||||||
}
|
|
||||||
if (avgRt != null) {
|
|
||||||
if (avgRt < 0) {
|
|
||||||
return Result.ofFail(-1, "avgRt must >= 0");
|
|
||||||
}
|
|
||||||
entity.setAvgRt(avgRt);
|
|
||||||
}
|
|
||||||
if (maxThread != null) {
|
|
||||||
if (maxThread < 0) {
|
|
||||||
return Result.ofFail(-1, "maxThread must >= 0");
|
|
||||||
}
|
|
||||||
entity.setMaxThread(maxThread);
|
|
||||||
}
|
|
||||||
if (qps != null) {
|
|
||||||
if (qps < 0) {
|
|
||||||
return Result.ofFail(-1, "qps must >= 0");
|
|
||||||
}
|
|
||||||
entity.setQps(qps);
|
|
||||||
}
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("save error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping("/delete.json")
|
|
||||||
@AuthAction(PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<?> delete(Long id) {
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
SystemRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
publishRules(oldEntity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("delete error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void publishRules(String app) throws Exception {
|
|
||||||
List<SystemRuleEntity> rules = repository.findAllByApp(app);
|
|
||||||
rulePublisher.publish(app, rules);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller.base;
|
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Nacos持久化通用处理类
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
public class BaseRuleController {
|
|
||||||
/**
|
|
||||||
* 延迟一下
|
|
||||||
*
|
|
||||||
* 解释：列表加载数据的时候，Nacos持久化还没做完，导致加载数据不对
|
|
||||||
*/
|
|
||||||
public static void delayTime(){
|
|
||||||
try {
|
|
||||||
TimeUnit.MILLISECONDS.sleep(100);
|
|
||||||
System.out.println("-------------睡100毫秒-----------");
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,260 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller.gateway;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.AddApiReqVo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.UpdateApiReqVo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.gateway.InMemApiDefinitionStore;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.util.CollectionUtils;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
import static com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关API规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping(value = "/gateway/api")
|
|
||||||
public class GatewayApiController extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(GatewayApiController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private InMemApiDefinitionStore repository;
|
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("gateWayApiNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<ApiDefinitionEntity>> apiProvider;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("gateWayApiNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<ApiDefinitionEntity>> apiPublisher;
|
|
||||||
|
|
||||||
@GetMapping("/list.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<ApiDefinitionEntity>> queryApis(String app, String ip, Integer port) {
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isEmpty(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (port == null) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
List<ApiDefinitionEntity> apis = apiProvider.getRules(app);
|
|
||||||
repository.saveAll(apis);
|
|
||||||
return Result.ofSuccess(apis);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("queryApis error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/new.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<ApiDefinitionEntity> addApi(HttpServletRequest request, @RequestBody AddApiReqVo reqVo) {
|
|
||||||
|
|
||||||
String app = reqVo.getApp();
|
|
||||||
if (StringUtil.isBlank(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
ApiDefinitionEntity entity = new ApiDefinitionEntity();
|
|
||||||
entity.setApp(app.trim());
|
|
||||||
|
|
||||||
String ip = reqVo.getIp();
|
|
||||||
if (StringUtil.isBlank(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
entity.setIp(ip.trim());
|
|
||||||
|
|
||||||
Integer port = reqVo.getPort();
|
|
||||||
if (port == null) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
entity.setPort(port);
|
|
||||||
|
|
||||||
// API名称
|
|
||||||
String apiName = reqVo.getApiName();
|
|
||||||
if (StringUtil.isBlank(apiName)) {
|
|
||||||
return Result.ofFail(-1, "apiName can't be null or empty");
|
|
||||||
}
|
|
||||||
entity.setApiName(apiName.trim());
|
|
||||||
|
|
||||||
// 匹配规则列表
|
|
||||||
List<ApiPredicateItemVo> predicateItems = reqVo.getPredicateItems();
|
|
||||||
if (CollectionUtils.isEmpty(predicateItems)) {
|
|
||||||
return Result.ofFail(-1, "predicateItems can't empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
List<ApiPredicateItemEntity> predicateItemEntities = new ArrayList<>();
|
|
||||||
for (ApiPredicateItemVo predicateItem : predicateItems) {
|
|
||||||
ApiPredicateItemEntity predicateItemEntity = new ApiPredicateItemEntity();
|
|
||||||
|
|
||||||
// 匹配模式
|
|
||||||
Integer matchStrategy = predicateItem.getMatchStrategy();
|
|
||||||
if (!Arrays.asList(URL_MATCH_STRATEGY_EXACT, URL_MATCH_STRATEGY_PREFIX, URL_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
|
|
||||||
return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy);
|
|
||||||
}
|
|
||||||
predicateItemEntity.setMatchStrategy(matchStrategy);
|
|
||||||
|
|
||||||
// 匹配串
|
|
||||||
String pattern = predicateItem.getPattern();
|
|
||||||
if (StringUtil.isBlank(pattern)) {
|
|
||||||
return Result.ofFail(-1, "pattern can't be null or empty");
|
|
||||||
}
|
|
||||||
predicateItemEntity.setPattern(pattern);
|
|
||||||
|
|
||||||
predicateItemEntities.add(predicateItemEntity);
|
|
||||||
}
|
|
||||||
entity.setPredicateItems(new LinkedHashSet<>(predicateItemEntities));
|
|
||||||
|
|
||||||
// 检查API名称不能重复
|
|
||||||
List<ApiDefinitionEntity> allApis = repository.findAllByMachine(MachineInfo.of(app.trim(), ip.trim(), port));
|
|
||||||
if (allApis.stream().map(o -> o.getApiName()).anyMatch(o -> o.equals(apiName.trim()))) {
|
|
||||||
return Result.ofFail(-1, "apiName exists: " + apiName);
|
|
||||||
}
|
|
||||||
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("add gateway api error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!publishApis(app, ip, port)) {
|
|
||||||
logger.warn("publish gateway apis fail after add");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/save.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<ApiDefinitionEntity> updateApi(@RequestBody UpdateApiReqVo reqVo) {
|
|
||||||
String app = reqVo.getApp();
|
|
||||||
if (StringUtil.isBlank(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
Long id = reqVo.getId();
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
ApiDefinitionEntity entity = repository.findById(id);
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "api does not exist, id=" + id);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 匹配规则列表
|
|
||||||
List<ApiPredicateItemVo> predicateItems = reqVo.getPredicateItems();
|
|
||||||
if (CollectionUtils.isEmpty(predicateItems)) {
|
|
||||||
return Result.ofFail(-1, "predicateItems can't empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
List<ApiPredicateItemEntity> predicateItemEntities = new ArrayList<>();
|
|
||||||
for (ApiPredicateItemVo predicateItem : predicateItems) {
|
|
||||||
ApiPredicateItemEntity predicateItemEntity = new ApiPredicateItemEntity();
|
|
||||||
|
|
||||||
// 匹配模式
|
|
||||||
int matchStrategy = predicateItem.getMatchStrategy();
|
|
||||||
if (!Arrays.asList(URL_MATCH_STRATEGY_EXACT, URL_MATCH_STRATEGY_PREFIX, URL_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
|
|
||||||
return Result.ofFail(-1, "Invalid matchStrategy: " + matchStrategy);
|
|
||||||
}
|
|
||||||
predicateItemEntity.setMatchStrategy(matchStrategy);
|
|
||||||
|
|
||||||
// 匹配串
|
|
||||||
String pattern = predicateItem.getPattern();
|
|
||||||
if (StringUtil.isBlank(pattern)) {
|
|
||||||
return Result.ofFail(-1, "pattern can't be null or empty");
|
|
||||||
}
|
|
||||||
predicateItemEntity.setPattern(pattern);
|
|
||||||
|
|
||||||
predicateItemEntities.add(predicateItemEntity);
|
|
||||||
}
|
|
||||||
entity.setPredicateItems(new LinkedHashSet<>(predicateItemEntities));
|
|
||||||
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("update gateway api error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!publishApis(app, entity.getIp(), entity.getPort())) {
|
|
||||||
logger.warn("publish gateway apis fail after update");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/delete.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<Long> deleteApi(Long id) {
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
ApiDefinitionEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("delete gateway api error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!publishApis(oldEntity.getApp(), oldEntity.getIp(), oldEntity.getPort())) {
|
|
||||||
logger.warn("publish gateway apis fail after delete");
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean publishApis(String app, String ip, Integer port) {
|
|
||||||
List<ApiDefinitionEntity> apis = repository.findAllByApp(app);
|
|
||||||
try {
|
|
||||||
apiPublisher.publish(app, apis);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("publish api error!");
|
|
||||||
e.printStackTrace();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,431 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.controller.gateway;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayParamFlowItemEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.rule.AddFlowRuleReqVo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.rule.GatewayParamFlowItemVo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.rule.UpdateFlowRuleReqVo;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.gateway.InMemGatewayFlowRuleStore;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import static com.alibaba.csp.sentinel.slots.block.RuleConstant.*;
|
|
||||||
import static com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants.*;
|
|
||||||
import static com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关限流规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping(value = "/gateway/flow")
|
|
||||||
public class GatewayFlowRuleController extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(GatewayFlowRuleController.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private InMemGatewayFlowRuleStore repository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("gateWayFlowRulesNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<GatewayFlowRuleEntity>> ruleProvider;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("gateWayFlowRulesNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<GatewayFlowRuleEntity>> rulePublisher;
|
|
||||||
|
|
||||||
@GetMapping("/list.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<GatewayFlowRuleEntity>> queryFlowRules(String app, String ip, Integer port) {
|
|
||||||
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isEmpty(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
if (port == null) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
List<GatewayFlowRuleEntity> rules = ruleProvider.getRules(app);
|
|
||||||
repository.saveAll(rules);
|
|
||||||
return Result.ofSuccess(rules);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("query gateway flow rules error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/new.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<GatewayFlowRuleEntity> addFlowRule(@RequestBody AddFlowRuleReqVo reqVo) {
|
|
||||||
|
|
||||||
String app = reqVo.getApp();
|
|
||||||
if (StringUtil.isBlank(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
GatewayFlowRuleEntity entity = new GatewayFlowRuleEntity();
|
|
||||||
entity.setApp(app.trim());
|
|
||||||
|
|
||||||
String ip = reqVo.getIp();
|
|
||||||
if (StringUtil.isBlank(ip)) {
|
|
||||||
return Result.ofFail(-1, "ip can't be null or empty");
|
|
||||||
}
|
|
||||||
entity.setIp(ip.trim());
|
|
||||||
|
|
||||||
Integer port = reqVo.getPort();
|
|
||||||
if (port == null) {
|
|
||||||
return Result.ofFail(-1, "port can't be null");
|
|
||||||
}
|
|
||||||
entity.setPort(port);
|
|
||||||
|
|
||||||
// API类型, Route ID或API分组
|
|
||||||
Integer resourceMode = reqVo.getResourceMode();
|
|
||||||
if (resourceMode == null) {
|
|
||||||
return Result.ofFail(-1, "resourceMode can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(RESOURCE_MODE_ROUTE_ID, RESOURCE_MODE_CUSTOM_API_NAME).contains(resourceMode)) {
|
|
||||||
return Result.ofFail(-1, "invalid resourceMode: " + resourceMode);
|
|
||||||
}
|
|
||||||
entity.setResourceMode(resourceMode);
|
|
||||||
|
|
||||||
// API名称
|
|
||||||
String resource = reqVo.getResource();
|
|
||||||
if (StringUtil.isBlank(resource)) {
|
|
||||||
return Result.ofFail(-1, "resource can't be null or empty");
|
|
||||||
}
|
|
||||||
entity.setResource(resource.trim());
|
|
||||||
|
|
||||||
// 针对请求属性
|
|
||||||
GatewayParamFlowItemVo paramItem = reqVo.getParamItem();
|
|
||||||
if (paramItem != null) {
|
|
||||||
GatewayParamFlowItemEntity itemEntity = new GatewayParamFlowItemEntity();
|
|
||||||
entity.setParamItem(itemEntity);
|
|
||||||
|
|
||||||
// 参数属性 0-ClientIP 1-Remote Host 2-Header 3-URL参数 4-Cookie
|
|
||||||
Integer parseStrategy = paramItem.getParseStrategy();
|
|
||||||
if (!Arrays.asList(PARAM_PARSE_STRATEGY_CLIENT_IP, PARAM_PARSE_STRATEGY_HOST, PARAM_PARSE_STRATEGY_HEADER
|
|
||||||
, PARAM_PARSE_STRATEGY_URL_PARAM, PARAM_PARSE_STRATEGY_COOKIE).contains(parseStrategy)) {
|
|
||||||
return Result.ofFail(-1, "invalid parseStrategy: " + parseStrategy);
|
|
||||||
}
|
|
||||||
itemEntity.setParseStrategy(paramItem.getParseStrategy());
|
|
||||||
|
|
||||||
// 当参数属性为2-Header 3-URL参数 4-Cookie时，参数名称必填
|
|
||||||
if (Arrays.asList(PARAM_PARSE_STRATEGY_HEADER, PARAM_PARSE_STRATEGY_URL_PARAM, PARAM_PARSE_STRATEGY_COOKIE).contains(parseStrategy)) {
|
|
||||||
// 参数名称
|
|
||||||
String fieldName = paramItem.getFieldName();
|
|
||||||
if (StringUtil.isBlank(fieldName)) {
|
|
||||||
return Result.ofFail(-1, "fieldName can't be null or empty");
|
|
||||||
}
|
|
||||||
itemEntity.setFieldName(paramItem.getFieldName());
|
|
||||||
}
|
|
||||||
|
|
||||||
String pattern = paramItem.getPattern();
|
|
||||||
// 如果匹配串不为空，验证匹配模式
|
|
||||||
if (StringUtil.isNotEmpty(pattern)) {
|
|
||||||
itemEntity.setPattern(pattern);
|
|
||||||
Integer matchStrategy = paramItem.getMatchStrategy();
|
|
||||||
if (!Arrays.asList(PARAM_MATCH_STRATEGY_EXACT, PARAM_MATCH_STRATEGY_CONTAINS, PARAM_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
|
|
||||||
return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy);
|
|
||||||
}
|
|
||||||
itemEntity.setMatchStrategy(matchStrategy);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 阈值类型 0-线程数 1-QPS
|
|
||||||
Integer grade = reqVo.getGrade();
|
|
||||||
if (grade == null) {
|
|
||||||
return Result.ofFail(-1, "grade can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(FLOW_GRADE_THREAD, FLOW_GRADE_QPS).contains(grade)) {
|
|
||||||
return Result.ofFail(-1, "invalid grade: " + grade);
|
|
||||||
}
|
|
||||||
entity.setGrade(grade);
|
|
||||||
|
|
||||||
// QPS阈值
|
|
||||||
Double count = reqVo.getCount();
|
|
||||||
if (count == null) {
|
|
||||||
return Result.ofFail(-1, "count can't be null");
|
|
||||||
}
|
|
||||||
if (count < 0) {
|
|
||||||
return Result.ofFail(-1, "count should be at lease zero");
|
|
||||||
}
|
|
||||||
entity.setCount(count);
|
|
||||||
|
|
||||||
// 间隔
|
|
||||||
Long interval = reqVo.getInterval();
|
|
||||||
if (interval == null) {
|
|
||||||
return Result.ofFail(-1, "interval can't be null");
|
|
||||||
}
|
|
||||||
if (interval <= 0) {
|
|
||||||
return Result.ofFail(-1, "interval should be greater than zero");
|
|
||||||
}
|
|
||||||
entity.setInterval(interval);
|
|
||||||
|
|
||||||
// 间隔单位
|
|
||||||
Integer intervalUnit = reqVo.getIntervalUnit();
|
|
||||||
if (intervalUnit == null) {
|
|
||||||
return Result.ofFail(-1, "intervalUnit can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(INTERVAL_UNIT_SECOND, INTERVAL_UNIT_MINUTE, INTERVAL_UNIT_HOUR, INTERVAL_UNIT_DAY).contains(intervalUnit)) {
|
|
||||||
return Result.ofFail(-1, "Invalid intervalUnit: " + intervalUnit);
|
|
||||||
}
|
|
||||||
entity.setIntervalUnit(intervalUnit);
|
|
||||||
|
|
||||||
// 流控方式 0-快速失败 2-匀速排队
|
|
||||||
Integer controlBehavior = reqVo.getControlBehavior();
|
|
||||||
if (controlBehavior == null) {
|
|
||||||
return Result.ofFail(-1, "controlBehavior can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(CONTROL_BEHAVIOR_DEFAULT, CONTROL_BEHAVIOR_RATE_LIMITER).contains(controlBehavior)) {
|
|
||||||
return Result.ofFail(-1, "invalid controlBehavior: " + controlBehavior);
|
|
||||||
}
|
|
||||||
entity.setControlBehavior(controlBehavior);
|
|
||||||
|
|
||||||
if (CONTROL_BEHAVIOR_DEFAULT == controlBehavior) {
|
|
||||||
// 0-快速失败, 则Burst size必填
|
|
||||||
Integer burst = reqVo.getBurst();
|
|
||||||
if (burst == null) {
|
|
||||||
return Result.ofFail(-1, "burst can't be null");
|
|
||||||
}
|
|
||||||
if (burst < 0) {
|
|
||||||
return Result.ofFail(-1, "invalid burst: " + burst);
|
|
||||||
}
|
|
||||||
entity.setBurst(burst);
|
|
||||||
} else if (CONTROL_BEHAVIOR_RATE_LIMITER == controlBehavior) {
|
|
||||||
// 1-匀速排队, 则超时时间必填
|
|
||||||
Integer maxQueueingTimeoutMs = reqVo.getMaxQueueingTimeoutMs();
|
|
||||||
if (maxQueueingTimeoutMs == null) {
|
|
||||||
return Result.ofFail(-1, "maxQueueingTimeoutMs can't be null");
|
|
||||||
}
|
|
||||||
if (maxQueueingTimeoutMs < 0) {
|
|
||||||
return Result.ofFail(-1, "invalid maxQueueingTimeoutMs: " + maxQueueingTimeoutMs);
|
|
||||||
}
|
|
||||||
entity.setMaxQueueingTimeoutMs(maxQueueingTimeoutMs);
|
|
||||||
}
|
|
||||||
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("add gateway flow rule error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!publishRules(app, ip, port)) {
|
|
||||||
logger.warn("publish gateway flow rules fail after add");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/save.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<GatewayFlowRuleEntity> updateFlowRule(@RequestBody UpdateFlowRuleReqVo reqVo) {
|
|
||||||
|
|
||||||
String app = reqVo.getApp();
|
|
||||||
if (StringUtil.isBlank(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
Long id = reqVo.getId();
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
GatewayFlowRuleEntity entity = repository.findById(id);
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "gateway flow rule does not exist, id=" + id);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 针对请求属性
|
|
||||||
GatewayParamFlowItemVo paramItem = reqVo.getParamItem();
|
|
||||||
if (paramItem != null) {
|
|
||||||
GatewayParamFlowItemEntity itemEntity = new GatewayParamFlowItemEntity();
|
|
||||||
entity.setParamItem(itemEntity);
|
|
||||||
|
|
||||||
// 参数属性 0-ClientIP 1-Remote Host 2-Header 3-URL参数 4-Cookie
|
|
||||||
Integer parseStrategy = paramItem.getParseStrategy();
|
|
||||||
if (!Arrays.asList(PARAM_PARSE_STRATEGY_CLIENT_IP, PARAM_PARSE_STRATEGY_HOST, PARAM_PARSE_STRATEGY_HEADER
|
|
||||||
, PARAM_PARSE_STRATEGY_URL_PARAM, PARAM_PARSE_STRATEGY_COOKIE).contains(parseStrategy)) {
|
|
||||||
return Result.ofFail(-1, "invalid parseStrategy: " + parseStrategy);
|
|
||||||
}
|
|
||||||
itemEntity.setParseStrategy(paramItem.getParseStrategy());
|
|
||||||
|
|
||||||
// 当参数属性为2-Header 3-URL参数 4-Cookie时，参数名称必填
|
|
||||||
if (Arrays.asList(PARAM_PARSE_STRATEGY_HEADER, PARAM_PARSE_STRATEGY_URL_PARAM, PARAM_PARSE_STRATEGY_COOKIE).contains(parseStrategy)) {
|
|
||||||
// 参数名称
|
|
||||||
String fieldName = paramItem.getFieldName();
|
|
||||||
if (StringUtil.isBlank(fieldName)) {
|
|
||||||
return Result.ofFail(-1, "fieldName can't be null or empty");
|
|
||||||
}
|
|
||||||
itemEntity.setFieldName(paramItem.getFieldName());
|
|
||||||
}
|
|
||||||
|
|
||||||
String pattern = paramItem.getPattern();
|
|
||||||
// 如果匹配串不为空，验证匹配模式
|
|
||||||
if (StringUtil.isNotEmpty(pattern)) {
|
|
||||||
itemEntity.setPattern(pattern);
|
|
||||||
Integer matchStrategy = paramItem.getMatchStrategy();
|
|
||||||
if (!Arrays.asList(PARAM_MATCH_STRATEGY_EXACT, PARAM_MATCH_STRATEGY_CONTAINS, PARAM_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
|
|
||||||
return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy);
|
|
||||||
}
|
|
||||||
itemEntity.setMatchStrategy(matchStrategy);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
entity.setParamItem(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 阈值类型 0-线程数 1-QPS
|
|
||||||
Integer grade = reqVo.getGrade();
|
|
||||||
if (grade == null) {
|
|
||||||
return Result.ofFail(-1, "grade can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(FLOW_GRADE_THREAD, FLOW_GRADE_QPS).contains(grade)) {
|
|
||||||
return Result.ofFail(-1, "invalid grade: " + grade);
|
|
||||||
}
|
|
||||||
entity.setGrade(grade);
|
|
||||||
|
|
||||||
// QPS阈值
|
|
||||||
Double count = reqVo.getCount();
|
|
||||||
if (count == null) {
|
|
||||||
return Result.ofFail(-1, "count can't be null");
|
|
||||||
}
|
|
||||||
if (count < 0) {
|
|
||||||
return Result.ofFail(-1, "count should be at lease zero");
|
|
||||||
}
|
|
||||||
entity.setCount(count);
|
|
||||||
|
|
||||||
// 间隔
|
|
||||||
Long interval = reqVo.getInterval();
|
|
||||||
if (interval == null) {
|
|
||||||
return Result.ofFail(-1, "interval can't be null");
|
|
||||||
}
|
|
||||||
if (interval <= 0) {
|
|
||||||
return Result.ofFail(-1, "interval should be greater than zero");
|
|
||||||
}
|
|
||||||
entity.setInterval(interval);
|
|
||||||
|
|
||||||
// 间隔单位
|
|
||||||
Integer intervalUnit = reqVo.getIntervalUnit();
|
|
||||||
if (intervalUnit == null) {
|
|
||||||
return Result.ofFail(-1, "intervalUnit can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(INTERVAL_UNIT_SECOND, INTERVAL_UNIT_MINUTE, INTERVAL_UNIT_HOUR, INTERVAL_UNIT_DAY).contains(intervalUnit)) {
|
|
||||||
return Result.ofFail(-1, "Invalid intervalUnit: " + intervalUnit);
|
|
||||||
}
|
|
||||||
entity.setIntervalUnit(intervalUnit);
|
|
||||||
|
|
||||||
// 流控方式 0-快速失败 2-匀速排队
|
|
||||||
Integer controlBehavior = reqVo.getControlBehavior();
|
|
||||||
if (controlBehavior == null) {
|
|
||||||
return Result.ofFail(-1, "controlBehavior can't be null");
|
|
||||||
}
|
|
||||||
if (!Arrays.asList(CONTROL_BEHAVIOR_DEFAULT, CONTROL_BEHAVIOR_RATE_LIMITER).contains(controlBehavior)) {
|
|
||||||
return Result.ofFail(-1, "invalid controlBehavior: " + controlBehavior);
|
|
||||||
}
|
|
||||||
entity.setControlBehavior(controlBehavior);
|
|
||||||
|
|
||||||
if (CONTROL_BEHAVIOR_DEFAULT == controlBehavior) {
|
|
||||||
// 0-快速失败, 则Burst size必填
|
|
||||||
Integer burst = reqVo.getBurst();
|
|
||||||
if (burst == null) {
|
|
||||||
return Result.ofFail(-1, "burst can't be null");
|
|
||||||
}
|
|
||||||
if (burst < 0) {
|
|
||||||
return Result.ofFail(-1, "invalid burst: " + burst);
|
|
||||||
}
|
|
||||||
entity.setBurst(burst);
|
|
||||||
} else if (CONTROL_BEHAVIOR_RATE_LIMITER == controlBehavior) {
|
|
||||||
// 2-匀速排队, 则超时时间必填
|
|
||||||
Integer maxQueueingTimeoutMs = reqVo.getMaxQueueingTimeoutMs();
|
|
||||||
if (maxQueueingTimeoutMs == null) {
|
|
||||||
return Result.ofFail(-1, "maxQueueingTimeoutMs can't be null");
|
|
||||||
}
|
|
||||||
if (maxQueueingTimeoutMs < 0) {
|
|
||||||
return Result.ofFail(-1, "invalid maxQueueingTimeoutMs: " + maxQueueingTimeoutMs);
|
|
||||||
}
|
|
||||||
entity.setMaxQueueingTimeoutMs(maxQueueingTimeoutMs);
|
|
||||||
}
|
|
||||||
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("update gateway flow rule error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!publishRules(app, entity.getIp(), entity.getPort())) {
|
|
||||||
logger.warn("publish gateway flow rules fail after update");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/delete.json")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<Long> deleteFlowRule(Long id) {
|
|
||||||
|
|
||||||
if (id == null) {
|
|
||||||
return Result.ofFail(-1, "id can't be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
GatewayFlowRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("delete gateway flow rule error:", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!publishRules(oldEntity.getApp(), oldEntity.getIp(), oldEntity.getPort())) {
|
|
||||||
logger.warn("publish gateway flow rules fail after delete");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean publishRules(String app, String ip, Integer port) {
|
|
||||||
List<GatewayFlowRuleEntity> rules = repository.findAllByApp(app);
|
|
||||||
try {
|
|
||||||
rulePublisher.publish(app, rules);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("publish rules error!");
|
|
||||||
e.printStackTrace();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,230 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1999-2018 Alibaba Group Holding Ltd.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.alibaba.csp.sentinel.dashboard.controller.v2;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.domain.Result;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
|
||||||
import org.springframework.util.ObjectUtils;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 流控规则控制器
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping(value = "/v2/flow")
|
|
||||||
public class FlowControllerV2 extends BaseRuleController {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(FlowControllerV2.class);
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private InMemoryRuleRepositoryAdapter<FlowRuleEntity> repository;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("flowRuleNacosProvider")
|
|
||||||
private DynamicRuleProvider<List<FlowRuleEntity>> ruleProvider;
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("flowRuleNacosPublisher")
|
|
||||||
private DynamicRulePublisher<List<FlowRuleEntity>> rulePublisher;
|
|
||||||
|
|
||||||
@GetMapping("/rules")
|
|
||||||
@AuthAction(PrivilegeType.READ_RULE)
|
|
||||||
public Result<List<FlowRuleEntity>> apiQueryMachineRules(@RequestParam String app) {
|
|
||||||
|
|
||||||
if (StringUtil.isEmpty(app)) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
List<FlowRuleEntity> rules = ruleProvider.getRules(app);
|
|
||||||
if (rules != null && !rules.isEmpty()) {
|
|
||||||
for (FlowRuleEntity entity : rules) {
|
|
||||||
entity.setApp(app);
|
|
||||||
if (entity.getClusterConfig() != null && entity.getClusterConfig().getFlowId() != null) {
|
|
||||||
entity.setId(entity.getClusterConfig().getFlowId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rules = repository.saveAll(rules);
|
|
||||||
return Result.ofSuccess(rules);
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Error when querying flow rules", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private <R> Result<R> checkEntityInternal(FlowRuleEntity entity) {
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "invalid body");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getApp())) {
|
|
||||||
return Result.ofFail(-1, "app can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getLimitApp())) {
|
|
||||||
return Result.ofFail(-1, "limitApp can't be null or empty");
|
|
||||||
}
|
|
||||||
if (StringUtil.isBlank(entity.getResource())) {
|
|
||||||
return Result.ofFail(-1, "resource can't be null or empty");
|
|
||||||
}
|
|
||||||
if (entity.getGrade() == null) {
|
|
||||||
return Result.ofFail(-1, "grade can't be null");
|
|
||||||
}
|
|
||||||
if (entity.getGrade() != 0 && entity.getGrade() != 1) {
|
|
||||||
return Result.ofFail(-1, "grade must be 0 or 1, but " + entity.getGrade() + " got");
|
|
||||||
}
|
|
||||||
if (entity.getCount() == null || entity.getCount() < 0) {
|
|
||||||
return Result.ofFail(-1, "count should be at lease zero");
|
|
||||||
}
|
|
||||||
if (entity.getStrategy() == null) {
|
|
||||||
return Result.ofFail(-1, "strategy can't be null");
|
|
||||||
}
|
|
||||||
if (entity.getStrategy() != 0 && StringUtil.isBlank(entity.getRefResource())) {
|
|
||||||
return Result.ofFail(-1, "refResource can't be null or empty when strategy!=0");
|
|
||||||
}
|
|
||||||
if (entity.getControlBehavior() == null) {
|
|
||||||
return Result.ofFail(-1, "controlBehavior can't be null");
|
|
||||||
}
|
|
||||||
int controlBehavior = entity.getControlBehavior();
|
|
||||||
if (controlBehavior == 1 && entity.getWarmUpPeriodSec() == null) {
|
|
||||||
return Result.ofFail(-1, "warmUpPeriodSec can't be null when controlBehavior==1");
|
|
||||||
}
|
|
||||||
if (controlBehavior == 2 && entity.getMaxQueueingTimeMs() == null) {
|
|
||||||
return Result.ofFail(-1, "maxQueueingTimeMs can't be null when controlBehavior==2");
|
|
||||||
}
|
|
||||||
if (entity.isClusterMode() && entity.getClusterConfig() == null) {
|
|
||||||
return Result.ofFail(-1, "cluster config should be valid");
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/rule")
|
|
||||||
@AuthAction(value = AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
public Result<FlowRuleEntity> apiAddFlowRule(@RequestBody FlowRuleEntity entity) {
|
|
||||||
|
|
||||||
Result<FlowRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
entity.setId(null);
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(date);
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
entity.setLimitApp(entity.getLimitApp().trim());
|
|
||||||
entity.setResource(entity.getResource().trim());
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
publishRules(entity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Failed to add flow rule", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/rule/{id}")
|
|
||||||
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
|
|
||||||
|
|
||||||
public Result<FlowRuleEntity> apiUpdateFlowRule(@PathVariable("id") Long id,
|
|
||||||
@RequestBody FlowRuleEntity entity) {
|
|
||||||
if (id == null || id <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid id");
|
|
||||||
}
|
|
||||||
FlowRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (oldEntity == null) {
|
|
||||||
return Result.ofFail(-1, "id " + id + " does not exist");
|
|
||||||
}
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "invalid body");
|
|
||||||
}
|
|
||||||
|
|
||||||
entity.setApp(oldEntity.getApp());
|
|
||||||
entity.setIp(oldEntity.getIp());
|
|
||||||
entity.setPort(oldEntity.getPort());
|
|
||||||
Result<FlowRuleEntity> checkResult = checkEntityInternal(entity);
|
|
||||||
if (checkResult != null) {
|
|
||||||
return checkResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
entity.setId(id);
|
|
||||||
Date date = new Date();
|
|
||||||
entity.setGmtCreate(oldEntity.getGmtCreate());
|
|
||||||
entity.setGmtModified(date);
|
|
||||||
try {
|
|
||||||
entity = repository.save(entity);
|
|
||||||
if (entity == null) {
|
|
||||||
return Result.ofFail(-1, "save entity fail");
|
|
||||||
}
|
|
||||||
publishRules(oldEntity.getApp());
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
logger.error("Failed to update flow rule", throwable);
|
|
||||||
return Result.ofThrowable(-1, throwable);
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/rule/{id}")
|
|
||||||
@AuthAction(PrivilegeType.DELETE_RULE)
|
|
||||||
public Result<Long> apiDeleteRule(@PathVariable("id") Long id) {
|
|
||||||
if (id == null || id <= 0) {
|
|
||||||
return Result.ofFail(-1, "Invalid id");
|
|
||||||
}
|
|
||||||
FlowRuleEntity oldEntity = repository.findById(id);
|
|
||||||
if (ObjectUtils.isEmpty(oldEntity)) {
|
|
||||||
return Result.ofSuccess(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
repository.delete(id);
|
|
||||||
publishRules(oldEntity.getApp());
|
|
||||||
} catch (Exception e) {
|
|
||||||
return Result.ofFail(-1, e.getMessage());
|
|
||||||
}
|
|
||||||
return Result.ofSuccess(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void publishRules(/*@NonNull*/ String app) throws Exception {
|
|
||||||
List<FlowRuleEntity> rules = repository.findAllByApp(app);
|
|
||||||
rulePublisher.publish(app, rules);
|
|
||||||
//延迟加载
|
|
||||||
delayTime();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description: nacos配置
|
|
||||||
* @author: zyf
|
|
||||||
* @date: 2022/03/01$
|
|
||||||
* @version: V1.0
|
|
||||||
*/
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
@Component
|
|
||||||
@ConfigurationProperties(prefix = "nacos.server")
|
|
||||||
@Data
|
|
||||||
public class NacosConfigProperties {
|
|
||||||
|
|
||||||
private String ip;
|
|
||||||
|
|
||||||
private String namespace;
|
|
||||||
|
|
||||||
private String username;
|
|
||||||
|
|
||||||
private String password;
|
|
||||||
|
|
||||||
private String groupId;
|
|
||||||
|
|
||||||
public String getServerAddr() {
|
|
||||||
return this.getIp();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,165 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1999-2018 Alibaba Group Holding Ltd.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.*;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.AuthorityRuleCorrectEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity;
|
|
||||||
import com.alibaba.nacos.api.PropertyKeyConst;
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigFactory;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* sentinel配置类
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
public class SentinelConfig {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private NacosConfigProperties nacosConfigProperties;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 流控规则
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<FlowRuleEntity>, String> flowRuleEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<FlowRuleEntity>> flowRuleEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, FlowRuleEntity.class);
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* 降级规则
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<DegradeRuleEntity>, String> degradeRuleEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<DegradeRuleEntity>> degradeRuleEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, DegradeRuleEntity.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 热点参数 规则
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<ParamFlowRuleCorrectEntity>, String> paramFlowRuleEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<ParamFlowRuleCorrectEntity>> paramFlowRuleEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, ParamFlowRuleCorrectEntity.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 系统规则
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<SystemRuleEntity>, String> systemRuleRuleEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<SystemRuleEntity>> systemRuleRuleEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, SystemRuleEntity.class);
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* 授权规则
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<AuthorityRuleCorrectEntity>, String> authorityRuleRuleEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<AuthorityRuleCorrectEntity>> authorityRuleRuleEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, AuthorityRuleCorrectEntity.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关API
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<ApiDefinitionEntity>, String> apiDefinitionEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<ApiDefinitionEntity>> apiDefinitionEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, ApiDefinitionEntity.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关flowRule
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public Converter<List<GatewayFlowRuleEntity>, String> gatewayFlowRuleEntityEncoder() {
|
|
||||||
return JSON::toJSONString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public Converter<String, List<GatewayFlowRuleEntity>> gatewayFlowRuleEntityDecoder() {
|
|
||||||
return s -> JSON.parseArray(s, GatewayFlowRuleEntity.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ConfigService nacosConfigService() throws Exception {
|
|
||||||
Properties properties=new Properties();
|
|
||||||
properties.put(PropertyKeyConst.SERVER_ADDR,nacosConfigProperties.getServerAddr());
|
|
||||||
if(StringUtils.isNotBlank(nacosConfigProperties.getUsername())){
|
|
||||||
properties.put(PropertyKeyConst.USERNAME,nacosConfigProperties.getUsername());
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotBlank(nacosConfigProperties.getPassword())){
|
|
||||||
properties.put(PropertyKeyConst.PASSWORD,nacosConfigProperties.getPassword());
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotBlank(nacosConfigProperties.getNamespace())){
|
|
||||||
properties.put(PropertyKeyConst.NAMESPACE,nacosConfigProperties.getNamespace());
|
|
||||||
}
|
|
||||||
return ConfigFactory.createConfigService(properties);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.authority;
|
|
||||||
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.AuthorityRuleCorrectEntity;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 授权规则拉取(黑名单白名单)
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("authorityRuleNacosProvider")
|
|
||||||
public class AuthorityRuleNacosProvider implements DynamicRuleProvider<List<AuthorityRuleEntity>> {
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String, List<AuthorityRuleCorrectEntity>> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<AuthorityRuleEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName + SentinelConStants.AUTHORITY_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, 3000);
|
|
||||||
if (StringUtil.isEmpty(rules)) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
List<AuthorityRuleCorrectEntity> entityList = converter.convert(rules);
|
|
||||||
return entityList.stream().map(rule -> {
|
|
||||||
AuthorityRule authorityRule = new AuthorityRule();
|
|
||||||
BeanUtils.copyProperties(rule, authorityRule);
|
|
||||||
AuthorityRuleEntity entity = AuthorityRuleEntity.fromAuthorityRule(rule.getApp(), rule.getIp(), rule.getPort(), authorityRule);
|
|
||||||
entity.setId(rule.getId());
|
|
||||||
entity.setGmtCreate(rule.getGmtCreate());
|
|
||||||
return entity;
|
|
||||||
}).collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.authority;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.AuthorityRuleCorrectEntity;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 授权规则持久化(黑名单白名单)
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("authorityRuleNacosPublisher")
|
|
||||||
public class AuthorityRuleNacosPublisher implements DynamicRulePublisher<List<AuthorityRuleEntity>> {
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<AuthorityRuleCorrectEntity>, String> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<AuthorityRuleEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// 转换
|
|
||||||
List<AuthorityRuleCorrectEntity> list = rules.stream().map(rule -> {
|
|
||||||
AuthorityRuleCorrectEntity entity = new AuthorityRuleCorrectEntity();
|
|
||||||
BeanUtils.copyProperties(rule, entity);
|
|
||||||
return entity;
|
|
||||||
}).collect(Collectors.toList());
|
|
||||||
|
|
||||||
configService.publishConfig(app + SentinelConStants.AUTHORITY_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, converter.convert(list));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.degrade;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 降级规则拉取
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("degradeRuleNacosProvider")
|
|
||||||
public class DegradeRuleNacosProvider implements DynamicRuleProvider<List<DegradeRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String, List<DegradeRuleEntity>> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<DegradeRuleEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName + SentinelConStants.DEGRADE_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, 3000);
|
|
||||||
if (StringUtil.isEmpty(rules)) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
return converter.convert(rules);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.degrade;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 降级规则推送
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("degradeRuleNacosPublisher")
|
|
||||||
public class DegradeRuleNacosPublisher implements DynamicRulePublisher<List<DegradeRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<DegradeRuleEntity>, String> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<DegradeRuleEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
configService.publishConfig(app + SentinelConStants.DEGRADE_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, converter.convert(rules));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,110 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.entity;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.Rule;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author zyf
|
|
||||||
* @description 重写授权规则实体类,原因同热点规则
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
public class AuthorityRuleCorrectEntity implements RuleEntity {
|
|
||||||
|
|
||||||
private Long id;
|
|
||||||
private String app;
|
|
||||||
private String ip;
|
|
||||||
private Integer port;
|
|
||||||
private String limitApp;
|
|
||||||
private String resource;
|
|
||||||
private Date gmtCreate;
|
|
||||||
private Date gmtModified;
|
|
||||||
|
|
||||||
private int strategy;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setId(Long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getApp() {
|
|
||||||
return app;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setApp(String app) {
|
|
||||||
this.app = app;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getIp() {
|
|
||||||
return ip;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIp(String ip) {
|
|
||||||
this.ip = ip;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Integer getPort() {
|
|
||||||
return port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPort(Integer port) {
|
|
||||||
this.port = port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getLimitApp() {
|
|
||||||
return limitApp;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLimitApp(String limitApp) {
|
|
||||||
this.limitApp = limitApp;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getResource() {
|
|
||||||
return resource;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setResource(String resource) {
|
|
||||||
this.resource = resource;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Date getGmtCreate() {
|
|
||||||
return gmtCreate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGmtCreate(Date gmtCreate) {
|
|
||||||
this.gmtCreate = gmtCreate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getGmtModified() {
|
|
||||||
return gmtModified;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGmtModified(Date gmtModified) {
|
|
||||||
this.gmtModified = gmtModified;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getStrategy() {
|
|
||||||
return strategy;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStrategy(int strategy) {
|
|
||||||
this.strategy = strategy;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Rule toRule(){
|
|
||||||
AuthorityRule rule=new AuthorityRule();
|
|
||||||
return rule;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,194 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.entity;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.Rule;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowClusterConfig;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowItem;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author zyf
|
|
||||||
* @description 重写热点规则实体类,。查看sentinel-dashboard在自定义ParamFlowRuleNacosPublisher时候 推送的数据是ParamFlowRuleEntity。 客户端接收的ParamFlowRule类
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
public class ParamFlowRuleCorrectEntity implements RuleEntity {
|
|
||||||
|
|
||||||
private Long id;
|
|
||||||
private String app;
|
|
||||||
private String ip;
|
|
||||||
private Integer port;
|
|
||||||
private String limitApp;
|
|
||||||
private String resource;
|
|
||||||
private Date gmtCreate;
|
|
||||||
|
|
||||||
private int grade = 1;
|
|
||||||
private Integer paramIdx;
|
|
||||||
private double count;
|
|
||||||
private int controlBehavior = 0;
|
|
||||||
private int maxQueueingTimeMs = 0;
|
|
||||||
private int burstCount = 0;
|
|
||||||
private long durationInSec = 1L;
|
|
||||||
private List<ParamFlowItem> paramFlowItemList = new ArrayList();
|
|
||||||
private Map<Object, Integer> hotItems = new HashMap();
|
|
||||||
private boolean clusterMode = false;
|
|
||||||
private ParamFlowClusterConfig clusterConfig;
|
|
||||||
|
|
||||||
public int getGrade() {
|
|
||||||
return grade;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGrade(int grade) {
|
|
||||||
this.grade = grade;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Integer getParamIdx() {
|
|
||||||
return paramIdx;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setParamIdx(Integer paramIdx) {
|
|
||||||
this.paramIdx = paramIdx;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getCount() {
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCount(double count) {
|
|
||||||
this.count = count;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getControlBehavior() {
|
|
||||||
return controlBehavior;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setControlBehavior(int controlBehavior) {
|
|
||||||
this.controlBehavior = controlBehavior;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getMaxQueueingTimeMs() {
|
|
||||||
return maxQueueingTimeMs;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMaxQueueingTimeMs(int maxQueueingTimeMs) {
|
|
||||||
this.maxQueueingTimeMs = maxQueueingTimeMs;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getBurstCount() {
|
|
||||||
return burstCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setBurstCount(int burstCount) {
|
|
||||||
this.burstCount = burstCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getDurationInSec() {
|
|
||||||
return durationInSec;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDurationInSec(long durationInSec) {
|
|
||||||
this.durationInSec = durationInSec;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ParamFlowItem> getParamFlowItemList() {
|
|
||||||
return paramFlowItemList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setParamFlowItemList(List<ParamFlowItem> paramFlowItemList) {
|
|
||||||
this.paramFlowItemList = paramFlowItemList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map<Object, Integer> getHotItems() {
|
|
||||||
return hotItems;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setHotItems(Map<Object, Integer> hotItems) {
|
|
||||||
this.hotItems = hotItems;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isClusterMode() {
|
|
||||||
return clusterMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setClusterMode(boolean clusterMode) {
|
|
||||||
this.clusterMode = clusterMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ParamFlowClusterConfig getClusterConfig() {
|
|
||||||
return clusterConfig;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setClusterConfig(ParamFlowClusterConfig clusterConfig) {
|
|
||||||
this.clusterConfig = clusterConfig;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Date getGmtCreate() {
|
|
||||||
return gmtCreate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGmtCreate(Date gmtCreate) {
|
|
||||||
this.gmtCreate = gmtCreate;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setId(Long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getApp() {
|
|
||||||
return app;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setApp(String app) {
|
|
||||||
this.app = app;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getIp() {
|
|
||||||
return ip;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIp(String ip) {
|
|
||||||
this.ip = ip;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Integer getPort() {
|
|
||||||
return port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPort(Integer port) {
|
|
||||||
this.port = port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getLimitApp() {
|
|
||||||
return limitApp;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLimitApp(String limitApp) {
|
|
||||||
this.limitApp = limitApp;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getResource() {
|
|
||||||
return resource;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setResource(String resource) {
|
|
||||||
this.resource = resource;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Rule toRule() {
|
|
||||||
ParamFlowRule rule = new ParamFlowRule();
|
|
||||||
return rule;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1999-2018 Alibaba Group Holding Ltd.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.flow;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 流控规则拉取
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("flowRuleNacosProvider")
|
|
||||||
public class FlowRuleNacosProvider implements DynamicRuleProvider<List<FlowRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String, List<FlowRuleEntity>> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<FlowRuleEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName + SentinelConStants.FLOW_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, 3000);
|
|
||||||
if (StringUtil.isEmpty(rules)) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
return converter.convert(rules);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1999-2018 Alibaba Group Holding Ltd.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.flow;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 流控规则推送
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("flowRuleNacosPublisher")
|
|
||||||
public class FlowRuleNacosPublisher implements DynamicRulePublisher<List<FlowRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<FlowRuleEntity>, String> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<FlowRuleEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
configService.publishConfig(app + SentinelConStants.FLOW_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, converter.convert(rules));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.gateway;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
/**
|
|
||||||
* 网关API规则拉取
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("gateWayApiNacosProvider")
|
|
||||||
public class GateWayApiNacosProvider implements DynamicRuleProvider<List<ApiDefinitionEntity>> {
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String , List<ApiDefinitionEntity>> converter;
|
|
||||||
@Override
|
|
||||||
public List<ApiDefinitionEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName+ SentinelConStants.GETEWAY_API_DATA_ID_POSTFIX
|
|
||||||
, SentinelConStants.GROUP_ID,3000);
|
|
||||||
if(StringUtil.isEmpty(rules)){
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
return converter.convert(rules);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.gateway;
|
|
||||||
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
/**
|
|
||||||
* 网关API规则推送
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("gateWayApiNacosPublisher")
|
|
||||||
public class GateWayApiNacosPublisher implements DynamicRulePublisher<List<ApiDefinitionEntity>> {
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<ApiDefinitionEntity>, String> converter;
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<ApiDefinitionEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
configService.publishConfig(app+ SentinelConStants.GETEWAY_API_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID,converter.convert(rules));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.gateway;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关流控规则拉取
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("gateWayFlowRulesNacosProvider")
|
|
||||||
public class GateWayFlowRulesNacosProvider implements DynamicRuleProvider<List<GatewayFlowRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String, List<GatewayFlowRuleEntity>> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<GatewayFlowRuleEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName + SentinelConStants.GETEWAY_FLOW_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, 3000);
|
|
||||||
if (StringUtil.isEmpty(rules)) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
return converter.convert(rules);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.gateway;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 网关流控规则推送
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("gateWayFlowRulesNacosPublisher")
|
|
||||||
public class GateWayFlowRulesNacosPublisher implements DynamicRulePublisher<List<GatewayFlowRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<GatewayFlowRuleEntity>, String> converter;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<GatewayFlowRuleEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
configService.publishConfig(app + SentinelConStants.GETEWAY_FLOW_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, converter.convert(rules));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.paramflow;
|
|
||||||
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载热点参数规则
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("paramFlowRuleNacosProvider")
|
|
||||||
public class ParamFlowRuleNacosProvider implements DynamicRuleProvider<List<ParamFlowRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String, List<ParamFlowRuleCorrectEntity>> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ParamFlowRuleEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName + SentinelConStants.PARAM_FLOW_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, 3000);
|
|
||||||
if (StringUtil.isEmpty(rules)) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
List<ParamFlowRuleCorrectEntity> entityList = converter.convert(rules);
|
|
||||||
return entityList.stream().map(rule -> {
|
|
||||||
ParamFlowRule paramFlowRule = new ParamFlowRule();
|
|
||||||
BeanUtils.copyProperties(rule, paramFlowRule);
|
|
||||||
ParamFlowRuleEntity entity = ParamFlowRuleEntity.fromParamFlowRule(rule.getApp(), rule.getIp(), rule.getPort(), paramFlowRule);
|
|
||||||
entity.setId(rule.getId());
|
|
||||||
entity.setGmtCreate(rule.getGmtCreate());
|
|
||||||
return entity;
|
|
||||||
}).collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.paramflow;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 持久化热点参数规则
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("paramFlowRuleNacosPublisher")
|
|
||||||
public class ParamFlowRuleNacosPublisher implements DynamicRulePublisher<List<ParamFlowRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<ParamFlowRuleCorrectEntity>, String> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<ParamFlowRuleEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
rules.forEach(e -> e.setApp(app));
|
|
||||||
|
|
||||||
// 转换
|
|
||||||
List<ParamFlowRuleCorrectEntity> list = rules.stream().map(rule -> {
|
|
||||||
ParamFlowRuleCorrectEntity entity = new ParamFlowRuleCorrectEntity();
|
|
||||||
BeanUtils.copyProperties(rule, entity);
|
|
||||||
return entity;
|
|
||||||
}).collect(Collectors.toList());
|
|
||||||
|
|
||||||
configService.publishConfig(app + SentinelConStants.PARAM_FLOW_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, converter.convert(list));
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.system;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 加载系统规则
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("systemRuleNacosProvider")
|
|
||||||
public class SystemRuleNacosProvider implements DynamicRuleProvider<List<SystemRuleEntity>> {
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<String, List<SystemRuleEntity>> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<SystemRuleEntity> getRules(String appName) throws Exception {
|
|
||||||
String rules = configService.getConfig(appName + SentinelConStants.SYSTEM_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, 3000);
|
|
||||||
if (StringUtil.isEmpty(rules)) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
return converter.convert(rules);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
package com.alibaba.csp.sentinel.dashboard.rule.nacos.system;
|
|
||||||
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity;
|
|
||||||
import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
|
|
||||||
import com.alibaba.csp.sentinel.datasource.Converter;
|
|
||||||
import com.alibaba.csp.sentinel.util.AssertUtil;
|
|
||||||
import com.alibaba.nacos.api.config.ConfigService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 持久化系统规则
|
|
||||||
*
|
|
||||||
* @author zyf
|
|
||||||
* @date 2022-04-13
|
|
||||||
*/
|
|
||||||
@Component("systemRuleNacosPublisher")
|
|
||||||
public class SystemRuleNacosPublisher implements DynamicRulePublisher<List<SystemRuleEntity>> {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ConfigService configService;
|
|
||||||
@Autowired
|
|
||||||
private Converter<List<SystemRuleEntity>, String> converter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void publish(String app, List<SystemRuleEntity> rules) throws Exception {
|
|
||||||
AssertUtil.notEmpty(app, "app name cannot be empty");
|
|
||||||
if (rules == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
configService.publishConfig(app + SentinelConStants.SYSTEM_DATA_ID_POSTFIX,
|
|
||||||
SentinelConStants.GROUP_ID, converter.convert(rules));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
server:
|
|
||||||
port: 9000
|
|
||||||
servlet:
|
|
||||||
session:
|
|
||||||
cookie:
|
|
||||||
name: sentinel_dashboard_cookie
|
|
||||||
encoding:
|
|
||||||
charset: UTF-8
|
|
||||||
enabled: true
|
|
||||||
force: true
|
|
||||||
spring:
|
|
||||||
mvc:
|
|
||||||
#Spring Boot 2.6+\u540E\u6620\u5C04\u5339\u914D\u7684\u9ED8\u8BA4\u7B56\u7565\u5DF2\u4ECEAntPathMatcher\u66F4\u6539\u4E3APathPatternParser,\u9700\u8981\u624B\u52A8\u6307\u5B9A\u4E3Aant-path-matcher
|
|
||||||
pathmatch:
|
|
||||||
matching-strategy: ant_path_matcher
|
|
||||||
#auth settings
|
|
||||||
auth:
|
|
||||||
filter:
|
|
||||||
exclude-url-suffixes: htm,html,js,css,map,ico,ttf,woff,png
|
|
||||||
exclude-urls: /,/auth/login,/auth/logout,/registry/machine,/version
|
|
||||||
logging:
|
|
||||||
level:
|
|
||||||
org:
|
|
||||||
springframework:
|
|
||||||
web: INFO
|
|
||||||
pattern:
|
|
||||||
file: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n'
|
|
||||||
file:
|
|
||||||
name: ${user.home}/logs/csp/sentinel-dashboard.log
|
|
||||||
nacos:
|
|
||||||
server:
|
|
||||||
ip: @config.server-addr@
|
|
||||||
sentinel:
|
|
||||||
dashboard:
|
|
||||||
version: 1.8.2
|
|
||||||
auth:
|
|
||||||
username: sentinel
|
|
||||||
password: sentinel
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>jeecg-cloud-test</artifactId>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<version>3.9.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<description>公共测试模块</description>
|
|
||||||
<artifactId>jeecg-cloud-test-more</artifactId>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!-- 引入jeecg-boot-starter-cloud依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-cloud</artifactId>
|
|
||||||
<!--system模块需要排除jeecg-system-cloud-api-->
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-system-cloud-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<!--定时任务-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-job</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!--rabbitmq消息队列-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-rabbitmq</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- 分布式锁依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.boot3</groupId>
|
|
||||||
<artifactId>jeecg-boot-starter-lock</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
package org.jeecg.modules.test.constant;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 微服务单元测试常量定义
|
|
||||||
* @author: zyf
|
|
||||||
* @date: 2022/04/21
|
|
||||||
*/
|
|
||||||
public interface CloudConstant {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* MQ测试队列名字
|
|
||||||
*/
|
|
||||||
public final static String MQ_JEECG_PLACE_ORDER = "jeecg_place_order";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* MQ测试消息总线
|
|
||||||
*/
|
|
||||||
public final static String MQ_DEMO_BUS_EVENT = "demoBusEvent";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 分布式锁lock key
|
|
||||||
*/
|
|
||||||
public final static String REDISSON_DEMO_LOCK_KEY1 = "demoLockKey1";
|
|
||||||
public final static String REDISSON_DEMO_LOCK_KEY2 = "demoLockKey2";
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
package org.jeecg.modules.test.feign.client;
|
|
||||||
|
|
||||||
import org.jeecg.common.api.vo.Result;
|
|
||||||
|
|
||||||
import org.jeecg.common.constant.ServiceNameConstants;
|
|
||||||
import org.jeecg.config.FeignConfig;
|
|
||||||
import org.jeecg.modules.test.constant.CloudConstant;
|
|
||||||
import org.jeecg.modules.test.feign.factory.JeecgTestClientFactory;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 常规feign接口定义
|
|
||||||
* @author: zyf
|
|
||||||
* @date: 2022/04/21
|
|
||||||
*/
|
|
||||||
@FeignClient(value = ServiceNameConstants.SERVICE_DEMO, configuration = FeignConfig.class,fallbackFactory = JeecgTestClientFactory.class)
|
|
||||||
@Component
|
|
||||||
public interface JeecgTestClient {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* feign测试方法
|
|
||||||
* @param name
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@GetMapping(value = "/test/getMessage")
|
|
||||||
String getMessage(@RequestParam(value = "name",required = false) String name);
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
//package org.jeecg.modules.test.feign.client;
|
|
||||||
//
|
|
||||||
//import org.jeecg.common.api.vo.Result;
|
|
||||||
//import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
//import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
//import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
//
|
|
||||||
///**
|
|
||||||
// * 动态feign接口定义
|
|
||||||
// */
|
|
||||||
//public interface JeecgTestClientDyn {
|
|
||||||
//
|
|
||||||
// @GetMapping(value = "/test/getMessage")
|
|
||||||
// Result<String> getMessage(@RequestParam(value = "name",required = false) String name);
|
|
||||||
//}
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
package org.jeecg.modules.test.feign.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.jeecg.common.api.vo.Result;
|
|
||||||
import org.jeecg.modules.test.feign.client.JeecgTestClient;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import com.alibaba.csp.sentinel.annotation.SentinelResource;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 微服务单元测试
|
|
||||||
* @author: zyf
|
|
||||||
* @date: 2022/04/21
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/sys/test")
|
|
||||||
@Tag(name = "【微服务】单元测试")
|
|
||||||
public class JeecgTestFeignController {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private JeecgTestClient jeecgTestClient;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 熔断： fallbackFactory优先于 @SentinelResource
|
|
||||||
*
|
|
||||||
* @param name
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@GetMapping("/getMessage")
|
|
||||||
@Operation(summary = "测试feign调用demo服务1")
|
|
||||||
@SentinelResource(value = "test_more_getMessage", fallback = "getDefaultUser")
|
|
||||||
public Result<String> getMessage(@RequestParam(value = "name", required = false) String name) {
|
|
||||||
log.info("---------Feign fallbackFactory优先级高于@SentinelResource-----------------");
|
|
||||||
String resultMsg = jeecgTestClient.getMessage(" I am jeecg-system 服务节点，呼叫 jeecg-demo!");
|
|
||||||
return Result.OK(null, resultMsg);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 测试方法：关闭demo服务，访问请求 http://127.0.0.1:9999/sys/test/getMessage
|
|
||||||
*
|
|
||||||
* @param name
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@GetMapping("/getMessage2")
|
|
||||||
@Operation(summary = "测试feign调用demo服务2")
|
|
||||||
public Result<String> getMessage2(@RequestParam(value = "name", required = false) String name) {
|
|
||||||
log.info("---------测试 Feign fallbackFactory-----------------");
|
|
||||||
String resultMsg = jeecgTestClient.getMessage(" I am jeecg-system 服务节点，呼叫 jeecg-demo!");
|
|
||||||
return Result.OK(null, resultMsg);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/fallback")
|
|
||||||
@Operation(summary = "测试熔断")
|
|
||||||
@SentinelResource(value = "test_more_fallback", fallback = "getDefaultUser")
|
|
||||||
public Result<Object> test(@RequestParam(value = "name", required = false) String name) {
|
|
||||||
if (StringUtils.isEmpty(name)) {
|
|
||||||
throw new IllegalArgumentException("name param is empty");
|
|
||||||
}
|
|
||||||
return Result.OK();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 熔断，默认回调函数
|
|
||||||
*
|
|
||||||
* @param name
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public Result<Object> getDefaultUser(String name) {
|
|
||||||
log.info("熔断，默认回调函数");
|
|
||||||
return Result.error(null, "访问超时, 自定义 @SentinelResource Fallback");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
package org.jeecg.modules.test.feign.factory;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
|
||||||
import org.jeecg.modules.test.feign.client.JeecgTestClient;
|
|
||||||
import org.jeecg.modules.test.feign.fallback.JeecgTestFallback;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author qinfeng
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class JeecgTestClientFactory implements FallbackFactory<JeecgTestClient> {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public JeecgTestClient create(Throwable throwable) {
|
|
||||||
JeecgTestFallback fallback = new JeecgTestFallback();
|
|
||||||
fallback.setCause(throwable);
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user