Browse Source

修改删除设备类接口的名称

lixing 3 years ago
parent
commit
47cd2d9348

+ 1 - 1
dmp-alarm/src/main/java/com/persagy/dmp/alarm/enumeration/EnumAlarmMessageType.java

@@ -19,7 +19,7 @@ public enum EnumAlarmMessageType {
     ALARM_ITEM_DELETE("alarmItemDelete", "删除报警条目"),
     ALARM_RECORD_CREATE("alarmRecordCreate", "新增报警"),
     ALARM_RECORD_UPDATE("alarmRecordUpdate", "报警更新"),
-    INSTANCE_OBJ_DELETE("instanceObjDelete", "设备删除");
+    INSTANCE_OBJ_DELETE("instanceObjectDelete", "设备删除");
 
     @Getter
     private String value;

+ 1 - 1
dmp-alarm/src/main/java/com/persagy/dmp/alarm/jms/ConsumeMessageThreadPool.java

@@ -49,7 +49,7 @@ public class ConsumeMessageThreadPool {
                 try {
                     if (isRedeliveredFail) {
                         // 拒绝消息,requeue=false 表示不再重新入队,如果配置了死信队列则进入死信队列
-                        log.error("重复消费消息失败,message: {}", message);
+                        log.error("重复消费消息失败,message: {}", JacksonMapper.toSimpleJson(message));
                         channel.basicReject(msg.getMessageProperties().getDeliveryTag(), false);
                     } else {
                         // 如果是第一次失败则再次放入队列

+ 1 - 1
dmp-alarm/src/main/java/com/persagy/dmp/alarm/jms/executor/InstanceObjDeleteExecutor.java

@@ -21,7 +21,7 @@ import org.springframework.util.StringUtils;
  */
 @Slf4j
 @Component
-public class InstanceObjDeleteExecutor implements MessageExecutor {
+public class InstanceObjectDeleteExecutor implements MessageExecutor {
 	@Autowired
 	private AlarmConfigService alarmConfigService;
 

+ 8 - 3
dmp-alarm/src/main/resources/bootstrap.yml

@@ -5,11 +5,16 @@ spring:
     active: log-dev
   cloud:
     config:
-      profile: dev2
+#      profile: dev2
+      profile: aliyun-dev
 #      uri: http://192.168.100.107:9932
-      uri: http://192.168.64.18:9932
+#      uri: http://192.168.64.18:9932
+      uri: http://39.102.43.179:9932
       #      profile: dev2
 #      uri: http://192.168.64.18:9932
 persagy:
   log:
-    path: ../logs/dmp-alarm/
+    path: ../logs/dmp-alarm/
+eureka:
+  client:
+    register-with-eureka: false