From e3fa8525dcaad07793b8fca54d7fefb5b01d4136 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 13 二月 2025 11:04:01 +0800 Subject: [PATCH] 三方引流切换线上环境 --- ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml | 56 ++++---- ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml | 56 ++++---- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java | 12 +- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/TCECKDUtil.java | 2 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/constant/IotConstant.java | 5 ruoyi-gateway/src/main/resources/bootstrap.yml | 4 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 56 ++++---- ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml | 56 ++++---- ruoyi-auth/src/main/resources/bootstrap.yml | 56 ++++---- ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml | 56 ++++---- 10 files changed, 179 insertions(+), 180 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 866e429..20ccecd 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod application: # 应用名称 name: ruoyi-auth @@ -56,52 +56,52 @@ type: nacos nacos: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - data-id: seata-server.properties - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + data-id: seata-server.properties + username: nacos + password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + username: nacos + password: nacos cloud: nacos: discovery: # 开发环境 - server-addr: 192.168.110.169:8848 # nacos注册中心地址 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 - group: DEFAULT_GROUP - application: seata-server #Nacos 中 Seata 名称 - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 # nacos注册中心地址 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + application: seata-server #Nacos 中 Seata 名称 + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 48963f2..7598ca6 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -12,8 +12,8 @@ allow-bean-definition-overriding: true profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod --- spring: config: diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index dbd2ab0..c8f030b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -11,8 +11,8 @@ allow-bean-definition-overriding: true profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod --- spring: config: @@ -55,52 +55,52 @@ type: nacos nacos: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - data-id: seata-server.properties - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + data-id: seata-server.properties + username: nacos + password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + username: nacos + password: nacos cloud: nacos: discovery: # 开发环境 - server-addr: 192.168.110.169:8848 # nacos注册中心地址 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 - group: DEFAULT_GROUP - application: seata-server #Nacos 中 Seata 名称 - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 # nacos注册中心地址 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + application: seata-server #Nacos 中 Seata 名称 + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml index 04e3980..742f2c5 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml +++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml @@ -12,8 +12,8 @@ allow-circular-references: true profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod --- spring: config: @@ -56,52 +56,52 @@ type: nacos nacos: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - data-id: seata-server.properties - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + data-id: seata-server.properties + username: nacos + password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + username: nacos + password: nacos cloud: nacos: discovery: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 - group: DEFAULT_GROUP - application: seata-server #Nacos 中 Seata 名称 - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + application: seata-server #Nacos 中 Seata 名称 + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java index 8d147f0..edc211e 100644 --- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java +++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java @@ -40,7 +40,7 @@ * 获取token */ public static String queryToken(Operator operator){ - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.QUERY_TOKEN.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.QUERY_TOKEN.getUrl()); JSONObject info = new JSONObject(); info.put("OperatorID", operator.getOurOperatorId()); info.put("OperatorSecret", operator.getOperatorSecret()); @@ -104,7 +104,7 @@ * @param info */ public static NotificationStationStatusResult notificationStationStatus(Operator operator, ConnectorStatusInfo info) { - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_STATION_STATUS.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.NOTIFICATION_STATION_STATUS.getUrl()); buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ @@ -136,7 +136,7 @@ * @return */ public static NotificationStartChargeResult notificationStartChargeResult(Operator operator, NotificationStartCharge info){ - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_START_CHARGE_RESULT.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.NOTIFICATION_START_CHARGE_RESULT.getUrl()); buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ @@ -169,7 +169,7 @@ * @return */ public static NotificationEquipChargeStatusResult notificationEquipChargeStatus(Operator operator, QueryEquipChargeStatusResult info){ - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getUrl()); buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ @@ -197,7 +197,7 @@ * @return */ public static NotificationStopCharge notificationStopChargeResult(Operator operator, NotificationStopChargeResult info){ - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_STOP_CHARGE_RESULT.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.NOTIFICATION_STOP_CHARGE_RESULT.getUrl()); buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ @@ -227,7 +227,7 @@ * @return */ public static NotificationChargeOrderInfoResult notificationChargeOrderInfo(Operator operator, NotificationChargeOrderInfo info){ - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_CHARGE_ORDER_INFO.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.NOTIFICATION_CHARGE_ORDER_INFO.getUrl()); buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/TCECKDUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/TCECKDUtil.java index bd5fa36..ebb5256 100644 --- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/TCECKDUtil.java +++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/TCECKDUtil.java @@ -50,7 +50,7 @@ stationChange.setType(type); List<String> collect = siteIds.stream().map(String::valueOf).collect(Collectors.toList()); stationChange.setStationIds(collect); - HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_STATION_CHANGE.getUrl()); + HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.NOTIFICATION_STATION_CHANGE.getUrl()); buildBody(post, stationChange, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/constant/IotConstant.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/constant/IotConstant.java index 801516d..bc13bcc 100644 --- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/constant/IotConstant.java +++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/constant/IotConstant.java @@ -12,10 +12,9 @@ */ public static final String PASSWORD = "password"; /** - * URL TODO 还原生产环境配置 + * URL */ -// public static final String URL = "https://94cb3eb5f9.st1.iotda-app.cn-south-1.myhuaweicloud.com"; - public static final String URL = "https://43b1e3246f.st1.iotda-app.cn-south-1.myhuaweicloud.com"; + public static final String URL = "https://94cb3eb5f9.st1.iotda-app.cn-south-1.myhuaweicloud.com"; /** * 创建产品 */ diff --git a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml index b6335df..60c4fde 100644 --- a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml +++ b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml @@ -12,8 +12,8 @@ allow-circular-references: true profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod --- spring: @@ -57,52 +57,52 @@ type: nacos nacos: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - data-id: seata-server.properties - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + data-id: seata-server.properties + username: nacos + password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + username: nacos + password: nacos cloud: nacos: discovery: # 开发环境 - server-addr: 192.168.110.169:8848 # nacos注册中心地址 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 - group: DEFAULT_GROUP - application: seata-server #Nacos 中 Seata 名称 - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 # nacos注册中心地址 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + application: seata-server #Nacos 中 Seata 名称 + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml index 5592450..24c7d3a 100644 --- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml +++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml @@ -12,8 +12,8 @@ allow-circular-references: true profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod --- spring: config: @@ -56,52 +56,52 @@ type: nacos nacos: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - data-id: seata-server.properties - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + data-id: seata-server.properties + username: nacos + password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + username: nacos + password: nacos cloud: nacos: discovery: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 - group: DEFAULT_GROUP - application: seata-server #Nacos 中 Seata 名称 - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + application: seata-server #Nacos 中 Seata 名称 + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml index b529753..36f0e29 100644 --- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml +++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml @@ -12,8 +12,8 @@ allow-circular-references: true profiles: # 环境配置 - active: dev -# active: prod +# active: dev + active: prod --- spring: config: @@ -56,52 +56,52 @@ type: nacos nacos: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - data-id: seata-server.properties - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # data-id: seata-server.properties # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + data-id: seata-server.properties + username: nacos + password: nacos registry: type: nacos nacos: application: seata-server # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb - group: DEFAULT_GROUP - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # group: DEFAULT_GROUP # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + username: nacos + password: nacos cloud: nacos: discovery: # 开发环境 - server-addr: 192.168.110.169:8848 - namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 - group: DEFAULT_GROUP - application: seata-server #Nacos 中 Seata 名称 - username: nacos - password: nacos - # 生产环境 -# server-addr: 192.168.0.137:8848,192.168.0.123:8848 -# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a +# server-addr: 192.168.110.169:8848 +# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间 # group: DEFAULT_GROUP # application: seata-server #Nacos 中 Seata 名称 # username: nacos # password: nacos + # 生产环境 + server-addr: 192.168.0.137:8848,192.168.0.123:8848 + namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a + group: DEFAULT_GROUP + application: seata-server #Nacos 中 Seata 名称 + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8080 # Sentinel控制台地址 -- Gitblit v1.7.1