|
|
5bcb649384
|
Merge remote-tracking branch 'origin/springboot3' into springboot3_sas
|
2025-10-22 09:32:55 +08:00 |
|
|
|
30ac3f7c72
|
升级shardingsphere-jdbc版本到5.5.0，需要手工配置ShardingSphere数据源到spring.datasource.dynamic.datasource中，用法更明确
|
2025-10-14 16:02:15 +08:00 |
|
|
|
03739f2837
|
【springboot3分支 issues/7353】The bean 'dataSource', defined in class path resource #7353
|
2024-10-19 20:18:35 +08:00 |
|
|
|
79f7134bd5
|
【springboot3分支 issues/7353】The bean 'dataSource', defined in class path resource #7353
|
2024-10-19 19:30:05 +08:00 |
|
|
|
96ab98ac3e
|
Merge remote-tracking branch 'origin/springboot3' into springboot3_sas
# Conflicts:
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java
|
2024-06-23 10:29:34 +08:00 |
|
|
|
7778ede90e
|
Merge remote-tracking branch 'origin/master' into springboot3
# Conflicts:
# 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/UndertowCustomizer.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
# jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
|
2024-06-23 10:23:56 +08:00 |
|
|
|
bb918b742e
|
前端代码和后端代码合并到一个仓库中
|
2024-06-23 10:09:17 +08:00 |
|
