Merge remote-tracking branch 'origin/master'

linwei

2026-02-04 6291ab6aa504dd219c286c680a7e7ede907e4177

Merge remote-tracking branch 'origin/master'

 drone-common/src/main/java/org/sxkj/common/constant/LauncherConstant.java

@@ -43,7 +43,7 @@
    /**
     * nacos prod 地址
     */
    String NACOS_PROD_ADDR = "127.0.0.1:8899";
    String NACOS_PROD_ADDR = "172.19.118.191:8899";
    String NACOS_LOCAL_ADDR = "192.168.1.227:8848";

    /**

 drone-service/drone-gd/docker-compose-prod.yml

@@ -2,12 +2,12 @@
services:
  drone_gd:
    # 从 Harbor 私有仓库拉取镜像
    image: 172.21.81.239:32002/drone-manage/drone-gd:SNAPSHOT-$BUILD_NUMBER
    image: 172.21.81.239:32002/drone-manage-test/drone-gd:SNAPSHOT-$BUILD_NUMBER
    # image: drone-gd:latest
    container_name: drone-gd
    # 宿主机端口：容器启动端口
    ports:
      - "8106:8106"
      - "8102:8102"
    volumes:
      - /app/logs/drone-gd:/data/logs/drone-gd
      - /software/service/liscense:/software/service/liscense

 drone-service/drone-gd/docker-compose-test.yml

@@ -20,6 +20,7 @@
    networks:
      - doc_drone_network


# 指定
networks:
  doc_drone_network:

 drone-service/drone-system/docker-compose-prod.yml

@@ -2,7 +2,7 @@
services:
  ja_drone_system:
    # 从 Harbor 私有仓库拉取镜像
    image: 172.21.81.239:32002/drone-manage/ja-drone-system:SNAPSHOT-$BUILD_NUMBER
    image: 172.21.81.239:32002/drone-manage-test/ja-drone-system:SNAPSHOT-$BUILD_NUMBER
    # image: ja-drone-system:latest
    container_name: ja-drone-system
    # 宿主机端口：容器启动端口

 drone-service/drone-system/docker-compose-test.yml

@@ -20,6 +20,7 @@
    networks:
      - doc_drone_network


# 指定
networks:
  doc_drone_network: