diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java similarity index 99% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java index 6a2c34e..8c75506 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java @@ -20,7 +20,7 @@ import java.util.Collections; @Component @Slf4j -public class MqttConfig { +public class MqttConfigHzims { @Autowired FdpMqttConsumer fdpMqttConsumer; diff --git a/hzims-service/hzims-alarm/src/test/java/com/hnac/hzims/alarm/MiddleApplicationTests.java b/hzims-service/hzims-alarm/src/test/java/com/hnac/hzims/alarm/MiddleApplicationTests.java deleted file mode 100644 index 0d3f950..0000000 --- a/hzims-service/hzims-alarm/src/test/java/com/hnac/hzims/alarm/MiddleApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.alarm; - -import com.hnac.hzims.AlarmApplication; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest(classes = AlarmApplication.class) -class AlarmApplicationTests { - - @Test - void contextLoads() { - - System.out.println("1"); - } - -} diff --git a/hzims-service/hzims-basic/src/test/java/com/hnac/hzims/basic/BasicApplicationTests.java b/hzims-service/hzims-basic/src/test/java/com/hnac/hzims/basic/BasicApplicationTests.java deleted file mode 100644 index 97918a4..0000000 --- a/hzims-service/hzims-basic/src/test/java/com/hnac/hzims/basic/BasicApplicationTests.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.basic; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest(classes = BasicApplication.class) -class BasicApplicationTests { - - @Test - void contextLoads() { - - System.out.println("1"); - } - -} diff --git a/hzims-service/hzims-big-model/pom.xml b/hzims-service/hzims-big-model/pom.xml index 19bc3a3..fa26e50 100644 --- a/hzims-service/hzims-big-model/pom.xml +++ b/hzims-service/hzims-big-model/pom.xml @@ -27,7 +27,10 @@ 4.0.0-SNAPSHOT compile - + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + org.springframework.boot diff --git a/hzims-service/hzims-middle/src/test/java/com/hnac/hzims/middle/MiddleApplicationTests.java b/hzims-service/hzims-middle/src/test/java/com/hnac/hzims/middle/MiddleApplicationTests.java index b63584e..7b34694 100644 --- a/hzims-service/hzims-middle/src/test/java/com/hnac/hzims/middle/MiddleApplicationTests.java +++ b/hzims-service/hzims-middle/src/test/java/com/hnac/hzims/middle/MiddleApplicationTests.java @@ -1,15 +1,15 @@ -package com.hnac.hzims.middle; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest(classes = MiddleApplication.class) -class MiddleApplicationTests { - - @Test - void contextLoads() { - - System.out.println("1"); - } - -} +//package com.hnac.hzims.middle; +// +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.test.context.SpringBootTest; +// +//@SpringBootTest(classes = MiddleApplication.class) +//class MiddleApplicationTests { +// +// @Test +// void contextLoads() { +// +// System.out.println("1"); +// } +// +//} diff --git a/hzims-service/inspect/src/main/resources/template/template.yml b/hzims-service/inspect/src/main/resources/template/template.yml index edd63bb..c47c12a 100644 --- a/hzims-service/inspect/src/main/resources/template/template.yml +++ b/hzims-service/inspect/src/main/resources/template/template.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 8200 + port: 8132 ##oss配置 oss: diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index 8c7028c..56e0868 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -44,6 +44,10 @@ ticket-api + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + + com.hnac.hzims common-api diff --git a/hzims-service/ticket/src/main/resources/template/template.yml b/hzims-service/ticket/src/main/resources/template/template.yml index 3c3e591..9a48544 100644 --- a/hzims-service/ticket/src/main/resources/template/template.yml +++ b/hzims-service/ticket/src/main/resources/template/template.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 8200 + port: 8216 #oss配置 oss: diff --git a/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/launcher/DemoTestLauncherServiceImpl.java b/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/launcher/DemoTestLauncherServiceImpl.java deleted file mode 100644 index 6aa0159..0000000 --- a/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/launcher/DemoTestLauncherServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.ticket.launcher; - -import org.springblade.core.auto.service.AutoService; -import org.springblade.core.launch.service.LauncherService; -import org.springframework.boot.builder.SpringApplicationBuilder; - -import java.util.Properties; - -/** - * 启动参数拓展 - * - * @author Chill - */ -@AutoService(LauncherService.class) -public class DemoTestLauncherServiceImpl implements LauncherService { - - @Override - public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { - Properties props = System.getProperties(); - props.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:3301"); - props.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:3301"); - //props.setProperty("spring.cloud.sentinel.transport.dashboard", LauncherConstant.SENTINEL_DEV_ADDR); - } - - @Override - public int getOrder() { - return 10; - } -}