添加jeecg-boot网络到sentinel和xxljob服务

微服务docker启动增加sentinel和xxljob
Oracle11g数据库多租户管理>>添加租户报错 #8897
2026-02-04 01:25:34 +08:00 · 2025-09-25 13:48:00 +08:00 · 2025-09-25 12:55:25 +08:00 · 2025-09-25 12:54:54 +08:00 · 2025-09-25 11:19:31 +08:00 · 2025-09-25 10:26:03 +08:00
7 changed files with 180 additions and 175 deletions
--- a/README-EN.md
+++ b/README-EN.md
@ -7,12 +7,12 @@
 JEECG BOOT AI Low Code Platform
 ===============

-Current version: 3.8.2 (Release date: 2025-08-04)
+Current version: 3.8.3 (Release date: 2025-10-09)


 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-guojusoft-orange.svg)](http://www.jeecg.com)
-[![](https://img.shields.io/badge/version-3.8.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.8.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)

--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@
 JeecgBoot AI低代码平台
 ===============

-当前最新版本： 3.8.3（发布日期：2025-09-22） 
+当前最新版本： 3.8.3（发布日期：2025-10-09） 


 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/jeecgboot/JeecgBoot/blob/master/LICENSE)
--- a/docker-compose-cloud.yml
+++ b/docker-compose-cloud.yml
@ -109,28 +109,33 @@ services:
 #    environment:
 #      RABBITMQ_DEFAULT_USER: guest
 #      RABBITMQ_DEFAULT_PASS: guest
-#  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

+  jeecg-boot-sentinel:
+     restart: on-failure
+     build:
+       context: ./jeecg-boot/jeecg-server-cloud/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
+     networks:
+       - jeecg-boot
+  
+  jeecg-boot-xxljob:
+     build:
+       context: ./jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob
+     ports:
+       - 9080:9080
+     container_name: jeecg-boot-xxljob
+     hostname: jeecg-boot-xxljob
+     networks:
+       - jeecg-boot
+  
  jeecg-vue:
    build:
      context: ./jeecgboot-vue3
--- a/jeecg-boot/db/tables_nacos.sql
+++ b/jeecg-boot/db/tables_nacos.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
@ -133,7 +133,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 {
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
@ -266,11 +266,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
--- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
@ -12,5 +12,5 @@ EXPOSE 9080

 ADD ./target/jeecg-cloud-xxljob-3.8.3.jar ./

-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.8.3.jar
+CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.8.3.jar
Author	SHA1	Message	Date
JEECG	cdd7c5c5a1	添加jeecg-boot网络到sentinel和xxljob服务	2025-09-25 13:48:00 +08:00
JEECG	120cf85eb4	微服务docker启动增加sentinel和xxljob	2025-09-25 12:55:25 +08:00
JEECG	a3969a5c63	Oracle11g数据库多租户管理>>添加租户报错 #8897	2025-09-25 12:54:54 +08:00
JEECG	1222c76ff8	更新xxl-job配置，修改adminAddresses和地址为jeecg-boot-xxljob	2025-09-25 11:19:31 +08:00
JEECG	6048866313	升级nacos配置	2025-09-25 10:26:03 +08:00
JEECG	83edfa9090	版本发布日期更新	2025-09-24 13:18:16 +08:00