|
|
a00fcae3a3
|
【v3.8.0 合并】Merge remote-tracking branch 'origin/master' into springboot3
# Conflicts:
# README.md
# jeecg-boot/db/tables_nacos.sql
# jeecg-boot/jeecg-boot-base-core/pom.xml
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
# jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
# jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiLogController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiPermissionController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApi.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiAuth.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiHeader.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiLog.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiParam.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiAuthFilter.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiLogMapper.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiLogService.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
# jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java
# jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java
# jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
# jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/controller/JeecgMqTestController.java
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java
# jeecg-boot/pom.xml
|
2025-05-15 20:01:54 +08:00 |
|
|
|
a89b299a4b
|
邮件发送失败，修改yml配置方式
|
2025-04-21 10:19:23 +08:00 |
|
|
|
6e721e4120
|
归集spring-doc默认配置
(cherry picked from commit d4d0c884f0)
|
2025-04-15 10:39:05 +08:00 |
|
|
|
c6fe809013
|
AIGC大模型增加向量库的yml配置
|
2025-04-14 19:05:27 +08:00 |
|
|
|
47a2a6fbac
|
Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot
|
2025-04-09 13:45:29 +08:00 |
|
|
|
cf63b056d5
|
新增controller测试用例
|
2025-04-08 09:20:00 +08:00 |
|
|
|
beff2a271e
|
Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot
|
2025-04-07 16:10:29 +08:00 |
|
|
|
70a1f0b7db
|
编写单个controller的测试用例
|
2025-04-07 15:59:46 +08:00 |
|
|
|
e166d916da
|
重要参数补充
|
2025-04-07 15:42:21 +08:00 |
|
|
|
4f371672d0
|
升级版本号v3.8.0，归档历史增量SQL
|
2025-04-07 15:18:02 +08:00 |
|
|
|
80ae183b58
|
升级版本号v3.8.0 发布AI大模型功能
|
2025-04-07 14:33:00 +08:00 |
|
|
|
b4cac11368
|
AI大模型管理功能后台代码
|
2025-04-07 14:10:37 +08:00 |
|
|
|
4936e140e9
|
归档老的增量SQL
|
2025-04-07 14:09:27 +08:00 |
|
|
|
d4d0c884f0
|
归集spring-doc默认配置
|
2025-04-03 22:31:26 +08:00 |
|
|
|
9ebc3c49ec
|
优化swagger文档架构改造
|
2025-04-03 17:54:51 +08:00 |
|
|
|
a17b403675
|
优化swagger文档架构改造
|
2025-04-03 17:46:11 +08:00 |
|
|
|
80d37f9a03
|
3.7.4 版本升级online在线开发模块
|
2025-03-31 11:58:30 +08:00 |
|
|
|
62daec9c16
|
3.7.4 版本增量升级SQL
|
2025-03-30 18:40:49 +08:00 |
|
|
|
9191a8b620
|
【3.7.4 开源代码同步】新增断言异常类和断言工具类，优化JWT工具类，更新文件类型白名单，切换undertow配置，修改多个YAML配置文件
|
2025-03-30 17:51:55 +08:00 |
|
|
|
5cd5bf7a0b
|
移除冗余Flyway配置，优化application.yml文件
|
2025-03-27 18:48:03 +08:00 |
|
|
|
2ec13165d3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jeecg-boot/pom.xml
|
2025-03-27 18:26:20 +08:00 |
|
|
|
5ff1b56fe2
|
移除junit4，使用默认junit5
|
2025-03-27 16:58:35 +08:00 |
|
|
|
ea914be3a6
|
升级至3.7.4，更新Dockerfile及jdk依赖
|
2025-03-27 15:19:41 +08:00 |
|
|
|
ff815f1ae6
|
更新版本至3.7.4并调整发布时间
|
2025-03-27 15:17:48 +08:00 |
|
|
|
e9326cab8c
|
Merge pull request #7651 from testnet0/master
修复flyway自动升级失败
|
2025-03-20 10:39:08 +08:00 |
|
|
|
7e15e81218
|
版本合并，升级springboot3分支到3.7.3
|
2025-02-20 17:56:16 +08:00 |
|
|
|
45f905ddac
|
Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot
|
2025-02-19 18:45:26 +08:00 |
|
|
|
55696efcaa
|
jimureport、jimubi升级到最新版1.9.4，补充权限注解
|
2025-02-19 18:45:14 +08:00 |
|
|
|
3671b81f01
|
Merge pull request #7564 from EightMonth/master
keys替换scan问题 修复 #6918 #6876
|
2025-02-19 18:42:09 +08:00 |
|
|
|
74ad7e6f92
|
jimureport、jimubi升级到最新版1.9.4
|
2025-02-19 15:03:07 +08:00 |
|
|
|
46fb1cce91
|
3.7.3版本启动提示连接不上mongodb #7787
|
2025-02-10 13:43:42 +08:00 |
|
|
|
b8ef121fe7
|
升级版本号3.7.3
|
2025-02-07 16:52:19 +08:00 |
|
|
|
d6c6a1c01f
|
租户套餐管理优化体验
|
2025-02-07 16:38:02 +08:00 |
|
|
|
8fc27bb261
|
AI默认切换成DeepSeek v3模型，提供更优的速度和质量
|
2025-01-14 21:51:39 +08:00 |
|
|
|
327f034640
|
JimuReport和JimuBI大屏，升级到1.9.3版本
|
2025-01-12 17:23:15 +08:00 |
|
|
|
ac30ed67bc
|
修复flyway自动升级失败
|
2024-12-25 15:38:39 +08:00 |
|
|
|
ee382c0a5b
|
全流程跑通
|
2024-12-21 23:50:07 +08:00 |
|
|
|
f7f6d0ff88
|
openapi全量功能
|
2024-12-20 17:53:45 +08:00 |
|
|
|
1c3b9a10f1
|
新版发布，升级3.7.2版本号
|
2024-12-09 17:07:38 +08:00 |
|
|
|
b0c4194602
|
v3.7.2 版本代码合并
|
2024-12-09 15:10:46 +08:00 |
|
|
|
03739f2837
|
【springboot3分支 issues/7353】The bean 'dataSource', defined in class path resource #7353
|
2024-10-19 20:18:35 +08:00 |
|
|
|
81eef5a838
|
修改docker镜像base为JDK17
|
2024-10-09 16:05:22 +08:00 |
|
|
|
512234a804
|
【版本合并】 branch 'origin/master' into springboot3
|
2024-10-08 19:30:14 +08:00 |
|
|
|
cc9384abb6
|
积木仪表盘升级到最新版1.8.1-beta
|
2024-09-11 22:22:02 +08:00 |
|
|
|
17180bfcd5
|
升级版本号3.7.1
|
2024-09-10 16:16:44 +08:00 |
|
|
|
17c68f6d53
|
3.7.1版本发布
|
2024-09-10 15:39:32 +08:00 |
|
|
|
2570e454ed
|
Docker镜像源失效，把docker镜像源换成国内的
|
2024-08-26 17:10:09 +08:00 |
|
|
|
0cada33e49
|
数据库配置默认增加达梦和人大金仓的配置，节省用户修改的成本
|
2024-08-22 19:30:55 +08:00 |
|
|
|
7049e9974e
|
无用参数去掉
|
2024-07-11 10:49:08 +08:00 |
|
|
|
3c7da54c3c
|
启动jar时报错：ElasticSearch 服务连接失败
|
2024-07-01 19:42:15 +08:00 |
|
