吉安感知网项目-后端
zhongrj
2026-03-31 58092de870f2c6cae3ede8364977fe30ff5c7f9f
fix: nacos 命名空间动态配置修改
3 files modified
55 ■■■■■ changed files
drone-common/src/main/java/org/sxkj/common/constant/LauncherConstant.java 50 ●●●●● patch | view | raw | blame | history
drone-common/src/main/java/org/sxkj/common/launch/LauncherServiceImpl.java 4 ●●●● patch | view | raw | blame | history
drone-ops/drone-resource/src/main/resources/log/logback-prod.xml 1 ●●●● patch | view | raw | blame | history
drone-common/src/main/java/org/sxkj/common/constant/LauncherConstant.java
@@ -44,6 +44,10 @@
     * nacos prod 地址
     */
    String NACOS_PROD_ADDR = "172.19.118.191:8899";
    /**
     * nacos 本地地址
     */
    String NACOS_LOCAL_ADDR = "192.168.1.227:8848";
    /**
@@ -52,9 +56,29 @@
    String NACOS_TEST_ADDR = "192.168.1.36:18848";
    /**
     * nacos dev 命名空间
     */
    String NACOS_DEV_NS = "ja-dev";
    /**
     * nacos prod 命名空间
     */
    String NACOS_PROD_NS = "ja-prod";
    /**
     * nacos 本地 命名空间
     */
    String NACOS_LOCAL_NS = "ja-dev";
    /**
     * nacos test 命名空间
     */
    String NACOS_TEST_NS = "ja-dev";
    /**
     * sentinel dev 地址
     */
    String SENTINEL_DEV_ADDR = "127.0.0.1:8858";
    String SENTINEL_DEV_NS = "127.0.0.1:8858";
    /**
     * sentinel prod 地址
@@ -65,6 +89,11 @@
     * sentinel test 地址
     */
    String SENTINEL_TEST_ADDR = "172.30.0.58:8858";
    /**
     * sentinel dev 地址
     */
    String SENTINEL_DEV_ADDR = "172.30.0.58:8858";
    /**
     * seata dev 地址
@@ -161,6 +190,25 @@
    }
    /**
     * 动态获取nacos 命名空间
     *
     * @param profile 环境变量
     * @return addr
     */
    static String nacosNs(String profile) {
        switch (profile) {
            case (AppConstant.PROD_CODE):
                return NACOS_PROD_NS;
            case (AppConstant.TEST_CODE):
                return NACOS_TEST_NS;
            case ("local"):
                return NACOS_LOCAL_NS;
            default:
                return NACOS_DEV_NS;
        }
    }
    /**
     * 动态获取sentinel地址
     *
     * @param profile 环境变量
drone-common/src/main/java/org/sxkj/common/launch/LauncherServiceImpl.java
@@ -41,8 +41,8 @@
        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
        PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
        // 指定命名空间
         PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "ja-dev");
         PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "ja-dev");
        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.nacosNs( profile));
        PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.nacosNs( profile));
        PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
        PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
        PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");
drone-ops/drone-resource/src/main/resources/log/logback-prod.xml
@@ -10,6 +10,7 @@
                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
    <conversionRule conversionWord="wEx"
                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
    <property name="LOG_PATH" value="${LOG_PATH:-/data/logs/${springAppName}}"/>
    <!-- 彩色日志格式 -->
    <property name="CONSOLE_LOG_PATTERN"
              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>