调整pom文件

AlarmDataStarter/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>EnergyAlarmStarter</artifactId>
+        <artifactId>energy-alarm-starter</artifactId>
         <groupId>com.persagy.apm</groupId>
         <version>v1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>AlarmDataStarter</artifactId>
+    <artifactId>alarm-data-starter</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/feign/AlarmFeignConfig.java

@@ -1,59 +0,0 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.feign;
-
-import feign.Feign;
-import feign.Logger;
-import feign.Retryer;
-import feign.querymap.BeanQueryMapEncoder;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-/**
- * @description: Feign配置
- * @author: xingmaojun
- * @company: Persagy Technology Co.,Ltd
- * @since: 2020/10/14 9:15
- * @version: V1.0
- **/
-
-@Configuration
-@EnableFeignClients(basePackages = "com.persagy.dmp.starter.alarm.feign.client")
-public class AlarmFeignConfig {
-
-    /**
-     * @description: feign日志配置
-     * @return: feign.Logger.Level
-     * @author: xingmaojun
-     * @company: Persagy Technology Co.,Ltd
-     * @since: 2020/10/21 17:01
-     * @version: V1.0
-     */
-    @Bean
-    Logger.Level alarmFeignLoggerLevel() {
-        //这里记录所有，根据实际情况选择合适的日志level
-        return Logger.Level.FULL;
-    }
-
-    @Bean
-    Logger alarmFeignLogger(){
-        return new AlarmFeignLogger();
-    }
-
-    /**
-     * @description: 替换解析queryMap的类，实现父类中变量的映射
-     * @return: feign.Feign.Builder
-     * @author: xingmaojun
-     * @company: Persagy Technology Co.,Ltd
-     * @since: 2020/10/21 17:01
-     * @version: V1.0
-     */
-    @Bean
-    @Primary
-    public Feign.Builder alarmFeignBuilder() {
-        return Feign.builder()
-                .queryMapEncoder(new BeanQueryMapEncoder())
-                .retryer(Retryer.NEVER_RETRY);
-    }
-
-}

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/feign/AlarmFeignLogger.java

@@ -1,43 +0,0 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.feign;
-
-
-import feign.Request;
-import feign.Response;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-
-/**
- * @description: 日志记录feign调用
- * @author: lixing
- * @company: Persagy Technology Co.,Ltd
- * @since: 2020/11/27 10:40 上午
- * @version: V1.0
- */
-@Slf4j
-public class AlarmFeignLogger extends feign.Logger {
-
-    @Override
-    protected void logRequest(String configKey, Level logLevel, Request request) {
-        if (log.isInfoEnabled()) {
-            super.logRequest(configKey, logLevel, request);
-        }
-    }
-
-    @Override
-    protected Response logAndRebufferResponse(String configKey, Level logLevel, Response response, long elapsedTime)
-            throws IOException {
-        if (log.isInfoEnabled()) {
-            return super.logAndRebufferResponse(configKey, logLevel, response, elapsedTime);
-        }
-        return response;
-    }
-
-    @Override
-    protected void log(String configKey, String format, Object... args) {
-        if (log.isInfoEnabled()) {
-            //log.info(String.format(methodTag(configKey) + format, args));
-        }
-    }
-}

AlarmEngineStarter/pom.xml

@@ -3,18 +3,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>EnergyAlarmStarter</artifactId>
+        <artifactId>energy-alarm-starter</artifactId>
         <groupId>com.persagy.apm</groupId>
         <version>v1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>AlarmEngineStarter</artifactId>
+    <artifactId>alarm-engine-starter</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
+
     <dependencies>
         <!-- jackson -->
         <dependency>
@@ -76,8 +77,9 @@
         <!-- alarmDataStarter-->
         <dependency>
             <groupId>com.persagy.apm</groupId>
-            <artifactId>AlarmDataStarter</artifactId>
+            <artifactId>alarm-data-starter</artifactId>
             <version>v1.0.0</version>
         </dependency>
+
     </dependencies>
 </project>

AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/netty/NettyAlarmServer.java

@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class NettyAlarmServer {
     @Autowired
-    private com.persagy.dmp.starter.alarm.communication.netty.NettyAlarmMsgBaseHandler nettyAlarmMsgBaseHandler;
+    private NettyAlarmMsgBaseHandler nettyAlarmMsgBaseHandler;
 
     @Value("${group.alarm.port}")
     public int port;

CollectDataStarter/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>EnergyAlarmStarter</artifactId>
+        <artifactId>energy-alarm-starter</artifactId>
         <groupId>com.persagy.apm</groupId>
         <version>v1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>CollectDataStarter</artifactId>
+    <artifactId>collect-data-starter</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -46,5 +46,11 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- lang -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 </project>

pom.xml

@@ -10,7 +10,7 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.persagy.apm</groupId>
-    <artifactId>EnergyAlarmStarter</artifactId>
+    <artifactId>energy-alarm-starter</artifactId>
     <packaging>pom</packaging>
     <version>v1.0.0</version>
     <modules>