优化trendLog logbuffer数据处理

pom.xml

@@ -469,40 +469,19 @@
                 </configuration>
             </plugin>
 
-<!--&lt;!&ndash;         正式环境  &ndash;&gt;-->
+<!--         正式环境  -->
-<!--            <plugin>-->
-<!--                <groupId>io.fabric8</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>0.38.1</version>-->
-<!--                <configuration>-->
-<!--                    <authConfig>-->
-<!--                        <username>AKIAR26KHSVRUEAKRBPZ</username>-->
-<!--                        <password>wmMPx9vypaNi5ZIlyz4c018hKCb2M1dnGBdA+oh2</password>-->
-<!--                    </authConfig>-->
-<!--                    <images>-->
-<!--                        <image>-->
-<!--                            <name>${aws.ecr.registry}/aeon-prod/${aws.ecr.repositoryProd}:latest</name>-->
-<!--                            <registry>${aws.ecr.registry}</registry>-->
-<!--                            <build>-->
-<!--                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>-->
-<!--                            </build>-->
-<!--                        </image>-->
-<!--                    </images>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-            <!--         测试环境  -->
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.38.1</version>
                 <configuration>
                     <authConfig>
-                        <username>AKIAVSKFRQDPNWHJDSHL</username>
+                        <username>AKIAR26KHSVRUEAKRBPZ</username>
-                        <password>DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g</password>
+                        <password>wmMPx9vypaNi5ZIlyz4c018hKCb2M1dnGBdA+oh2</password>
                     </authConfig>
                     <images>
                         <image>
-                            <name>${aws.ecr.registryTest}/aeon/${aws.ecr.repository}:latest</name>
+                            <name>${aws.ecr.registry}/aeon-prod/${aws.ecr.repositoryProd}:latest</name>
                             <registry>${aws.ecr.registry}</registry>
                             <build>
                                 <dockerFile>${project.basedir}/Dockerfile</dockerFile>
@@ -511,6 +490,27 @@
                     </images>
                 </configuration>
             </plugin>
+<!--            &lt;!&ndash;         测试环境  &ndash;&gt;-->
+<!--            <plugin>-->
+<!--                <groupId>io.fabric8</groupId>-->
+<!--                <artifactId>docker-maven-plugin</artifactId>-->
+<!--                <version>0.38.1</version>-->
+<!--                <configuration>-->
+<!--                    <authConfig>-->
+<!--                        <username>AKIAVSKFRQDPNWHJDSHL</username>-->
+<!--                        <password>DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g</password>-->
+<!--                    </authConfig>-->
+<!--                    <images>-->
+<!--                        <image>-->
+<!--                            <name>${aws.ecr.registryTest}/aeon/${aws.ecr.repository}:latest</name>-->
+<!--                            <registry>${aws.ecr.registry}</registry>-->
+<!--                            <build>-->
+<!--                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>-->
+<!--                            </build>-->
+<!--                        </image>-->
+<!--                    </images>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
 
 
         </plugins>

src/main/java/com/techsor/datacenter/sender/processers/AsyncDataProcessor.java

@@ -4,6 +4,7 @@ import com.techsor.datacenter.sender.service.IDataProcessService;
 import com.techsor.datacenter.sender.service.KingIOServerService;
 import com.techsor.datacenter.sender.service.St150Service;
 import com.techsor.datacenter.sender.service.TrendLogService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
@@ -31,7 +32,12 @@ public class AsyncDataProcessor {
         try {
             // 执行耗时任务
             String processJson = trendLogService.start(content);
+            if (StringUtils.isNotBlank(processJson)){
                 dataProcessService.processKingIOServerData(processJson);
+            }else{
+                log.warn("processTrendLogAsync processJson is [Blank],skip");
+                log.error( content);
+            }
         } catch (Exception e) {
             // 记录异常日志
             log.error("Error while processing data asynchronously: " + e.getMessage());

src/main/java/com/techsor/datacenter/sender/service/TrendLogService.java

@@ -110,7 +110,11 @@ public class TrendLogService {
             DataSourceContextHolder.clearCurrentDataSourceKey();
         }
 
+        if (dbmValues.size()>0){
             return JSON.toJSONString(dbmValues);
+        }else{
+            return "";
+        }
     }
 
     //处理TrendLog的单条数据