mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-14 22:22:50 +00:00
【合并v3.8.2 docker-compose优化配置】
Squashed commit of the following:
commit e70844ce6123336417cc4428d63ec43b65f74597
Merge: e00ffa26 676fffa2
Author: JEECG <445654970@qq.com>
Date: Fri Aug 1 10:54:33 2025 +0800
【合并v3.8.2 docker-compose优化配置】
Merge remote-tracking branch 'origin/master' into springboot3
# Conflicts:
# jeecg-boot/jeecg-boot-base-core/pom.xml
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
# jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
# jeecg-boot/pom.xml
commit e00ffa2670a401ebdedf2e01b46082c792b13f50
Author: JEECG <445654970@qq.com>
Date: Fri Aug 1 10:46:07 2025 +0800
升级autopoi到1.4.14最新版
commit 676fffa2c8e560004c24f22094639defb5161f81
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 22:47:01 2025 +0800
docker-compose增加jeecg-boot-pgvector
commit 23cc569a4769b9de195fdaa7d11e103ab0dceb23
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 18:12:57 2025 +0800
docker system日志中文乱码解决
commit dafacf153b036da67637e181eca12ac898f952a1
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 18:12:41 2025 +0800
升级版本号到3.8.2
commit 7a9f3575103de740066dd012ebff86fc1485b474
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 17:56:40 2025 +0800
更新v3.8.2 功能清单
commit f30a8c658a90020ec020fc702c680b2ee8562b70
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 11:35:16 2025 +0800
数据库缺少openapi微服务网关配置
commit e84d7726d2bbe60bacf759375c15aa74888a816c
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 10:20:09 2025 +0800
后台接口地址修改
commit 0f398026982aefe55a0113be688fa1339a8161ac
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 09:56:24 2025 +0800
docker自动化部署命令
commit a014a3ed0e81900e879bcce7bae7afcf68e15227
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 21:55:16 2025 +0800
v3.8.2 优化一键docker启动前后端
commit 5720d1a01ecdf003cbc7a29aedba4ca1bd88a96c
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 19:26:38 2025 +0800
升级版本号到3.8.2
commit 5eed6ac6d2145a50f6e0ea650fc3a3c2de1aee0a
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:49:29 2025 +0800
升级版本号到3.8.2
commit 0cfa1e223ae0907d0d25849484390dcfadd717c9
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:28:10 2025 +0800
v3.8.2 系统通知改造支持分类
commit 219869f4c01b848d31ab1a1d41f9613ae8762f5b
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:25:58 2025 +0800
v3.8.2 版本前端代码
commit e6edde963a4c65762d3ffd0b6f3257e138e54964
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:25:46 2025 +0800
v3.8.2 版本后端代码
commit c44b66128e5e89636be67a484875eef393824504
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:23:09 2025 +0800
XXL-JOB（2.4.0 及以上）已被移除，分片参数获取方式变更。
commit 9356b0474191a8ee038b9653c4051db25fb20922
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 10:57:52 2025 +0800
升级online到3.8.2-beta
commit d0a094f9a311e6d58b873681d483849ed848fa0b
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 10:57:31 2025 +0800
升级mybatis-plus到3.5.12、升级jsqlparser到4.9
commit 73eb62573798907d775f499994764469bbbc4f45
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 09:51:34 2025 +0800
升级jimureport到v2.1.1
commit 74880705b8f0baf0478277604f15ae61e1b1a842
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 09:18:46 2025 +0800
升级online到3.8.2-beta
# Conflicts:
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
This commit is contained in:
JEECG
parent
ada97acb04
commit
cae8e7e8d2
29
README.md
29
README.md
@ -48,7 +48,7 @@ JeecgBoot低代码平台，可以应用在任何J2EE项目的开发中，支持
|
||||
版本说明
|
||||
-----------------------------------
|
||||
|
||||
|下载 | JDK17 + SpringBoot2.7 | JDK17 + SpringBoot3.3 + Shiro |JDK17 + SpringBoot3.3+ SpringAuthorizationServer |
|
||||
|下载 | JDK17/JDK8 + SpringBoot2.7 | JDK17 + SpringBoot3.3 + Shiro |JDK17 + SpringBoot3.3+ SpringAuthorizationServer |
|
||||
|------|----------------------------------------------------|-----------------------------------------------------------------------------|--------------------------------------------|
|
||||
| Github | [`master`](https://github.com/jeecgboot/JeecgBoot) | [`springboot3`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3) 分支 | [`springboot3_sas`](https://github.com/jeecgboot/JeecgBoot/tree/springboot3_sas) 分支 |
|
||||
| Gitee | [`master`](https://gitee.com/jeecg/JeecgBoot) | [`springboot3`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3/) 分支 | [`springboot3_sas`](https://gitee.com/jeecg/JeecgBoot/tree/springboot3_sas) 分支 |
|
||||
@ -230,7 +230,7 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
|
||||
- JeecgBoot开源版采用 [Apache-2.0 license](LICENSE) 协议附加补充条款：允许商用使用，不会造成侵权行为，允许基于本平台软件开展业务系统开发（但在任何情况下，您不得使用本软件开发可能被认为与本软件竞争的软件).
|
||||
- 商业版与开源版主要区别在于商业版提供了技术支持 和 更多的企业级功能(例如：Online图表、流程监控、流程设计、流程审批、表单设计器、表单视图、积木报表企业版、OA办公、商业APP、零代码应用、Online模块源码等功能). [更多商业功能介绍，点击查看](README-Enterprise.md)
|
||||
- JeecgBoot未来发展方向是：零代码平台的建设，也就是团队的另外一款产品 [敲敲云零代码](https://www.qiaoqiaoyun.com) ，无需编码即可通过拖拽快速搭建企业级应用，与JeecgBoot低代码平台形成互补，满足从简单业务到复杂系统的全场景开发需求，目前已经上线，[欢迎注册体验](https://app.qiaoqiaoyun.com)
|
||||
- JeecgBoot未来发展方向是：零代码平台的建设，也就是团队的另外一款产品 [敲敲云零代码](https://www.qiaoqiaoyun.com) ，无需编码即可通过拖拽快速搭建企业级应用，与JeecgBoot低代码平台形成互补，满足从简单业务到复杂系统的全场景开发需求，目前已经开源，[欢迎下载](https://qiaoqiaoyun.com/downloadCode)
|
||||
|
||||
|
||||
|
||||
@ -254,6 +254,7 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
│ ├─用户管理
|
||||
│ ├─角色管理
|
||||
│ ├─菜单管理
|
||||
│ ├─首页配置
|
||||
│ ├─权限设置（支持按钮权限、数据权限）
|
||||
│ ├─表单权限（控制字段禁用、隐藏）
|
||||
│ ├─部门管理
|
||||
@ -264,7 +265,9 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
│ └─职务管理
|
||||
│ └─通讯录
|
||||
│ ├─多数据源管理
|
||||
│ └─多租户管理（租户管理、租户角色、我的租户）
|
||||
│ ├─白名单管理
|
||||
│ ├─第三方配置（对接钉钉和企业微信）
|
||||
│ └─多租户管理（租户管理、租户角色、我的租户、租户默认套餐管理）
|
||||
├─Online在线开发(低代码)
|
||||
│ ├─Online在线表单
|
||||
│ ├─Online代码生成器
|
||||
@ -272,6 +275,7 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
│ ├─仪表盘设计器
|
||||
│ ├─系统编码规则
|
||||
│ ├─系统校验规则
|
||||
│ ├─APP版本管理
|
||||
├─AI应用平台
|
||||
│ ├─AI知识库问答系统
|
||||
│ ├─AI大模型管理
|
||||
@ -284,10 +288,13 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
│ ├─AI聊天窗口支持移动端
|
||||
│ ├─支持常见大模型ChatGPT和DeepSeek、ollama等等
|
||||
│ ├─AI OCR示例
|
||||
├─积木报表设计器
|
||||
│ ├─打印设计器
|
||||
│ ├─数据报表设计
|
||||
│ ├─图形报表设计（支持echart）
|
||||
├─数据可视化
|
||||
│ ├─报表设计器(支持打印设计）
|
||||
│ ├─大屏设和仪表盘设计
|
||||
├─OpenAPI（基于AK和SK认证鉴权）
|
||||
│ ├─接口管理
|
||||
│ ├─接口授权
|
||||
│ ├─接口文档
|
||||
├─消息中心
|
||||
│ ├─消息管理
|
||||
│ ├─模板管理
|
||||
@ -301,8 +308,10 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
│ ├─平台移动自适应支持
|
||||
│ ├─提供新版uniapp3的代码生成器模板
|
||||
├─系统监控
|
||||
│ ├─基于AK和SK认证鉴权OpenAPI功能
|
||||
│ ├─Gateway路由网关
|
||||
│ ├─基于AK和SK认证鉴权OpenAPI功能
|
||||
│ ├─定时任务
|
||||
│ ├─数据源管理
|
||||
│ ├─性能扫描监控
|
||||
│ │ ├─监控 Redis
|
||||
│ │ ├─Tomcat
|
||||
@ -310,13 +319,11 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类
|
||||
│ │ ├─服务器信息
|
||||
│ │ ├─请求追踪
|
||||
│ │ ├─磁盘监控
|
||||
│ ├─定时任务
|
||||
│ ├─系统日志
|
||||
│ ├─消息中心（支持短信、邮件、微信推送等等）
|
||||
│ ├─数据日志（记录数据快照，可对比快照，查看数据变更情况）
|
||||
│ ├─系统通知
|
||||
│ ├─SQL监控
|
||||
│ ├─swagger-ui(在线接口文档)
|
||||
│ ├─在线用户
|
||||
│─报表示例
|
||||
│ ├─曲线图
|
||||
│ └─饼状图
|
||||
|
||||
@ -32,6 +32,19 @@ services:
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
jeecg-boot-pgvector:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector
|
||||
container_name: jeecg-boot-pgvector
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: vector_db
|
||||
ports:
|
||||
- 5432:5432
|
||||
restart: always
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
jeecg-boot-nacos:
|
||||
restart: always
|
||||
build:
|
||||
|
||||
@ -32,6 +32,19 @@ services:
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
jeecg-boot-pgvector:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector
|
||||
container_name: jeecg-boot-pgvector
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: vector_db
|
||||
ports:
|
||||
- 5432:5432
|
||||
restart: always
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
jeecg-boot-system:
|
||||
build:
|
||||
context: ./jeecg-boot/jeecg-module-system/jeecg-system-start
|
||||
|
||||
@ -18,7 +18,7 @@ services:
|
||||
--max_allowed_packet=128M
|
||||
--default-authentication-plugin=caching_sha2_password
|
||||
ports:
|
||||
- 3306:3306
|
||||
- 13306:3306
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
@ -32,6 +32,19 @@ services:
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
jeecg-boot-pgvector:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector
|
||||
container_name: jeecg-boot-pgvector
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: vector_db
|
||||
ports:
|
||||
- 5432:5432
|
||||
restart: always
|
||||
networks:
|
||||
- jeecg-boot
|
||||
|
||||
jeecg-boot-system:
|
||||
build:
|
||||
context: ./jeecg-module-system/jeecg-system-start
|
||||
|
||||
@ -382,7 +382,7 @@ public class OpenApiController extends JeecgController<OpenApi, OpenApiService>
|
||||
SwaggerInfo info = new SwaggerInfo();
|
||||
|
||||
info.setDescription("OpenAPI 接口列表");
|
||||
info.setVersion("3.8.1");
|
||||
info.setVersion("3.8.2");
|
||||
info.setTitle("OpenAPI 接口列表");
|
||||
info.setTermsOfService("https://jeecg.com");
|
||||
|
||||
|
||||
@ -13,4 +13,4 @@ EXPOSE 8080
|
||||
#ADD ./src/main/resources/jeecg ./config/jeecg
|
||||
ADD ./target/jeecg-system-start-3.8.2.jar ./
|
||||
|
||||
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.2.jar
|
||||
CMD sleep 60;java -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.2.jar
|
||||
@ -197,9 +197,9 @@ jeecg:
|
||||
# AIRag向量库
|
||||
ai-rag:
|
||||
embed-store:
|
||||
host: 127.0.0.1
|
||||
host: jeecg-boot-pgvector
|
||||
port: 5432
|
||||
database: postgres
|
||||
database: vector_db
|
||||
user: postgres
|
||||
password: postgres
|
||||
table: embeddings
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
<aliyun.oss.version>3.17.3</aliyun.oss.version>
|
||||
<java-jwt.version>3.11.0</java-jwt.version>
|
||||
<codegenerate.version>1.4.9</codegenerate.version>
|
||||
<autopoi-web.version>1.4.11</autopoi-web.version>
|
||||
<autopoi-web.version>1.4.14</autopoi-web.version>
|
||||
<minio.version>8.5.7</minio.version>
|
||||
<justauth-spring-boot-starter.version>1.4.0</justauth-spring-boot-starter.version>
|
||||
<justauth.version>1.16.6</justauth.version>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user