diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index afee82b..68d393b 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 20652b5..0e9acdc 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +35,8 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/hw-basic/src/main/resources/bootstrap.yml b/ruoyi-modules/hw-basic/src/main/resources/bootstrap.yml index c36045a..74b8b2c 100644 --- a/ruoyi-modules/hw-basic/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/hw-basic/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java index ef8a7ed..ede97b4 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java @@ -447,8 +447,8 @@ public class HwMonitorPlatformController extends BaseController { * */ @PostMapping("/AlarmInfosExport") @RequiresPermissions("business:monitor:alarm") - public void AlarmInfosExport(HttpServletResponse response) { - List alarmInfoExportVos = hwAlarmInfoService.selectAlarmInfoExport(); + public void AlarmInfosExport(HttpServletResponse response,Date startTime,Date endTime) { + List alarmInfoExportVos = hwAlarmInfoService.selectAlarmInfoExport(startTime,endTime); ExcelUtil util = new ExcelUtil(AlarmInfoExportVo.class); util.exportExcel(response,alarmInfoExportVos,"报警数据导出"); } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java index 2948b84..9e50cef 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java @@ -93,6 +93,16 @@ public class HwAlarmRule extends BaseEntity private Double triggerDataB; + /** + * 时间范围 + */ + private Long triggerTimeFrame; + + /** + * 告警联系人 + */ + private String phoneNumbers; + @Excel(name = "所属租户") private String tenantName; @@ -354,6 +364,22 @@ public class HwAlarmRule extends BaseEntity this.alarmInfoFlag = alarmInfoFlag; } + public Long getTriggerTimeFrame() { + return triggerTimeFrame; + } + + public void setTriggerTimeFrame(Long triggerTimeFrame) { + this.triggerTimeFrame = triggerTimeFrame; + } + + public String getPhoneNumbers() { + return phoneNumbers; + } + + public void setPhoneNumbers(String phoneNumbers) { + this.phoneNumbers = phoneNumbers; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceMode.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceMode.java index 97675ac..cc3ae62 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceMode.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceMode.java @@ -98,6 +98,8 @@ public class HwDeviceMode extends BaseEntity { private String sceneName; + private String deviceModelType; + /** * 设备模型功能信息 */ @@ -231,6 +233,14 @@ public class HwDeviceMode extends BaseEntity { this.sceneName = sceneName; } + public String getDeviceModelType() { + return deviceModelType; + } + + public void setDeviceModelType(String deviceModelType) { + this.deviceModelType = deviceModelType; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeFunction.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeFunction.java index 8e9a62d..e78e1e6 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeFunction.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeFunction.java @@ -113,6 +113,8 @@ public class HwDeviceModeFunction extends BaseEntity // @Excel(name = "预留字段") private String propertyField; + private String deviceModelType; + private List inputParameters; private List outputParameters; @@ -316,6 +318,14 @@ public class HwDeviceModeFunction extends BaseEntity this.outputParameters = outputParameters; } + public String getDeviceModelType() { + return deviceModelType; + } + + public void setDeviceModelType(String deviceModelType) { + this.deviceModelType = deviceModelType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeParameter.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeParameter.java index 4a0f3c6..00387db 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeParameter.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceModeParameter.java @@ -64,6 +64,8 @@ public class HwDeviceModeParameter extends BaseEntity @Excel(name = "预留字段，步长") private BigDecimal propertyStep; + private String deviceModelType; + public void setModeParameterId(Long modeParameterId) { this.modeParameterId = modeParameterId; @@ -155,6 +157,14 @@ public class HwDeviceModeParameter extends BaseEntity return propertyStep; } + public String getDeviceModelType() { + return deviceModelType; + } + + public void setDeviceModelType(String deviceModelType) { + this.deviceModelType = deviceModelType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/VO/AlarmInfoExportVo.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/VO/AlarmInfoExportVo.java index 2452269..4ff0081 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/VO/AlarmInfoExportVo.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/VO/AlarmInfoExportVo.java @@ -17,7 +17,7 @@ public class AlarmInfoExportVo { @Excel(name = "报警区域") private String areaName; - @Excel(name = "计量箱名称") + @Excel(name = "报警位置") private String monitorUnitName; @Excel(name = "报警级别名称") @@ -29,6 +29,15 @@ public class AlarmInfoExportVo { @Excel(name = "报警时间") private String alarmTime; + @Excel(name = "ID") + private String monitor_unit_id; + + @Excel(name = "状态") + private String monitor_unit_status; + + @Excel(name = "类型") + private String monitor_unit_type_name; + public Long getAlarmInfoId() { return alarmInfoId; } @@ -77,6 +86,30 @@ public class AlarmInfoExportVo { this.alarmTime = alarmTime; } + public String getMonitor_unit_id() { + return monitor_unit_id; + } + + public void setMonitor_unit_id(String monitor_unit_id) { + this.monitor_unit_id = monitor_unit_id; + } + + public String getMonitor_unit_status() { + return monitor_unit_status; + } + + public void setMonitor_unit_status(String monitor_unit_status) { + this.monitor_unit_status = monitor_unit_status; + } + + public String getMonitor_unit_type_name() { + return monitor_unit_type_name; + } + + public void setMonitor_unit_type_name(String monitor_unit_type_name) { + this.monitor_unit_type_name = monitor_unit_type_name; + } + @Override public String toString() { return "AlarmInfoExportVo{" + diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmInfoMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmInfoMapper.java index 029ecb6..e130897 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmInfoMapper.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmInfoMapper.java @@ -1,10 +1,12 @@ package com.ruoyi.business.mapper; +import java.util.Date; import java.util.List; import com.ruoyi.business.domain.HwAlarmInfo; import com.ruoyi.business.domain.VO.AlarmInfoExportVo; import com.ruoyi.business.domain.VO.AlarmInfoVo; import com.ruoyi.business.domain.VO.AlarmTypeVo; +import org.apache.ibatis.annotations.Param; /** * 报警信息Mapper接口 @@ -80,7 +82,7 @@ public interface HwAlarmInfoMapper /** * 导出报警信息 * */ - List selectAlarmInfoExport(); + List selectAlarmInfoExport(@Param("startTime") Date startTime, @Param("endTime") Date endTime); /** * 批量处理报警信息 diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmInfoService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmInfoService.java index dfc742c..c5398c6 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmInfoService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmInfoService.java @@ -1,5 +1,6 @@ package com.ruoyi.business.service; +import java.util.Date; import java.util.List; import com.ruoyi.business.domain.HwAlarmInfo; import com.ruoyi.business.domain.VO.AlarmInfoExportVo; @@ -73,6 +74,6 @@ public interface IHwAlarmInfoService /** * 导出报警信息 * */ - List selectAlarmInfoExport(); + List selectAlarmInfoExport(Date startTime, Date endTime); } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmInfoServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmInfoServiceImpl.java index cb2ad69..7089ffd 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmInfoServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.business.service.impl; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -152,7 +153,7 @@ public class HwAlarmInfoServiceImpl implements IHwAlarmInfoService { } @Override - public List selectAlarmInfoExport() { - return hwAlarmInfoMapper.selectAlarmInfoExport(); + public List selectAlarmInfoExport(Date startTime, Date endTime) { + return hwAlarmInfoMapper.selectAlarmInfoExport(startTime,endTime); } } diff --git a/ruoyi-modules/hw-business/src/main/resources/bootstrap.yml b/ruoyi-modules/hw-business/src/main/resources/bootstrap.yml index ecdf076..3b892e1 100644 --- a/ruoyi-modules/hw-business/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/hw-business/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmInfoMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmInfoMapper.xml index 5b14138..4c053c2 100644 --- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmInfoMapper.xml +++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmInfoMapper.xml @@ -48,6 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -192,14 +195,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" exists (select 1 from hw_device hd where hai.device_id=hd.device_id and hd.device_status='1' and hd.monitor_unit_id=#{monitorUnitId}) - + select hai.alarm_info_id, + hai.alarm_time, + hmu.monitor_unit_name, + hal.alarm_level_name, + hat.alarm_type_name, + ha.area_name, + hmu.monitor_unit_id, + CASE hmu.monitor_unit_status when 1 then '正常' else '异常' end as monitor_unit_status, + hmu.monitor_unit_type_id, + hmut.monitor_unit_type_name + from hw_alarm_info hai + left join hw_monitor_unit hmu on hai.monitor_unit_id = hmu.monitor_unit_id + left join hw_alarm_level hal on hai.alarm_level_id = hal.alarm_level_id + left join hw_alarm_type hat on hai.alarm_type_id = hat.alarm_type_id + left join hw_area ha on ha.area_id = hmu.area_id + left join hw_monitor_unit_type hmut on hmu.monitor_unit_type_id = hmut.monitor_unit_type_id + where hai.alarm_time between #{startTime} and #{endTime} update hw_alarm_info diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml index 66c43e1..9ccf398 100644 --- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml +++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml @@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -52,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select alarm_rule_id, alarm_rule_name, tenant_id, scene_id, language_code, alarm_level_id, alarm_type_id, rule_type, rule_device_id, rule_function_total, trigger_expression, link_flag, alarm_rule_status, alarm_push_flag, alarm_push_content, alarm_recover_content, remark, create_by, create_time, update_by, update_time, alarm_rule_field from hw_alarm_rule har + select alarm_rule_id, alarm_rule_name, tenant_id, scene_id, language_code, alarm_level_id, alarm_type_id, rule_type, rule_device_id, rule_function_total, trigger_expression, link_flag, alarm_rule_status, alarm_push_flag, alarm_push_content, alarm_recover_content, remark, create_by, create_time, update_by, update_time, alarm_rule_field,trigger_time_frame,phone_numbers from hw_alarm_rule har select a.device_mode_id, a.device_mode_name, a.tenant_id, a.scene_id, a.language_code, a.gps_flag, a.device_mode_status, a.common_flag, a.mode_classfication, a.device_mode_pic, a.data_verify_level, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.device_mode_field, - b.mode_function_id as sub_mode_function_id, b.device_mode_id as sub_device_mode_id, b.function_mode as sub_function_mode, b.coordinate as sub_coordinate, b.function_name as sub_function_name, b.function_identifier as sub_function_identifier, b.function_type as sub_function_type, b.data_type as sub_data_type, b.data_definition as sub_data_definition, b.function_formula as sub_function_formula, b.property_unit as sub_property_unit, b.display_flag as sub_display_flag, b.rw_flag as sub_rw_flag, b.invoke_method as sub_invoke_method, b.event_type as sub_event_type, b.remark as sub_remark, b.acquisition_formula as sub_acquisition_formula, b.order_flag as sub_order_flag, b.device_register as sub_device_register, b.property_step as sub_property_step, b.property_field as sub_property_field + b.mode_function_id as sub_mode_function_id, a.device_model_type,b.device_mode_id as sub_device_mode_id, b.function_mode as sub_function_mode, b.coordinate as sub_coordinate, b.function_name as sub_function_name, b.function_identifier as sub_function_identifier, b.function_type as sub_function_type, b.data_type as sub_data_type, b.data_definition as sub_data_definition, b.function_formula as sub_function_formula, b.property_unit as sub_property_unit, b.display_flag as sub_display_flag, b.rw_flag as sub_rw_flag, b.invoke_method as sub_invoke_method, b.event_type as sub_event_type, b.remark as sub_remark, b.acquisition_formula as sub_acquisition_formula, b.order_flag as sub_order_flag, b.device_register as sub_device_register, b.property_step as sub_property_step, b.property_field as sub_property_field from hw_device_mode a left join hw_device_mode_function b on b.device_mode_id = a.device_mode_id where a.device_mode_id = #{deviceModeId} @@ -126,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, device_mode_field, + device_model_type, #{deviceModeName}, @@ -145,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{deviceModeField}, + #{deviceModelType}, @@ -168,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, device_mode_field = #{deviceModeField}, + device_model_type = #{deviceModelType}, where device_mode_id = #{deviceModeId} @@ -300,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update hw_device diff --git a/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml b/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml index 51d54ff..71b2482 100644 --- a/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml @@ -29,7 +29,8 @@ spring: nacos: config: # 配置中心地址 - server-addr: 124.70.63.37:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/hw-tdengine/src/main/resources/bootstrap.yml b/ruoyi-modules/hw-tdengine/src/main/resources/bootstrap.yml index e43943e..09e3bd7 100644 --- a/ruoyi-modules/hw-tdengine/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/hw-tdengine/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml b/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml index e7adb8c..be02a09 100644 --- a/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml +++ b/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: localhost:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: localhost:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 9094995..0982d97 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 64b9d91..c1fc0d2 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index c2aa059..211f52f 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 3af593e..5325933 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index f82bd5e..c63f1df 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -9,15 +9,17 @@ spring: name: ruoyi-monitor profiles: # 环境配置 - active: druid + active: dev cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.27.215.92:8848 + namespace: jrm_iot # 配置文件格式 file-extension: yml # 共享配置