pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-01-02 19:15:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

Browse Source
This commit is contained in:
JEECG
2025-09-25 15:22:55 +08:00
parent 6a6d29254b 2298ee3eed
commit aa55c3a86c
6 changed files with 259 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@ public class SysTenantController {
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysTenant> add(@RequestBody SysTenant sysTenant) {
Result<SysTenant> result = new Result();
if(sysTenantService.getById(sysTenant.getId())!=null){
if(sysTenant!=null && oConvertUtils.isNotEmpty(sysTenant.getId()) && sysTenantService.getById(sysTenant.getId())!=null){
return result.error500("该编号已存在!");
}
try {

8
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
View File

@ -160,7 +160,7 @@ spring:
data:
redis:
database: 0
host: 127.0.0.1
host: jeecg-boot-redis
port: 6379
password:
#mybatis plus 设置
@ -267,11 +267,11 @@ jeecg:
#xxl-job配置
xxljob:
enabled: false
adminAddresses: http://127.0.0.1:9080/xxl-job-admin
adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin
appname: ${spring.application.name}
accessToken: ''
address: 127.0.0.1:30007
ip: 127.0.0.1
address: jeecg-boot-xxljob:30007
ip: jeecg-boot-xxljob
port: 30007
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30