diff --git a/Dashboard/pom.xml b/Dashboard/pom.xml index 675c83c..3c872c8 100644 --- a/Dashboard/pom.xml +++ b/Dashboard/pom.xml @@ -11,7 +11,7 @@ - com.inscloudtech.platfrom.jlog + com.inscloudtech Dashboard 0.0.1-SNAPSHOT dashboard diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/DashboardApplication.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/DashboardApplication.java similarity index 50% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/DashboardApplication.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/DashboardApplication.java index 8de0317..cbd7e8f 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/DashboardApplication.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/DashboardApplication.java @@ -1,16 +1,8 @@ -package com.inscloudtech.platform.jlog.dashboard; +package com.inscloudtech.alog.dashboard; -import com.alibaba.fastjson.JSON; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; - -import static com.inscloudtech.platform.jlog.dashboard.utils.CharTest.getConn; - @SpringBootApplication public class DashboardApplication { diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/controller/TracerController.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/controller/TracerController.java similarity index 90% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/controller/TracerController.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/controller/TracerController.java index fd5d0d9..521c065 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/controller/TracerController.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/controller/TracerController.java @@ -1,12 +1,12 @@ -package com.inscloudtech.platform.jlog.dashboard.controller; - -import com.inscloudtech.platform.jlog.dashboard.entity.TracerListVO; -import com.inscloudtech.platform.jlog.dashboard.entity.TracerVO; -import com.inscloudtech.platform.jlog.dashboard.model.QueryListModel; -import com.inscloudtech.platform.jlog.dashboard.service.TracerService; -import com.inscloudtech.platform.jlog.dashboard.utils.DateUtils; -import com.inscloudtech.platform.jlog.dashboard.utils.ResultHelper; -import com.inscloudtech.platform.jlog.dashboard.utils.ZstdUtils; +package com.inscloudtech.alog.dashboard.controller; + +import com.inscloudtech.alog.dashboard.entity.TracerVO; +import com.inscloudtech.alog.dashboard.model.QueryListModel; +import com.inscloudtech.alog.dashboard.utils.DateUtils; +import com.inscloudtech.alog.dashboard.utils.ResultHelper; +import com.inscloudtech.alog.dashboard.entity.TracerListVO; +import com.inscloudtech.alog.dashboard.service.TracerService; +import com.inscloudtech.alog.dashboard.utils.ZstdUtils; import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/ConnectionPool.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/ConnectionPool.java similarity index 92% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/ConnectionPool.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/ConnectionPool.java index 6b16ec8..7ac9a14 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/ConnectionPool.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/ConnectionPool.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.db; +package com.inscloudtech.alog.dashboard.db; import java.sql.Connection; import java.util.ArrayList; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/Db.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/Db.java similarity index 99% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/Db.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/Db.java index bb34d7b..3091e2d 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/Db.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/Db.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.dashboard.db; +package com.inscloudtech.alog.dashboard.db; -import com.inscloudtech.platform.jlog.dashboard.utils.TwoTuple; +import com.inscloudtech.alog.dashboard.utils.TwoTuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbConfig.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbConfig.java similarity index 96% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbConfig.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbConfig.java index 9bf2999..474688a 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbConfig.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbConfig.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.db; +package com.inscloudtech.alog.dashboard.db; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbOperator.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbOperator.java similarity index 86% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbOperator.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbOperator.java index eefab57..b440e31 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbOperator.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbOperator.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.db; +package com.inscloudtech.alog.dashboard.db; /** * 数据库条件语句符号 diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/WhereCause.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/WhereCause.java similarity index 94% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/WhereCause.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/WhereCause.java index 6146643..07663fb 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/WhereCause.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/WhereCause.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.db; +package com.inscloudtech.alog.dashboard.db; /** * @author wuweifeng diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerListVO.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerListVO.java similarity index 94% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerListVO.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerListVO.java index d20f37f..3043943 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerListVO.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerListVO.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.entity; +package com.inscloudtech.alog.dashboard.entity; import java.util.ArrayList; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerVO.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerVO.java similarity index 93% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerVO.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerVO.java index 8a30fe5..2a1a022 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerVO.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerVO.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.entity; +package com.inscloudtech.alog.dashboard.entity; /** diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QueryListModel.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QueryListModel.java similarity index 97% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QueryListModel.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QueryListModel.java index 86a2bb4..2e0d8ce 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QueryListModel.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QueryListModel.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.model; +package com.inscloudtech.alog.dashboard.model; /** diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QuerySingleModel.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QuerySingleModel.java similarity index 90% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QuerySingleModel.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QuerySingleModel.java index 36098b0..d8d0bb7 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QuerySingleModel.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QuerySingleModel.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.model; +package com.inscloudtech.alog.dashboard.model; /** diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/service/TracerService.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/service/TracerService.java similarity index 91% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/service/TracerService.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/service/TracerService.java index 9dfca9c..c235973 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/service/TracerService.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/service/TracerService.java @@ -1,11 +1,11 @@ -package com.inscloudtech.platform.jlog.dashboard.service; - -import com.inscloudtech.platform.jlog.dashboard.db.Db; -import com.inscloudtech.platform.jlog.dashboard.db.WhereCause; -import com.inscloudtech.platform.jlog.dashboard.entity.TracerListVO; -import com.inscloudtech.platform.jlog.dashboard.model.QueryListModel; -import com.inscloudtech.platform.jlog.dashboard.utils.DateUtils; -import com.inscloudtech.platform.jlog.dashboard.utils.DbUtils; +package com.inscloudtech.alog.dashboard.service; + +import com.inscloudtech.alog.dashboard.db.Db; +import com.inscloudtech.alog.dashboard.db.WhereCause; +import com.inscloudtech.alog.dashboard.entity.TracerListVO; +import com.inscloudtech.alog.dashboard.model.QueryListModel; +import com.inscloudtech.alog.dashboard.utils.DateUtils; +import com.inscloudtech.alog.dashboard.utils.DbUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/CharTest.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/CharTest.java similarity index 99% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/CharTest.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/CharTest.java index 73fb535..aa18452 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/CharTest.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/CharTest.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.utils; +package com.inscloudtech.alog.dashboard.utils; import com.alibaba.fastjson.JSON; import org.springframework.util.StringUtils; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DateUtils.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DateUtils.java similarity index 94% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DateUtils.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DateUtils.java index edbd88c..7b41d0a 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DateUtils.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.utils; +package com.inscloudtech.alog.dashboard.utils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DbUtils.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DbUtils.java similarity index 93% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DbUtils.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DbUtils.java index 2aa7780..b270a0c 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DbUtils.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DbUtils.java @@ -1,8 +1,8 @@ -package com.inscloudtech.platform.jlog.dashboard.utils; +package com.inscloudtech.alog.dashboard.utils; -import com.inscloudtech.platform.jlog.dashboard.db.DbOperator; -import com.inscloudtech.platform.jlog.dashboard.db.WhereCause; -import com.inscloudtech.platform.jlog.dashboard.model.QueryListModel; +import com.inscloudtech.alog.dashboard.db.DbOperator; +import com.inscloudtech.alog.dashboard.db.WhereCause; +import com.inscloudtech.alog.dashboard.model.QueryListModel; import org.springframework.util.StringUtils; import java.text.SimpleDateFormat; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ResultHelper.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ResultHelper.java similarity index 83% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ResultHelper.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ResultHelper.java index f4f2d2c..870d2fc 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ResultHelper.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ResultHelper.java @@ -1,7 +1,7 @@ -package com.inscloudtech.platform.jlog.dashboard.utils; +package com.inscloudtech.alog.dashboard.utils; -import com.inscloudtech.platform.jlog.dashboard.entity.TracerListVO; +import com.inscloudtech.alog.dashboard.entity.TracerListVO; /** * 返回值处理类 diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/TwoTuple.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/TwoTuple.java similarity index 94% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/TwoTuple.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/TwoTuple.java index e3804be..9407110 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/TwoTuple.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/TwoTuple.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.utils; +package com.inscloudtech.alog.dashboard.utils; import java.io.Serializable; diff --git a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ZstdUtils.java b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ZstdUtils.java similarity index 93% rename from Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ZstdUtils.java rename to Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ZstdUtils.java index a78e8e8..6526fcd 100644 --- a/Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ZstdUtils.java +++ b/Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ZstdUtils.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.dashboard.utils; +package com.inscloudtech.alog.dashboard.utils; import com.github.luben.zstd.Zstd; diff --git a/client/pom.xml b/client/pom.xml index e930886..c5066d7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,46 +3,46 @@ 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"> - JLog - com.inscloudtech.platfrom.jlog - 1.4-SNAPSHOT + ALog + com.inscloudtech + 0.1.1 4.0.0 - 1.4-SNAPSHOT - client + 0.1.1 + alog-client - com.inscloudtech.platfrom.jlog - common - 1.4-SNAPSHOT + com.inscloudtech + alog-common + 0.1.1 - com.inscloudtech.platfrom.jlog + com.inscloudtech config-core - 1.4-SNAPSHOT + 0.1.1 javax.servlet diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/Context.java b/client/src/main/java/com/inscloudtech/alog/client/Context.java similarity index 77% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/Context.java rename to client/src/main/java/com/inscloudtech/alog/client/Context.java index 6721fd5..b49ac6d 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/Context.java +++ b/client/src/main/java/com/inscloudtech/alog/client/Context.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.client; +package com.inscloudtech.alog.client; -import com.inscloudtech.platform.jlog.client.mdc.Mdc; +import com.inscloudtech.alog.client.mdc.Mdc; import io.netty.channel.Channel; /** diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/TracerClientStarter.java b/client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java similarity index 78% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/TracerClientStarter.java rename to client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java index d55d1ce..9f6100e 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/TracerClientStarter.java +++ b/client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java @@ -1,18 +1,18 @@ -package com.inscloudtech.platform.jlog.client; +package com.inscloudtech.alog.client; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.client.mdc.Mdc; -import com.inscloudtech.platform.jlog.client.modeholder.ModeHolder; -import com.inscloudtech.platform.jlog.client.task.Monitor; -import com.inscloudtech.platform.jlog.client.udp.HttpSender; -import com.inscloudtech.platform.jlog.client.udp.UdpClient; -import com.inscloudtech.platform.jlog.client.udp.UdpSender; -import com.inscloudtech.platform.jlog.common.constant.SendMode; -import com.inscloudtech.platform.jlog.common.handler.TagConfig; -import com.inscloudtech.platform.jlog.core.ClientHandlerBuilder; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorFactory; +import com.inscloudtech.alog.client.mdc.Mdc; +import com.inscloudtech.alog.client.task.Monitor; +import com.inscloudtech.alog.client.udp.HttpSender; +import com.inscloudtech.alog.client.udp.UdpClient; +import com.inscloudtech.alog.client.modeholder.ModeHolder; +import com.inscloudtech.alog.client.udp.UdpSender; +import com.inscloudtech.alog.common.constant.SendMode; +import com.inscloudtech.alog.common.handler.TagConfig; +import com.inscloudtech.alog.core.ClientHandlerBuilder; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/constant/TracerConstant.java b/client/src/main/java/com/inscloudtech/alog/client/constant/TracerConstant.java similarity index 77% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/constant/TracerConstant.java rename to client/src/main/java/com/inscloudtech/alog/client/constant/TracerConstant.java index b7b23f1..1063c82 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/constant/TracerConstant.java +++ b/client/src/main/java/com/inscloudtech/alog/client/constant/TracerConstant.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.constant; +package com.inscloudtech.alog.client.constant; /** * TracerConstant diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/filter/HttpFilter.java b/client/src/main/java/com/inscloudtech/alog/client/filter/HttpFilter.java similarity index 86% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/filter/HttpFilter.java rename to client/src/main/java/com/inscloudtech/alog/client/filter/HttpFilter.java index 8626e52..fa7b7c0 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/filter/HttpFilter.java +++ b/client/src/main/java/com/inscloudtech/alog/client/filter/HttpFilter.java @@ -1,17 +1,17 @@ -package com.inscloudtech.platform.jlog.client.filter; - -import com.inscloudtech.platform.jlog.client.Context; -import com.inscloudtech.platform.jlog.client.log.LogExceptionStackTrace; -import com.inscloudtech.platform.jlog.client.percent.DefaultTracerPercentImpl; -import com.inscloudtech.platform.jlog.client.percent.ITracerPercent; -import com.inscloudtech.platform.jlog.client.tracerholder.TracerHolder; -import com.inscloudtech.platform.jlog.client.udp.UdpSender; -import com.inscloudtech.platform.jlog.common.model.TracerBean; -import com.inscloudtech.platform.jlog.common.handler.CompressHandler.Outcome; -import com.inscloudtech.platform.jlog.common.utils.FastJsonUtils; -import com.inscloudtech.platform.jlog.common.utils.IdWorker; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; -import com.inscloudtech.platform.jlog.core.ClientHandler; +package com.inscloudtech.alog.client.filter; + +import com.inscloudtech.alog.client.Context; +import com.inscloudtech.alog.client.log.LogExceptionStackTrace; +import com.inscloudtech.alog.client.percent.DefaultTracerPercentImpl; +import com.inscloudtech.alog.client.percent.ITracerPercent; +import com.inscloudtech.alog.client.tracerholder.TracerHolder; +import com.inscloudtech.alog.client.udp.UdpSender; +import com.inscloudtech.alog.core.ClientHandler; +import com.inscloudtech.alog.common.model.TracerBean; +import com.inscloudtech.alog.common.handler.CompressHandler.Outcome; +import com.inscloudtech.alog.common.utils.FastJsonUtils; +import com.inscloudtech.alog.common.utils.IdWorker; +import com.inscloudtech.alog.common.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/filter/RequestWrapper.java b/client/src/main/java/com/inscloudtech/alog/client/filter/RequestWrapper.java similarity index 98% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/filter/RequestWrapper.java rename to client/src/main/java/com/inscloudtech/alog/client/filter/RequestWrapper.java index 0f2decf..04b945c 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/filter/RequestWrapper.java +++ b/client/src/main/java/com/inscloudtech/alog/client/filter/RequestWrapper.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.filter; +package com.inscloudtech.alog.client.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/filter/ResponseWrapper.java b/client/src/main/java/com/inscloudtech/alog/client/filter/ResponseWrapper.java similarity index 97% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/filter/ResponseWrapper.java rename to client/src/main/java/com/inscloudtech/alog/client/filter/ResponseWrapper.java index 93fd213..1f1ebae 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/filter/ResponseWrapper.java +++ b/client/src/main/java/com/inscloudtech/alog/client/filter/ResponseWrapper.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.filter; +package com.inscloudtech.alog.client.filter; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/log/LogExceptionStackTrace.java b/client/src/main/java/com/inscloudtech/alog/client/log/LogExceptionStackTrace.java similarity index 95% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/log/LogExceptionStackTrace.java rename to client/src/main/java/com/inscloudtech/alog/client/log/LogExceptionStackTrace.java index 3275243..8de52ab 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/log/LogExceptionStackTrace.java +++ b/client/src/main/java/com/inscloudtech/alog/client/log/LogExceptionStackTrace.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.log; +package com.inscloudtech.alog.client.log; import java.io.IOException; import java.io.PrintWriter; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/mdc/Mdc.java b/client/src/main/java/com/inscloudtech/alog/client/mdc/Mdc.java similarity index 72% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/mdc/Mdc.java rename to client/src/main/java/com/inscloudtech/alog/client/mdc/Mdc.java index cd7ce1f..7b65cd7 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/mdc/Mdc.java +++ b/client/src/main/java/com/inscloudtech/alog/client/mdc/Mdc.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.mdc; +package com.inscloudtech.alog.client.mdc; /** * 机房标志Mdc diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/modeholder/ModeHolder.java b/client/src/main/java/com/inscloudtech/alog/client/modeholder/ModeHolder.java similarity index 85% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/modeholder/ModeHolder.java rename to client/src/main/java/com/inscloudtech/alog/client/modeholder/ModeHolder.java index 64c9a8f..02b788f 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/modeholder/ModeHolder.java +++ b/client/src/main/java/com/inscloudtech/alog/client/modeholder/ModeHolder.java @@ -1,7 +1,7 @@ -package com.inscloudtech.platform.jlog.client.modeholder; +package com.inscloudtech.alog.client.modeholder; import com.alibaba.ttl.TransmittableThreadLocal; -import com.inscloudtech.platform.jlog.common.constant.SendMode; +import com.inscloudtech.alog.common.constant.SendMode; /** * 线程间传递通讯模式（单播、多播） diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/percent/DefaultTracerPercentImpl.java b/client/src/main/java/com/inscloudtech/alog/client/percent/DefaultTracerPercentImpl.java similarity index 80% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/percent/DefaultTracerPercentImpl.java rename to client/src/main/java/com/inscloudtech/alog/client/percent/DefaultTracerPercentImpl.java index 4c74abd..54b30d5 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/percent/DefaultTracerPercentImpl.java +++ b/client/src/main/java/com/inscloudtech/alog/client/percent/DefaultTracerPercentImpl.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.percent; +package com.inscloudtech.alog.client.percent; /** * 切量百分比默认 diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/percent/ITracerPercent.java b/client/src/main/java/com/inscloudtech/alog/client/percent/ITracerPercent.java similarity index 87% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/percent/ITracerPercent.java rename to client/src/main/java/com/inscloudtech/alog/client/percent/ITracerPercent.java index 1968f03..3f7ad79 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/percent/ITracerPercent.java +++ b/client/src/main/java/com/inscloudtech/alog/client/percent/ITracerPercent.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.percent; +package com.inscloudtech.alog.client.percent; import java.util.Set; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/task/Monitor.java b/client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java similarity index 89% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/task/Monitor.java rename to client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java index 7283cf3..48335a7 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/task/Monitor.java +++ b/client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.client.task; +package com.inscloudtech.alog.client.task; -import com.inscloudtech.platform.jlog.client.worker.WorkerInfoHolder; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorFactory; +import com.inscloudtech.alog.client.worker.WorkerInfoHolder; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/tracerholder/TracerHolder.java b/client/src/main/java/com/inscloudtech/alog/client/tracerholder/TracerHolder.java similarity index 92% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/tracerholder/TracerHolder.java rename to client/src/main/java/com/inscloudtech/alog/client/tracerholder/TracerHolder.java index c680233..b138437 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/tracerholder/TracerHolder.java +++ b/client/src/main/java/com/inscloudtech/alog/client/tracerholder/TracerHolder.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.tracerholder; +package com.inscloudtech.alog.client.tracerholder; import com.alibaba.ttl.TransmittableThreadLocal; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/HttpSender.java b/client/src/main/java/com/inscloudtech/alog/client/udp/HttpSender.java similarity index 95% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/udp/HttpSender.java rename to client/src/main/java/com/inscloudtech/alog/client/udp/HttpSender.java index b83e145..1bc461c 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/HttpSender.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/HttpSender.java @@ -1,8 +1,8 @@ -package com.inscloudtech.platform.jlog.client.udp; +package com.inscloudtech.alog.client.udp; -import com.inscloudtech.platform.jlog.client.modeholder.ModeHolder; -import com.inscloudtech.platform.jlog.client.worker.WorkerInfoHolder; -import com.inscloudtech.platform.jlog.common.utils.AsyncPool; +import com.inscloudtech.alog.client.modeholder.ModeHolder; +import com.inscloudtech.alog.client.worker.WorkerInfoHolder; +import com.inscloudtech.alog.common.utils.AsyncPool; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/OneTracer.java b/client/src/main/java/com/inscloudtech/alog/client/udp/OneTracer.java similarity index 85% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/udp/OneTracer.java rename to client/src/main/java/com/inscloudtech/alog/client/udp/OneTracer.java index 352f682..e133212 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/OneTracer.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/OneTracer.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.udp; +package com.inscloudtech.alog.client.udp; /** * 单独发送大报文的bean diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClient.java b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java similarity index 86% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClient.java rename to client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java index a1acfec..95e6e3b 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClient.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java @@ -1,13 +1,13 @@ -package com.inscloudtech.platform.jlog.client.udp; +package com.inscloudtech.alog.client.udp; -import com.inscloudtech.platform.jlog.client.Context; -import com.inscloudtech.platform.jlog.client.modeholder.ModeHolder; -import com.inscloudtech.platform.jlog.client.worker.WorkerInfoHolder; -import com.inscloudtech.platform.jlog.common.constant.Constant; -import com.inscloudtech.platform.jlog.common.model.TracerData; -import com.inscloudtech.platform.jlog.common.utils.AsyncPool; -import com.inscloudtech.platform.jlog.common.utils.ProtostuffUtils; -import com.inscloudtech.platform.jlog.common.utils.ZstdUtils; +import com.inscloudtech.alog.client.modeholder.ModeHolder; +import com.inscloudtech.alog.client.worker.WorkerInfoHolder; +import com.inscloudtech.alog.common.constant.Constant; +import com.inscloudtech.alog.common.utils.AsyncPool; +import com.inscloudtech.alog.common.utils.ProtostuffUtils; +import com.inscloudtech.alog.common.utils.ZstdUtils; +import com.inscloudtech.alog.client.Context; +import com.inscloudtech.alog.common.model.TracerData; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClientHandler.java b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClientHandler.java similarity index 95% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClientHandler.java rename to client/src/main/java/com/inscloudtech/alog/client/udp/UdpClientHandler.java index 8620ba8..727d2cb 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClientHandler.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClientHandler.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.udp; +package com.inscloudtech.alog.client.udp; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpSender.java b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java similarity index 75% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpSender.java rename to client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java index 3855ce6..e53db31 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpSender.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java @@ -1,15 +1,16 @@ -package com.inscloudtech.platform.jlog.client.udp; +package com.inscloudtech.alog.client.udp; -import com.inscloudtech.platform.jlog.client.Context; -import com.inscloudtech.platform.jlog.client.modeholder.ModeHolder; -import com.inscloudtech.platform.jlog.client.worker.WorkerInfoHolder; -import com.inscloudtech.platform.jlog.common.constant.Constant; -import com.inscloudtech.platform.jlog.common.constant.LogTypeEnum; -import com.inscloudtech.platform.jlog.common.model.TracerBean; -import com.inscloudtech.platform.jlog.common.model.RunLogMessage; -import com.inscloudtech.platform.jlog.common.model.TracerData; -import com.inscloudtech.platform.jlog.common.utils.AsyncPool; -import com.inscloudtech.platform.jlog.common.utils.AsyncWorker; +import com.inscloudtech.alog.client.Context; +import com.inscloudtech.alog.client.modeholder.ModeHolder; +import com.inscloudtech.alog.client.worker.WorkerInfoHolder; +import com.inscloudtech.alog.common.constant.Constant; +import com.inscloudtech.alog.common.constant.LogTypeEnum; +import com.inscloudtech.alog.common.model.ActionLogMessage; +import com.inscloudtech.alog.common.utils.AsyncPool; +import com.inscloudtech.alog.common.utils.AsyncWorker; +import com.inscloudtech.alog.common.model.TracerBean; +import com.inscloudtech.alog.common.model.RunLogMessage; +import com.inscloudtech.alog.common.model.TracerData; import io.netty.channel.ChannelFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +55,11 @@ public class UdpSender { private static final LinkedBlockingQueue logBeanQueue = new LinkedBlockingQueue<>(50000); + /** + * 日志集中营，最多积压5万条 + */ + private static final LinkedBlockingQueue actionLogBeanQueue = new LinkedBlockingQueue<>(50000); + /** * 写入队列 */ @@ -95,9 +101,9 @@ public class UdpSender { /** * 写入log队列 */ - public static void offerLogger(RunLogMessage runLogMessage) { + public static void offerActionLogger(ActionLogMessage actionLogMessage) { //容量是否已满 - boolean success = logBeanQueue.offer(runLogMessage); + boolean success = actionLogBeanQueue.offer(actionLogMessage); if (!success) { long failCount = FAIL_OFFER_COUNT.incrementAndGet(); if (failCount % 10 == 0) { @@ -106,7 +112,7 @@ public class UdpSender { } else { long successCount = SUCCESS_LOGGER_OFFER_COUNT.incrementAndGet(); if (successCount % 10000 == 0) { - logger.info("用户Logger已产生数量：" + successCount + "，当前队列积压数量：" + logBeanQueue.size()); + logger.info("用户Logger已产生数量：" + successCount + "，当前队列积压数量：" + actionLogBeanQueue.size()); } } } @@ -152,6 +158,27 @@ public class UdpSender { } } }); + + //actionLog + AsyncPool.asyncDo(() -> { + while (true) { + try { + //要么key达到500个，要么达到1秒，就汇总上报给worker一次 + List tempLogs = new ArrayList<>(); + AsyncWorker.drain(actionLogBeanQueue, tempLogs, 500, 1, TimeUnit.SECONDS); + if (tempLogs.isEmpty()) { + continue; + } + TracerData tracerData = new TracerData(); + tracerData.setActionLogs(tempLogs); + tracerData.setType(LogTypeEnum.ACTION_LOG); + send(tracerData); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } /** diff --git a/client/src/main/java/com/inscloudtech/platform/jlog/client/worker/WorkerInfoHolder.java b/client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java similarity index 94% rename from client/src/main/java/com/inscloudtech/platform/jlog/client/worker/WorkerInfoHolder.java rename to client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java index 7e94278..206eb94 100644 --- a/client/src/main/java/com/inscloudtech/platform/jlog/client/worker/WorkerInfoHolder.java +++ b/client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.client.worker; +package com.inscloudtech.alog.client.worker; import java.util.ArrayList; import java.util.Collections; @@ -28,7 +28,7 @@ public class WorkerInfoHolder { * 发消息到哪个worker，在这里挑一个 */ public static String chooseWorker() { - String workerIp = "127.0.0.1:9999"; + String workerIp = "127.0.0.1:39999"; int size = WORKER_HOLDER.size(); if (size == 0) { @@ -54,7 +54,7 @@ public class WorkerInfoHolder { //多播模式 返回所有注册在注册中心为Work的地址 public static List selectWorkers() { List defaultIps = new ArrayList<>(); - defaultIps.add("127.0.0.1:9999"); + defaultIps.add("127.0.0.1:39999"); if (WORKER_HOLDER.isEmpty()) { return defaultIps; } diff --git a/clientlog4j/pom.xml b/clientlog4j/pom.xml index d903d83..5335ff0 100644 --- a/clientlog4j/pom.xml +++ b/clientlog4j/pom.xml @@ -3,9 +3,9 @@ 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"> - JLog - com.inscloudtech.platfrom.jlog - 1.4-SNAPSHOT + ALog + com.inscloudtech + 0.1.1 4.0.0 jar @@ -24,9 +24,9 @@ 1.7.25 - com.inscloudtech.platfrom.jlog - client - 1.4-SNAPSHOT + com.inscloudtech + alog-client + 0.1.1 diff --git a/clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java b/clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java index 58d319c..b487445 100644 --- a/clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java +++ b/clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java @@ -1,10 +1,10 @@ package com.inscloudtech.platform.jlog.clientlog4j; -import com.inscloudtech.platform.jlog.client.constant.TracerConstant; -import com.inscloudtech.platform.jlog.client.log.LogExceptionStackTrace; -import com.inscloudtech.platform.jlog.client.tracerholder.TracerHolder; -import com.inscloudtech.platform.jlog.client.udp.UdpSender; -import com.inscloudtech.platform.jlog.common.model.RunLogMessage; +import com.inscloudtech.alog.client.constant.TracerConstant; +import com.inscloudtech.alog.client.log.LogExceptionStackTrace; +import com.inscloudtech.alog.client.tracerholder.TracerHolder; +import com.inscloudtech.alog.client.udp.UdpSender; +import com.inscloudtech.alog.common.model.RunLogMessage; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.Priority; import org.apache.log4j.spi.LocationInfo; diff --git a/clientlog4j2/pom.xml b/clientlog4j2/pom.xml index 9a1da93..218610a 100644 --- a/clientlog4j2/pom.xml +++ b/clientlog4j2/pom.xml @@ -3,9 +3,9 @@ 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"> - JLog - com.inscloudtech.platfrom.jlog - 1.4-SNAPSHOT + ALog + com.inscloudtech + 0.1.1 4.0.0 @@ -42,9 +42,9 @@ - com.inscloudtech.platfrom.jlog - client - 1.4-SNAPSHOT + com.inscloudtech + alog-client + 0.1.1 diff --git a/clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java b/clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java index 8378166..2cf7a7c 100644 --- a/clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java +++ b/clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java @@ -1,9 +1,9 @@ package com.inscloudtech.platform.jlog.clientlog4j2; -import com.inscloudtech.platform.jlog.client.log.LogExceptionStackTrace; -import com.inscloudtech.platform.jlog.client.tracerholder.TracerHolder; -import com.inscloudtech.platform.jlog.client.udp.UdpSender; -import com.inscloudtech.platform.jlog.common.model.RunLogMessage; +import com.inscloudtech.alog.client.log.LogExceptionStackTrace; +import com.inscloudtech.alog.client.tracerholder.TracerHolder; +import com.inscloudtech.alog.client.udp.UdpSender; +import com.inscloudtech.alog.common.model.RunLogMessage; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; diff --git a/clientlogback/pom.xml b/clientlogback/pom.xml index cddf296..6b16dfc 100644 --- a/clientlogback/pom.xml +++ b/clientlogback/pom.xml @@ -3,9 +3,9 @@ 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"> - JLog - com.inscloudtech.platfrom.jlog - 1.4-SNAPSHOT + ALog + com.inscloudtech + 0.1.1 4.0.0 jar @@ -13,9 +13,9 @@ - com.inscloudtech.platfrom.jlog - client - 1.4-SNAPSHOT + com.inscloudtech + alog-client + 0.1.1 ch.qos.logback diff --git a/clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java b/clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java index 868b073..3b07feb 100644 --- a/clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java +++ b/clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java @@ -4,10 +4,10 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; import ch.qos.logback.core.AppenderBase; -import com.inscloudtech.platform.jlog.client.log.LogExceptionStackTrace; -import com.inscloudtech.platform.jlog.client.tracerholder.TracerHolder; -import com.inscloudtech.platform.jlog.client.udp.UdpSender; -import com.inscloudtech.platform.jlog.common.model.RunLogMessage; +import com.inscloudtech.alog.client.log.LogExceptionStackTrace; +import com.inscloudtech.alog.client.tracerholder.TracerHolder; +import com.inscloudtech.alog.client.udp.UdpSender; +import com.inscloudtech.alog.common.model.RunLogMessage; import org.slf4j.helpers.MessageFormatter; /** diff --git a/common/pom.xml b/common/pom.xml index 5524b80..b2d2fbb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,12 +3,12 @@ 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"> - JLog - com.inscloudtech.platfrom.jlog - 1.4-SNAPSHOT + com.inscloudtech + ALog + 0.1.1 4.0.0 - common + alog-common 1.8 diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/annotation/ActionLog.java b/common/src/main/java/com/inscloudtech/alog/common/annotation/ActionLog.java similarity index 84% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/annotation/ActionLog.java rename to common/src/main/java/com/inscloudtech/alog/common/annotation/ActionLog.java index 2f63b59..7b4456c 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/annotation/ActionLog.java +++ b/common/src/main/java/com/inscloudtech/alog/common/annotation/ActionLog.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.common.annotation; +package com.inscloudtech.alog.common.annotation; -import com.inscloudtech.platform.jlog.common.enums.BusinessType; -import com.inscloudtech.platform.jlog.common.enums.OperatorType; +import com.inscloudtech.alog.common.enums.BusinessType; +import com.inscloudtech.alog.common.enums.OperatorType; import java.lang.annotation.*; @@ -25,7 +25,7 @@ public @interface ActionLog { */ OperatorType operatorType() default OperatorType.USER; /** - * 功能 + * 操作类别 */ BusinessType businessType() default BusinessType.OTHER; /** diff --git a/common/src/main/java/com/inscloudtech/alog/common/annotation/NeedRecordField.java b/common/src/main/java/com/inscloudtech/alog/common/annotation/NeedRecordField.java new file mode 100644 index 0000000..1889aac --- /dev/null +++ b/common/src/main/java/com/inscloudtech/alog/common/annotation/NeedRecordField.java @@ -0,0 +1,28 @@ +package com.inscloudtech.alog.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + + + + + + import java.lang.annotation.ElementType; + import java.lang.annotation.Retention; + import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Target; + +/** + * 数值修改记录字段注解 + * + * @author inscloudtech + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +//@JacksonAnnotationsInside +//@JsonSerialize(using = SensitiveJsonSerializer.class) +public @interface NeedRecordField { + String fieldName() default ""; +} diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/constant/Constant.java b/common/src/main/java/com/inscloudtech/alog/common/constant/Constant.java similarity index 94% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/constant/Constant.java rename to common/src/main/java/com/inscloudtech/alog/common/constant/Constant.java index f51e50c..f355f63 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/constant/Constant.java +++ b/common/src/main/java/com/inscloudtech/alog/common/constant/Constant.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.common.constant; +package com.inscloudtech.alog.common.constant; -import com.inscloudtech.platform.jlog.common.utils.ZstdUtils; +import com.inscloudtech.alog.common.utils.ZstdUtils; import java.util.HashSet; import java.util.Set; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/constant/LogTypeEnum.java b/common/src/main/java/com/inscloudtech/alog/common/constant/LogTypeEnum.java similarity index 72% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/constant/LogTypeEnum.java rename to common/src/main/java/com/inscloudtech/alog/common/constant/LogTypeEnum.java index 2f12680..7f4fcba 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/constant/LogTypeEnum.java +++ b/common/src/main/java/com/inscloudtech/alog/common/constant/LogTypeEnum.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.constant; +package com.inscloudtech.alog.common.constant; import java.io.Serializable; @@ -9,7 +9,7 @@ import java.io.Serializable; public enum LogTypeEnum implements Serializable { TRADE, - + ACTION_LOG, SPAN; } diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/constant/SendMode.java b/common/src/main/java/com/inscloudtech/alog/common/constant/SendMode.java similarity index 86% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/constant/SendMode.java rename to common/src/main/java/com/inscloudtech/alog/common/constant/SendMode.java index 95bada5..df6f1ab 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/constant/SendMode.java +++ b/common/src/main/java/com/inscloudtech/alog/common/constant/SendMode.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.constant; +package com.inscloudtech.alog.common.constant; import java.io.Serializable; diff --git a/common/src/main/java/com/inscloudtech/alog/common/enums/BusinessStatus.java b/common/src/main/java/com/inscloudtech/alog/common/enums/BusinessStatus.java new file mode 100644 index 0000000..ee9c6b1 --- /dev/null +++ b/common/src/main/java/com/inscloudtech/alog/common/enums/BusinessStatus.java @@ -0,0 +1,16 @@ +package com.inscloudtech.alog.common.enums; + +/** + * 操作状态 + * + * @author inscloudtech + */ +public enum BusinessStatus { /** + * 成功 + */ + SUCCESS, + /** + * 失败 + */ + FAIL, +} diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/enums/BusinessType.java b/common/src/main/java/com/inscloudtech/alog/common/enums/BusinessType.java similarity index 85% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/enums/BusinessType.java rename to common/src/main/java/com/inscloudtech/alog/common/enums/BusinessType.java index f482516..8fbebee 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/enums/BusinessType.java +++ b/common/src/main/java/com/inscloudtech/alog/common/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.enums; +package com.inscloudtech.alog.common.enums; /** * 业务操作类型 @@ -17,6 +17,10 @@ public enum BusinessType { /** * 修改 */ UPDATE, + /** + * 查询 + */ + SELECT, /** * 删除 */ diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/enums/OperatorType.java b/common/src/main/java/com/inscloudtech/alog/common/enums/OperatorType.java similarity index 76% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/enums/OperatorType.java rename to common/src/main/java/com/inscloudtech/alog/common/enums/OperatorType.java index 6ce1f24..48e7f56 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/enums/OperatorType.java +++ b/common/src/main/java/com/inscloudtech/alog/common/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.enums; +package com.inscloudtech.alog.common.enums; /** * 操作人类别 diff --git a/common/src/main/java/com/inscloudtech/alog/common/event/ActionLogEvent.java b/common/src/main/java/com/inscloudtech/alog/common/event/ActionLogEvent.java new file mode 100644 index 0000000..7e43cc9 --- /dev/null +++ b/common/src/main/java/com/inscloudtech/alog/common/event/ActionLogEvent.java @@ -0,0 +1,258 @@ +package com.inscloudtech.alog.common.event; + +import java.io.Serializable; +import java.util.Date; + +/** + * 操作日志事件 + * + * @author inscloudtech + */ + +public class ActionLogEvent implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 日志主键 + */ + private Long operId; + /** + * 操作模块 + */ + private String title; + /** + * 业务类型（0其它 1新增 2修改 3删除） + */ + private Integer businessType; + /** + * 业务类型数组 + */ + private Integer[] businessTypes; + /** + * 请求方法 + */ + private String method; + /** + * 请求方式 + */ + private String requestMethod; + /** + * 操作类别（0其它 1后台用户 2手机端用户） + */ + private Integer operatorType; + /** + * 操作人员 + */ + private String operName; + /** + * 部门名称 + */ + private String deptName; + /** + * 请求url + */ + private String operUrl; + /** + * 操作地址 + */ + private String operIp; + /** + * 操作地点 + */ + private String operLocation; + /** + * 请求参数 + */ + private String operParam; + /** + * 返回参数 + */ + private String jsonResult; + /** + * 操作状态（0正常 1异常） + */ + private Integer status; + /** + * 错误消息 + */ + private String errorMsg; + /** + * 操作时间 + */ + private Date operTime; + /** + * 更新前值 + */ + private String beforeValue; + + /** + * 更新新后 + */ + private String afterValue; + + /** + * 业务id + */ + private Long businessId; + + + public Long getOperId() { + return operId; + } + + public void setOperId(Long operId) { + this.operId = operId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getBusinessType() { + return businessType; + } + + public void setBusinessType(Integer businessType) { + this.businessType = businessType; + } + + public Integer[] getBusinessTypes() { + return businessTypes; + } + + public void setBusinessTypes(Integer[] businessTypes) { + this.businessTypes = businessTypes; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getRequestMethod() { + return requestMethod; + } + + public void setRequestMethod(String requestMethod) { + this.requestMethod = requestMethod; + } + + public Integer getOperatorType() { + return operatorType; + } + + public void setOperatorType(Integer operatorType) { + this.operatorType = operatorType; + } + + public String getOperName() { + return operName; + } + + public void setOperName(String operName) { + this.operName = operName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getOperUrl() { + return operUrl; + } + + public void setOperUrl(String operUrl) { + this.operUrl = operUrl; + } + + public String getOperIp() { + return operIp; + } + + public void setOperIp(String operIp) { + this.operIp = operIp; + } + + public String getOperLocation() { + return operLocation; + } + + public void setOperLocation(String operLocation) { + this.operLocation = operLocation; + } + + public String getOperParam() { + return operParam; + } + + public void setOperParam(String operParam) { + this.operParam = operParam; + } + + public String getJsonResult() { + return jsonResult; + } + + public void setJsonResult(String jsonResult) { + this.jsonResult = jsonResult; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getErrorMsg() { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } + + public Date getOperTime() { + return operTime; + } + + public void setOperTime(Date operTime) { + this.operTime = operTime; + } + + public String getBeforeValue() { + return beforeValue; + } + + public void setBeforeValue(String beforeValue) { + this.beforeValue = beforeValue; + } + + public String getAfterValue() { + return afterValue; + } + + public void setAfterValue(String afterValue) { + this.afterValue = afterValue; + } + + public Long getBusinessId() { + return businessId; + } + + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } +} diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CollectMode.java b/common/src/main/java/com/inscloudtech/alog/common/handler/CollectMode.java similarity index 97% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CollectMode.java rename to common/src/main/java/com/inscloudtech/alog/common/handler/CollectMode.java index 7f620e6..d61b39e 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CollectMode.java +++ b/common/src/main/java/com/inscloudtech/alog/common/handler/CollectMode.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.handler; +package com.inscloudtech.alog.common.handler; /** * @author tangbohu diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CompressHandler.java b/common/src/main/java/com/inscloudtech/alog/common/handler/CompressHandler.java similarity index 89% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CompressHandler.java rename to common/src/main/java/com/inscloudtech/alog/common/handler/CompressHandler.java index 28959b2..a7f5a2a 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CompressHandler.java +++ b/common/src/main/java/com/inscloudtech/alog/common/handler/CompressHandler.java @@ -1,15 +1,14 @@ -package com.inscloudtech.platform.jlog.common.handler; +package com.inscloudtech.alog.common.handler; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.common.utils.ZstdUtils; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.common.utils.ZstdUtils; -import java.nio.charset.StandardCharsets; import java.util.Map; -import static com.inscloudtech.platform.jlog.common.constant.Constant.MIN; -import static com.inscloudtech.platform.jlog.common.constant.Constant.THRESHOLD; -import static com.inscloudtech.platform.jlog.common.handler.CollectMode.*; +import static com.inscloudtech.alog.common.constant.Constant.MIN; +import static com.inscloudtech.alog.common.constant.Constant.THRESHOLD; +import static com.inscloudtech.alog.common.handler.CollectMode.*; /** * @author tangbohu diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/JcProperties.java b/common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java similarity index 85% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/handler/JcProperties.java rename to common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java index 2b72912..fc1ab02 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/JcProperties.java +++ b/common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java @@ -1,14 +1,13 @@ -package com.inscloudtech.platform.jlog.common.handler; +package com.inscloudtech.alog.common.handler; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.utils.FastJsonUtils; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; +import com.inscloudtech.alog.common.utils.ConfigUtil; +import com.inscloudtech.alog.common.utils.StringUtil; +import com.inscloudtech.alog.common.utils.FastJsonUtils; import java.util.List; import java.util.Properties; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.invoke; - /** * @author tangbohu * @version 1.0.0 @@ -71,7 +70,7 @@ public class JcProperties extends Properties { } try { T instance = clz.newInstance(); - invoke(instance, this, ""); + ConfigUtil.invoke(instance, this, ""); return instance; }catch (Exception e){ e.printStackTrace(); diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/TagConfig.java b/common/src/main/java/com/inscloudtech/alog/common/handler/TagConfig.java similarity index 89% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/handler/TagConfig.java rename to common/src/main/java/com/inscloudtech/alog/common/handler/TagConfig.java index 216dcdf..48b23e3 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/handler/TagConfig.java +++ b/common/src/main/java/com/inscloudtech/alog/common/handler/TagConfig.java @@ -1,11 +1,8 @@ -package com.inscloudtech.platform.jlog.common.handler; +package com.inscloudtech.alog.common.handler; import java.io.Serializable; import java.util.List; -import static com.inscloudtech.platform.jlog.common.handler.CollectMode.COMPRESS_ALL; -import static com.inscloudtech.platform.jlog.common.handler.CollectMode.EXTRACT_ALL; - /** * @author tangbohu * @version 1.0.0 @@ -47,7 +44,7 @@ public class TagConfig implements Serializable { /** * 提取策略 */ - private long extract = EXTRACT_ALL; + private long extract = CollectMode.EXTRACT_ALL; diff --git a/common/src/main/java/com/inscloudtech/alog/common/model/ActionLogMessage.java b/common/src/main/java/com/inscloudtech/alog/common/model/ActionLogMessage.java new file mode 100644 index 0000000..6f0405f --- /dev/null +++ b/common/src/main/java/com/inscloudtech/alog/common/model/ActionLogMessage.java @@ -0,0 +1,398 @@ +package com.inscloudtech.alog.common.model; + +import java.util.Date; +import java.util.Map; + +/** + * className：RunLogMessage + * description： + * + * @author wuweifeng + * @version 1.0.0 + */ +public class ActionLogMessage { + /** + * tracerId + */ + private long tracerId; + /** + * 时间创建时间 + */ + private long createTime; + /** + * 日志内容 + */ + private Object content; + /** + * info、error + */ + private String logLevel; + /** + * 类名 + */ + private String className; + /** + * 方法名 + */ + private String methodName; + /** + * 线程名 + */ + private String threadName; + + /** + * 日志主键 + */ + private Long operId; + /** + * 操作模块 + */ + private String businessName; + /** + * 业务类型（0其它 1新增 2修改 3删除） + */ + private Integer businessType; + /** + * 业务类型数组 + */ + private Integer[] businessTypes; + /** + * 请求方法 + */ + private String method; + /** + * 请求方式 + */ + private String requestMethod; + /** + * 操作类别（0其它 1后台用户 2手机端用户） + */ + private Integer operatorType; + /** + * 操作人员Id + */ + private String operUserId; + + /** + * 操作人员 + */ + private String operUserName; + /** + * 部门名称 + */ + private String deptName; + /** + * 请求url + */ + private String operUrl; + /** + * 操作地址 + */ + private String operIp; + /** + * 操作地点 + */ + private String operLocation; + /** + * 请求参数 + */ + private String operParam; + /** + * 返回参数 + */ + private String jsonResult; + /** + * 操作状态（0正常 1异常） + */ + private Integer status; + /** + * 错误消息 + */ + private String errorMsg; + /** + * 操作时间 + */ + private Date operTime; + /** + * 更新前值 + */ + private String beforeValue; + + /** + * 更新新后 + */ + private String afterValue; + + /** + * 业务数据id + */ + private Long businessId; + + /** + * 响应时间 + */ + private long responseTime; + + + public long getResponseTime() { + return responseTime; + } + + public void setResponseTime(long responseTime) { + this.responseTime = responseTime; + } + + public String getOperUserName() { + return operUserName; + } + + public void setOperUserName(String operUserName) { + this.operUserName = operUserName; + } + + public Long getOperId() { + return operId; + } + + public void setOperId(Long operId) { + this.operId = operId; + } + + public String getBusinessName() { + return businessName; + } + + public void setBusinessName(String businessName) { + this.businessName = businessName; + } + + public Integer getBusinessType() { + return businessType; + } + + public void setBusinessType(Integer businessType) { + this.businessType = businessType; + } + + public Integer[] getBusinessTypes() { + return businessTypes; + } + + public void setBusinessTypes(Integer[] businessTypes) { + this.businessTypes = businessTypes; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getRequestMethod() { + return requestMethod; + } + + public void setRequestMethod(String requestMethod) { + this.requestMethod = requestMethod; + } + + public Integer getOperatorType() { + return operatorType; + } + + public void setOperatorType(Integer operatorType) { + this.operatorType = operatorType; + } + + public String getOperUserId() { + return operUserId; + } + + public void setOperUserId(String operUserId) { + this.operUserId = operUserId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getOperUrl() { + return operUrl; + } + + public void setOperUrl(String operUrl) { + this.operUrl = operUrl; + } + + public String getOperIp() { + return operIp; + } + + public void setOperIp(String operIp) { + this.operIp = operIp; + } + + public String getOperLocation() { + return operLocation; + } + + public void setOperLocation(String operLocation) { + this.operLocation = operLocation; + } + + public String getOperParam() { + return operParam; + } + + public void setOperParam(String operParam) { + this.operParam = operParam; + } + + public String getJsonResult() { + return jsonResult; + } + + public void setJsonResult(String jsonResult) { + this.jsonResult = jsonResult; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getErrorMsg() { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } + + public Date getOperTime() { + return operTime; + } + + public void setOperTime(Date operTime) { + this.operTime = operTime; + } + + public String getBeforeValue() { + return beforeValue; + } + + public void setBeforeValue(String beforeValue) { + this.beforeValue = beforeValue; + } + + public String getAfterValue() { + return afterValue; + } + + public void setAfterValue(String afterValue) { + this.afterValue = afterValue; + } + + public Long getBusinessId() { + return businessId; + } + + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } + + /** + * 标签map + */ + private Map tagMap; + + public long getTracerId() { + return tracerId; + } + + public void setTracerId(long tracerId) { + this.tracerId = tracerId; + } + + public long getCreateTime() { + return createTime; + } + + public void setCreateTime(long createTime) { + this.createTime = createTime; + } + + public Object getContent() { + return content; + } + + public void setContent(Object content) { + this.content = content; + } + + public String getLogLevel() { + return logLevel; + } + + public void setLogLevel(String logLevel) { + this.logLevel = logLevel; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + public String getMethodName() { + return methodName; + } + + public void setMethodName(String methodName) { + this.methodName = methodName; + } + + public String getThreadName() { + return threadName; + } + + public void setThreadName(String threadName) { + this.threadName = threadName; + } + + public Map getTagMap() { + return tagMap; + } + + public void setTagMap(Map tagMap) { + this.tagMap = tagMap; + } + + + + + @Override + public String toString() { + return "RunLogMessage{" + + "tracerId=" + tracerId + + ", createTime=" + createTime + + ", content=" + content + + ", logLevel='" + logLevel + '\'' + + ", className='" + className + '\'' + + ", methodName='" + methodName + '\'' + + ", threadName='" + threadName + '\'' + + ", tagMap=" + tagMap + + '}'; + } +} diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/model/RunLogMessage.java b/common/src/main/java/com/inscloudtech/alog/common/model/RunLogMessage.java similarity index 97% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/model/RunLogMessage.java rename to common/src/main/java/com/inscloudtech/alog/common/model/RunLogMessage.java index 2fd90c6..1551ac6 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/model/RunLogMessage.java +++ b/common/src/main/java/com/inscloudtech/alog/common/model/RunLogMessage.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.model; +package com.inscloudtech.alog.common.model; import java.util.Map; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerBean.java b/common/src/main/java/com/inscloudtech/alog/common/model/TracerBean.java similarity index 98% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerBean.java rename to common/src/main/java/com/inscloudtech/alog/common/model/TracerBean.java index d39e442..04d618d 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerBean.java +++ b/common/src/main/java/com/inscloudtech/alog/common/model/TracerBean.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.model; +package com.inscloudtech.alog.common.model; import java.io.Serializable; import java.util.Arrays; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerData.java b/common/src/main/java/com/inscloudtech/alog/common/model/TracerData.java similarity index 80% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerData.java rename to common/src/main/java/com/inscloudtech/alog/common/model/TracerData.java index 7a14aba..6da95da 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerData.java +++ b/common/src/main/java/com/inscloudtech/alog/common/model/TracerData.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.common.model; +package com.inscloudtech.alog.common.model; -import com.inscloudtech.platform.jlog.common.constant.LogTypeEnum; +import com.inscloudtech.alog.common.constant.LogTypeEnum; import java.io.Serializable; import java.net.InetSocketAddress; @@ -29,6 +29,20 @@ public class TracerData implements Serializable { */ List tempLogs; + /** + * action日志 + */ + List actionLogs; + + + public List getActionLogs() { + return actionLogs; + } + + public void setActionLogs(List actionLogs) { + this.actionLogs = actionLogs; + } + //发送地址（仅多播时候使用） private transient InetSocketAddress address; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncPool.java b/common/src/main/java/com/inscloudtech/alog/common/utils/AsyncPool.java similarity index 90% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncPool.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/AsyncPool.java index 2eb42db..034778f 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncPool.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/AsyncPool.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncWorker.java b/common/src/main/java/com/inscloudtech/alog/common/utils/AsyncWorker.java similarity index 95% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncWorker.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/AsyncWorker.java index 08ece43..b076c9b 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncWorker.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/AsyncWorker.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import java.util.Collection; import java.util.concurrent.BlockingQueue; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/CollectionUtil.java b/common/src/main/java/com/inscloudtech/alog/common/utils/CollectionUtil.java similarity index 99% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/CollectionUtil.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/CollectionUtil.java index ede8475..9c445ee 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/CollectionUtil.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/CollectionUtil.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import java.util.*; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ConfigUtil.java b/common/src/main/java/com/inscloudtech/alog/common/utils/ConfigUtil.java similarity index 95% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ConfigUtil.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/ConfigUtil.java index 081a460..f325343 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ConfigUtil.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/ConfigUtil.java @@ -1,13 +1,9 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; -import com.inscloudtech.platform.jlog.common.constant.Constant; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; +import com.inscloudtech.alog.common.constant.Constant; +import com.inscloudtech.alog.common.handler.JcProperties; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/FastJsonUtils.java b/common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java similarity index 98% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/FastJsonUtils.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java index 8e854a0..32be555 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/FastJsonUtils.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -94,5 +94,6 @@ public class FastJsonUtils { return JSONObject.toJSONString(m); } + } diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IdWorker.java b/common/src/main/java/com/inscloudtech/alog/common/utils/IdWorker.java similarity index 97% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IdWorker.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/IdWorker.java index 2891623..6d9b6ba 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IdWorker.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/IdWorker.java @@ -1,11 +1,9 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import java.net.InetAddress; import java.net.NetworkInterface; -import java.text.SimpleDateFormat; import java.util.Calendar; -import java.util.Date; import java.util.Enumeration; /** diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IpUtils.java b/common/src/main/java/com/inscloudtech/alog/common/utils/IpUtils.java similarity index 96% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IpUtils.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/IpUtils.java index 6bae1fa..de6d9ec 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IpUtils.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/IpUtils.java @@ -15,7 +15,7 @@ *

*/ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import java.net.InetAddress; @@ -26,16 +26,16 @@ import java.util.Enumeration; /** * 获取真实本机网络的服务. - * + * * @author zhangliang */ public final class IpUtils { - + /** * IP地址的正则表达式. */ public static final String IP_REGEX = "((\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})"; - + private static volatile String cachedIpAddress; public static void main(String[] args) { @@ -45,12 +45,12 @@ public final class IpUtils { /** * 获取本机IP地址. - * + * *

* 有限获取外网IP地址. * 也有可能是链接着路由器的最终IP地址. *

- * + * * @return 本机IP地址 */ public static String getIp() { @@ -82,22 +82,22 @@ public final class IpUtils { cachedIpAddress = localIpAddress; return localIpAddress; } - + private static boolean isPublicIpAddress(final InetAddress ipAddress) { return !ipAddress.isSiteLocalAddress() && !ipAddress.isLoopbackAddress() && !isV6IpAddress(ipAddress); } - + private static boolean isLocalIpAddress(final InetAddress ipAddress) { return ipAddress.isSiteLocalAddress() && !ipAddress.isLoopbackAddress() && !isV6IpAddress(ipAddress); } - + private static boolean isV6IpAddress(final InetAddress ipAddress) { return ipAddress.getHostAddress().contains(":"); } - + /** * 获取本机Host名称. - * + * * @return 本机Host名称 */ public static String getHostName() { diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ProtostuffUtils.java b/common/src/main/java/com/inscloudtech/alog/common/utils/ProtostuffUtils.java similarity index 97% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ProtostuffUtils.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/ProtostuffUtils.java index bf4bbd8..3429d12 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ProtostuffUtils.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/ProtostuffUtils.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import io.protostuff.LinkedBuffer; import io.protostuff.ProtobufIOUtil; diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/StringUtil.java b/common/src/main/java/com/inscloudtech/alog/common/utils/StringUtil.java similarity index 94% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/StringUtil.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/StringUtil.java index b6ade8b..cad2df8 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/StringUtil.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/StringUtil.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; /** * @author tangbohu diff --git a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ZstdUtils.java b/common/src/main/java/com/inscloudtech/alog/common/utils/ZstdUtils.java similarity index 94% rename from common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ZstdUtils.java rename to common/src/main/java/com/inscloudtech/alog/common/utils/ZstdUtils.java index 2997d76..6d457e1 100644 --- a/common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ZstdUtils.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/ZstdUtils.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.common.utils; +package com.inscloudtech.alog.common.utils; import com.github.luben.zstd.Zstd; diff --git a/config/config-apollo/pom.xml b/config/config-apollo/pom.xml index 0d4d9dd..c54aa89 100644 --- a/config/config-apollo/pom.xml +++ b/config/config-apollo/pom.xml @@ -2,9 +2,9 @@ - com.inscloudtech.platfrom.jlog - config - 1.4-SNAPSHOT + com.inscloudtech + alog-config + 0.1.1 4.0.0 config-apollo @@ -12,9 +12,9 @@ - com.inscloudtech.platfrom.jlog + com.inscloudtech config-core - 1.4-SNAPSHOT + 0.1.1 com.ctrip.framework.apollo diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java b/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java index df09ba9..62007d5 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java +++ b/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java @@ -1,23 +1,16 @@ package com.inscloudtech.platform.jlog.config.apollo; -import java.io.IOException; -import java.io.StringReader; -import java.util.ArrayList; import java.util.List; import java.util.Properties; -import java.util.concurrent.*; -import com.alibaba.fastjson.JSON; -import com.ctrip.framework.apollo.ConfigFile; -import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.core.utils.StringUtils; import com.ctrip.framework.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.model.ConfigChange; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.handler.TagConfig; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.common.utils.FastJsonUtils; -import com.inscloudtech.platform.jlog.core.*; +import com.inscloudtech.alog.common.utils.FastJsonUtils; +import com.inscloudtech.alog.core.ConfigChangeEvent; +import com.inscloudtech.alog.core.ConfigChangeType; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigService; import org.slf4j.Logger; @@ -25,9 +18,8 @@ import org.slf4j.LoggerFactory; import static com.ctrip.framework.apollo.core.ApolloClientSystemConsts.APP_ID; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.invoke; import static com.inscloudtech.platform.jlog.config.apollo.ApolloConstant.*; -import static com.inscloudtech.platform.jlog.core.Constant.DEFAULT_NAMESPACE; +import static com.inscloudtech.alog.core.Constant.DEFAULT_NAMESPACE; /** diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java b/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java index 6fb8b0a..4c1d574 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java +++ b/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java @@ -1,7 +1,7 @@ package com.inscloudtech.platform.jlog.config.apollo; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorProvider; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorProvider; /** * @author tangbohu diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java b/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java index 1937ed2..a9babfb 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java +++ b/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java @@ -1,8 +1,8 @@ package com.inscloudtech.platform.jlog.config.apollo; -import com.inscloudtech.platform.jlog.core.ClientHandlerBuilder; -import com.inscloudtech.platform.jlog.core.ConfigChangeEvent; -import com.inscloudtech.platform.jlog.core.ConfigChangeListener; +import com.inscloudtech.alog.core.ClientHandlerBuilder; +import com.inscloudtech.alog.core.ConfigChangeEvent; +import com.inscloudtech.alog.core.ConfigChangeListener; /** * @author tangbohu diff --git a/config/config-core/pom.xml b/config/config-core/pom.xml index e2f53f2..c234408 100644 --- a/config/config-core/pom.xml +++ b/config/config-core/pom.xml @@ -2,9 +2,9 @@ - com.inscloudtech.platfrom.jlog - config - 1.4-SNAPSHOT + com.inscloudtech + alog-config + 0.1.1 4.0.0 config-core @@ -12,9 +12,9 @@ - com.inscloudtech.platfrom.jlog - common - 1.4-SNAPSHOT + com.inscloudtech + alog-common + 0.1.1 org.yaml diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandler.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandler.java similarity index 81% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandler.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandler.java index 025b5c7..bcd1485 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandler.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandler.java @@ -1,7 +1,7 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; -import com.inscloudtech.platform.jlog.common.handler.CompressHandler; -import com.inscloudtech.platform.jlog.common.handler.CompressHandler.Outcome; +import com.inscloudtech.alog.common.handler.CompressHandler; +import com.inscloudtech.alog.common.handler.CompressHandler.Outcome; import java.util.Map; diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandlerBuilder.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java similarity index 86% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandlerBuilder.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java index 70c9112..a7c0bfe 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandlerBuilder.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java @@ -1,7 +1,7 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; -import com.inscloudtech.platform.jlog.common.handler.CompressHandler; -import com.inscloudtech.platform.jlog.common.handler.TagConfig; +import com.inscloudtech.alog.common.handler.CompressHandler; +import com.inscloudtech.alog.common.handler.TagConfig; /** * @author tangbohu diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeEvent.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeEvent.java similarity index 88% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeEvent.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeEvent.java index d87019b..ef3a196 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeEvent.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeEvent.java @@ -1,8 +1,6 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; -import static com.inscloudtech.platform.jlog.core.Constant.DEFAULT_NAMESPACE; - /** * @author tangbohu * @version 1.0.0 @@ -23,11 +21,11 @@ public class ConfigChangeEvent { } public ConfigChangeEvent(String key, String newValue) { - this(key, DEFAULT_NAMESPACE, null, newValue, ConfigChangeType.MODIFY); + this(key, Constant.DEFAULT_NAMESPACE, null, newValue, ConfigChangeType.MODIFY); } public ConfigChangeEvent(String key, String oldValue, String newValue){ - this(key, DEFAULT_NAMESPACE, oldValue, newValue, ConfigChangeType.MODIFY); + this(key, Constant.DEFAULT_NAMESPACE, oldValue, newValue, ConfigChangeType.MODIFY); } public ConfigChangeEvent(String key, String namespace, String oldValue, String newValue, diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeListener.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeListener.java similarity index 97% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeListener.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeListener.java index e11f4f2..8e32883 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeListener.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; import io.netty.util.concurrent.DefaultThreadFactory; diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeType.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeType.java similarity index 68% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeType.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeType.java index 041f011..7912369 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeType.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeType.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; /** diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Configurator.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/Configurator.java similarity index 96% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Configurator.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/Configurator.java index e1dace7..d614b94 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Configurator.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/Configurator.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; import java.util.List; diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorFactory.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorFactory.java similarity index 98% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorFactory.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorFactory.java index ff98c5b..34c135c 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorFactory.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorFactory.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; import org.slf4j.Logger; diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorProvider.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorProvider.java similarity index 79% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorProvider.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorProvider.java index 89268bb..11ecd7b 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorProvider.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorProvider.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; /** diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Constant.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/Constant.java similarity index 96% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Constant.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/Constant.java index 1537884..2faa416 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Constant.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/Constant.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; import java.util.HashSet; import java.util.Set; diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ExtractHandler.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ExtractHandler.java similarity index 92% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ExtractHandler.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/ExtractHandler.java index cbfbd24..59dd435 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ExtractHandler.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ExtractHandler.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; -import com.inscloudtech.platform.jlog.common.handler.TagConfig; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.common.utils.ConfigUtil; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; +import com.inscloudtech.alog.common.handler.TagConfig; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.common.utils.ConfigUtil; +import com.inscloudtech.alog.common.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,9 +14,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.inscloudtech.platform.jlog.common.constant.Constant.*; -import static com.inscloudtech.platform.jlog.common.handler.CollectMode.*; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.RANDOM; +import static com.inscloudtech.alog.common.constant.Constant.*; +import static com.inscloudtech.alog.common.handler.CollectMode.*; +import static com.inscloudtech.alog.common.utils.ConfigUtil.RANDOM; /** * @author tangbohu diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileConfigurator.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/FileConfigurator.java similarity index 95% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileConfigurator.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/FileConfigurator.java index 401970b..2f1eadb 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileConfigurator.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/FileConfigurator.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.common.utils.StringUtil; import io.netty.util.concurrent.DefaultThreadFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,8 +15,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import static com.inscloudtech.platform.jlog.core.ConfiguratorFactory.useFileConfig; -import static com.inscloudtech.platform.jlog.core.Constant.*; +import static com.inscloudtech.alog.core.ConfiguratorFactory.useFileConfig; +import static com.inscloudtech.alog.core.Constant.*; /** @@ -93,7 +93,7 @@ public class FileConfigurator implements Configurator { public T getObject(String key, Class clz) { return PROPERTIES.getBean(key, clz); } - + @Override public boolean putConfig(String key, String content) { return false; } @@ -109,7 +109,7 @@ public class FileConfigurator implements Configurator { return "file"; } - + class FileListener implements ConfigChangeListener { diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileNode.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/FileNode.java similarity index 97% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileNode.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/FileNode.java index 50013c6..2ad4fc4 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileNode.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/FileNode.java @@ -1,10 +1,10 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.handler.CollectMode; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.handler.TagConfig; -import com.inscloudtech.platform.jlog.common.utils.ZstdUtils; +import com.inscloudtech.alog.common.handler.CollectMode; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.handler.TagConfig; +import com.inscloudtech.alog.common.utils.ZstdUtils; import java.io.FileInputStream; import java.io.IOException; diff --git a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/GzipCompress.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/GzipCompress.java similarity index 95% rename from config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/GzipCompress.java rename to config/config-core/src/main/java/com/inscloudtech/alog/core/GzipCompress.java index e64e42c..a24e78b 100644 --- a/config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/GzipCompress.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/GzipCompress.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.core; +package com.inscloudtech.alog.core; @@ -10,7 +10,7 @@ import java.util.zip.GZIPOutputStream; /** * The Data Compression Based on gzip. - * + * */ public class GzipCompress { diff --git a/config/config-etcd/pom.xml b/config/config-etcd/pom.xml index 5f745f9..a704207 100644 --- a/config/config-etcd/pom.xml +++ b/config/config-etcd/pom.xml @@ -2,9 +2,9 @@ - com.inscloudtech.platfrom.jlog - config - 1.4-SNAPSHOT + com.inscloudtech + alog-config + 0.1.1 4.0.0 config-etcd @@ -12,9 +12,9 @@ - com.inscloudtech.platfrom.jlog + com.inscloudtech config-core - 1.4-SNAPSHOT + 0.1.1 com.ibm.etcd diff --git a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java b/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java index 64a715f..055a284 100644 --- a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java +++ b/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java @@ -1,8 +1,8 @@ package com.inscloudtech.platform.jlog.etcd; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorProvider; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorProvider; /** * @author tangbohu diff --git a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java b/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java index 1904fec..b549696 100644 --- a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java +++ b/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java @@ -4,25 +4,24 @@ package com.inscloudtech.platform.jlog.etcd; import java.io.IOException; import java.io.StringReader; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import com.alibaba.fastjson.JSON; import com.google.protobuf.ByteString; import com.ibm.etcd.api.KeyValue; import com.ibm.etcd.api.RangeResponse; import com.ibm.etcd.client.EtcdClient; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; -import com.inscloudtech.platform.jlog.core.*; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.common.utils.StringUtil; +import com.inscloudtech.alog.core.ConfigChangeEvent; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.formatConfigByte; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.formatConfigStr; -import static com.inscloudtech.platform.jlog.core.Constant.DEFAULT_TIMEOUT; -import static com.inscloudtech.platform.jlog.core.Constant.SERVER_ADDR_KEY; +import static com.inscloudtech.alog.common.utils.ConfigUtil.formatConfigStr; +import static com.inscloudtech.alog.core.Constant.DEFAULT_TIMEOUT; +import static com.inscloudtech.alog.core.Constant.SERVER_ADDR_KEY; /** * @author tangbohu diff --git a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java b/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java index 1152de9..0d05c8b 100644 --- a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java +++ b/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java @@ -6,13 +6,13 @@ import com.ibm.etcd.api.KeyValue; import com.ibm.etcd.api.RangeResponse; import com.ibm.etcd.client.kv.KvClient; import com.ibm.etcd.client.kv.WatchUpdate; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; -import com.inscloudtech.platform.jlog.core.ClientHandlerBuilder; -import com.inscloudtech.platform.jlog.core.ConfigChangeEvent; -import com.inscloudtech.platform.jlog.core.ConfigChangeListener; -import com.inscloudtech.platform.jlog.core.ConfigChangeType; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.common.utils.StringUtil; +import com.inscloudtech.alog.core.ClientHandlerBuilder; +import com.inscloudtech.alog.core.ConfigChangeEvent; +import com.inscloudtech.alog.core.ConfigChangeListener; +import com.inscloudtech.alog.core.ConfigChangeType; import java.io.IOException; import java.io.StringReader; diff --git a/config/config-nacos/pom.xml b/config/config-nacos/pom.xml index 2a6c2ce..1c6cc38 100644 --- a/config/config-nacos/pom.xml +++ b/config/config-nacos/pom.xml @@ -3,9 +3,9 @@ - com.inscloudtech.platfrom.jlog - config - 1.4-SNAPSHOT + com.inscloudtech + alog-config + 0.1.1 4.0.0 config-nacos @@ -13,9 +13,9 @@ - com.inscloudtech.platfrom.jlog + com.inscloudtech config-core - 1.4-SNAPSHOT + 0.1.1 com.alibaba.nacos diff --git a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java b/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java index 82ca87a..7ad6443 100644 --- a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java +++ b/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java @@ -2,8 +2,6 @@ package com.inscloudtech.platform.jlog.nacos; import java.io.*; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.api.NacosFactory; @@ -11,16 +9,14 @@ import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.common.utils.StringUtils; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorFactory; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.utils.StringUtil; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.formatConfigStr; -import static com.inscloudtech.platform.jlog.core.Constant.*; - +import static com.inscloudtech.alog.common.utils.ConfigUtil.formatConfigStr; /** diff --git a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java b/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java index 16a3774..8a5831c 100644 --- a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java +++ b/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java @@ -1,8 +1,8 @@ package com.inscloudtech.platform.jlog.nacos; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorProvider; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorProvider; public class NacosConfiguratorProvider implements ConfiguratorProvider { @Override diff --git a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java b/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java index 057fdf8..9d7eda5 100644 --- a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java +++ b/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java @@ -1,26 +1,21 @@ package com.inscloudtech.platform.jlog.nacos; -import com.alibaba.nacos.api.NacosFactory; -import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.listener.AbstractSharedListener; -import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.listener.Event; import com.alibaba.nacos.api.naming.listener.EventListener; import com.alibaba.nacos.common.utils.StringUtils; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.core.ClientHandlerBuilder; -import com.inscloudtech.platform.jlog.core.ConfigChangeEvent; -import com.inscloudtech.platform.jlog.core.ConfigChangeListener; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.core.ClientHandlerBuilder; +import com.inscloudtech.alog.core.ConfigChangeEvent; +import com.inscloudtech.alog.core.ConfigChangeListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; -import java.util.Properties; import java.util.Set; -import static com.inscloudtech.platform.jlog.core.Constant.*; import static com.inscloudtech.platform.jlog.nacos.NacosConfigurator.*; diff --git a/config/config-zk/pom.xml b/config/config-zk/pom.xml index 9edc46b..34d7d1e 100644 --- a/config/config-zk/pom.xml +++ b/config/config-zk/pom.xml @@ -17,9 +17,9 @@ - com.inscloudtech.platfrom.jlog - config - 1.4-SNAPSHOT + com.inscloudtech + alog-config + 0.1.1 4.0.0 config-zk @@ -27,9 +27,9 @@ - com.inscloudtech.platfrom.jlog + com.inscloudtech config-core - 1.4-SNAPSHOT + 0.1.1 org.apache.curator diff --git a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java b/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java index dc5a2a4..7b5a046 100644 --- a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java +++ b/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java @@ -3,19 +3,20 @@ package com.inscloudtech.platform.jlog.zk; import java.io.ByteArrayInputStream; import java.util.List; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.handler.JcProperties; -import com.inscloudtech.platform.jlog.common.utils.StringUtil; -import com.inscloudtech.platform.jlog.core.*; +import com.inscloudtech.alog.common.handler.JcProperties; +import com.inscloudtech.alog.common.utils.StringUtil; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.inscloudtech.platform.jlog.common.utils.ConfigUtil.formatConfigByte; -import static com.inscloudtech.platform.jlog.core.Constant.DEFAULT_TIMEOUT; -import static com.inscloudtech.platform.jlog.core.Constant.DEFAULT_NAMESPACE; -import static com.inscloudtech.platform.jlog.core.Constant.SERVER_ADDR_KEY; +import static com.inscloudtech.alog.common.utils.ConfigUtil.formatConfigByte; +import static com.inscloudtech.alog.core.Constant.DEFAULT_TIMEOUT; +import static com.inscloudtech.alog.core.Constant.DEFAULT_NAMESPACE; +import static com.inscloudtech.alog.core.Constant.SERVER_ADDR_KEY; /** diff --git a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java b/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java index f828801..b18a156 100644 --- a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java +++ b/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java @@ -1,8 +1,8 @@ package com.inscloudtech.platform.jlog.zk; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorProvider; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorProvider; /** diff --git a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java b/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java index 4e989a9..684997c 100644 --- a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java +++ b/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java @@ -1,18 +1,14 @@ package com.inscloudtech.platform.jlog.zk; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.core.ClientHandlerBuilder; -import com.inscloudtech.platform.jlog.core.ConfigChangeEvent; -import com.inscloudtech.platform.jlog.core.ConfigChangeListener; -import com.inscloudtech.platform.jlog.core.ConfigChangeType; -import org.apache.curator.framework.recipes.cache.ChildData; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.core.ClientHandlerBuilder; +import com.inscloudtech.alog.core.ConfigChangeEvent; +import com.inscloudtech.alog.core.ConfigChangeListener; import org.apache.curator.framework.recipes.cache.NodeCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.Map; import java.util.Properties; import java.util.Set; diff --git a/config/pom.xml b/config/pom.xml index 01c5df7..e269435 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -3,14 +3,14 @@ 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"> - JLog - com.inscloudtech.platfrom.jlog - 1.4-SNAPSHOT + ALog + com.inscloudtech + 0.1.1 4.0.0 - config + alog-config pom - config + alog-config config-core config-etcd diff --git a/example/pom.xml b/example/pom.xml index bc02dad..f497472 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -9,11 +9,11 @@ 2.5.3 - com.inscloudtech.platfrom.jlog + com.inscloudtech example 0.0.1-SNAPSHOT example - example for using JLog + example for using ALog 1.8 @@ -37,9 +37,9 @@ - com.inscloudtech.platfrom.jlog - client - 1.4-SNAPSHOT + com.inscloudtech + alog-client + 0.1.1 org.springframework.boot @@ -56,8 +56,21 @@ com.baomidou mybatis-plus-boot-starter - 3.5.3.1 + 3.4.3 + + com.mysql + mysql-connector-j + 8.0.33 + + + + + + + + + diff --git a/images/image.png b/images/image.png deleted file mode 100644 index 2a8825b..0000000 Binary files a/images/image.png and /dev/null differ diff --git a/images/image1.png b/images/image1.png deleted file mode 100644 index 20d92bd..0000000 Binary files a/images/image1.png and /dev/null differ diff --git a/images/image12.png b/images/image12.png deleted file mode 100644 index a2d0bb2..0000000 Binary files a/images/image12.png and /dev/null differ diff --git a/images/image2.png b/images/image2.png deleted file mode 100644 index 370c0a4..0000000 Binary files a/images/image2.png and /dev/null differ diff --git a/images/image4.png b/images/image4.png deleted file mode 100644 index 2a8825b..0000000 Binary files a/images/image4.png and /dev/null differ diff --git a/images/image65.png b/images/image65.png deleted file mode 100644 index a919355..0000000 Binary files a/images/image65.png and /dev/null differ diff --git a/images/imagewechat.png b/images/imagewechat.png deleted file mode 100644 index d7d7b5d..0000000 Binary files a/images/imagewechat.png and /dev/null differ diff --git a/images/q1.png b/images/q1.png deleted file mode 100644 index b1fbb66..0000000 Binary files a/images/q1.png and /dev/null differ diff --git a/images/tracer.png b/images/tracer.png deleted file mode 100644 index ca2993a..0000000 Binary files a/images/tracer.png and /dev/null differ diff --git a/images/tracer_log.png b/images/tracer_log.png deleted file mode 100644 index 08cd68e..0000000 Binary files a/images/tracer_log.png and /dev/null differ diff --git a/pom.xml b/pom.xml index bb31928..d413fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.inscloudtech.platfrom.jlog - JLog + com.inscloudtech + ALog pom - 1.4-SNAPSHOT + 0.1.1 common worker @@ -15,7 +15,7 @@ clientlog4j clientlog4j2 clientlogback - Dashboard + example config diff --git a/worker/pom.xml b/worker/pom.xml index 44153c8..46383c5 100644 --- a/worker/pom.xml +++ b/worker/pom.xml @@ -9,10 +9,10 @@ 2.5.3 - com.inscloudtech.platfrom.jlog - worker + com.inscloudtech + alog-worker worker - worker for JLog + worker for ALog 1.8 @@ -23,9 +23,9 @@ spring-boot-starter-web - com.inscloudtech.platfrom.jlog + com.inscloudtech config-core - 1.4-SNAPSHOT + 0.1.1 @@ -39,9 +39,9 @@ 0.3.1 - com.inscloudtech.platfrom.jlog - common - 1.4-SNAPSHOT + com.inscloudtech + alog-common + 0.1.1 com.lmax diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/Starter.java b/worker/src/main/java/com/inscloudtech/alog/worker/Starter.java similarity index 79% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/Starter.java rename to worker/src/main/java/com/inscloudtech/alog/worker/Starter.java index dccaea2..e6c9821 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/Starter.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/Starter.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.worker; +package com.inscloudtech.alog.worker; -import com.inscloudtech.platform.jlog.worker.config.CenterStarter; -import com.inscloudtech.platform.jlog.worker.store.TracerLogToDbStore; -import com.inscloudtech.platform.jlog.worker.store.TracerModelToDbStore; -import com.inscloudtech.platform.jlog.worker.udp.UdpServer; +import com.inscloudtech.alog.worker.config.CenterStarter; +import com.inscloudtech.alog.worker.store.TracerLogToDbStore; +import com.inscloudtech.alog.worker.store.TracerModelToDbStore; +import com.inscloudtech.alog.worker.udp.UdpServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/WorkerApplication.java b/worker/src/main/java/com/inscloudtech/alog/worker/WorkerApplication.java similarity index 89% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/WorkerApplication.java rename to worker/src/main/java/com/inscloudtech/alog/worker/WorkerApplication.java index 0d5577d..95a74e0 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/WorkerApplication.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/WorkerApplication.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.worker; +package com.inscloudtech.alog.worker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/config/CenterStarter.java b/worker/src/main/java/com/inscloudtech/alog/worker/config/CenterStarter.java similarity index 81% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/config/CenterStarter.java rename to worker/src/main/java/com/inscloudtech/alog/worker/config/CenterStarter.java index f19ec86..f0a6b04 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/config/CenterStarter.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/config/CenterStarter.java @@ -1,16 +1,13 @@ -package com.inscloudtech.platform.jlog.worker.config; +package com.inscloudtech.alog.worker.config; import com.alibaba.fastjson.JSON; -import com.inscloudtech.platform.jlog.common.constant.Constant; -import com.inscloudtech.platform.jlog.common.utils.IpUtils; -import com.inscloudtech.platform.jlog.core.Configurator; -import com.inscloudtech.platform.jlog.core.ConfiguratorFactory; -import org.springframework.beans.factory.annotation.Value; +import com.inscloudtech.alog.common.constant.Constant; +import com.inscloudtech.alog.common.utils.IpUtils; +import com.inscloudtech.alog.core.Configurator; +import com.inscloudtech.alog.core.ConfiguratorFactory; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/controller/BigTracerController.java b/worker/src/main/java/com/inscloudtech/alog/worker/controller/BigTracerController.java similarity index 89% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/controller/BigTracerController.java rename to worker/src/main/java/com/inscloudtech/alog/worker/controller/BigTracerController.java index 1794b73..48a4f4e 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/controller/BigTracerController.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/controller/BigTracerController.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.worker.controller; +package com.inscloudtech.alog.worker.controller; -import com.inscloudtech.platform.jlog.worker.disruptor.Producer; +import com.inscloudtech.alog.worker.disruptor.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/controller/UserController.java b/worker/src/main/java/com/inscloudtech/alog/worker/controller/UserController.java similarity index 91% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/controller/UserController.java rename to worker/src/main/java/com/inscloudtech/alog/worker/controller/UserController.java index a66cd46..8e14053 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/controller/UserController.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/controller/UserController.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.worker.controller; +package com.inscloudtech.alog.worker.controller; -import com.inscloudtech.platform.jlog.worker.db.Db; +import com.inscloudtech.alog.worker.db.Db; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/db/Db.java b/worker/src/main/java/com/inscloudtech/alog/worker/db/Db.java similarity index 96% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/db/Db.java rename to worker/src/main/java/com/inscloudtech/alog/worker/db/Db.java index 470883d..0152306 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/db/Db.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/db/Db.java @@ -1,12 +1,10 @@ -package com.inscloudtech.platform.jlog.worker.db; +package com.inscloudtech.alog.worker.db; -import com.alibaba.fastjson.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/db/DbConfig.java b/worker/src/main/java/com/inscloudtech/alog/worker/db/DbConfig.java similarity index 97% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/db/DbConfig.java rename to worker/src/main/java/com/inscloudtech/alog/worker/db/DbConfig.java index 87acb4c..ffec641 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/db/DbConfig.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/db/DbConfig.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.worker.db; +package com.inscloudtech.alog.worker.db; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/DisruptorStarter.java b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/DisruptorStarter.java similarity index 90% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/DisruptorStarter.java rename to worker/src/main/java/com/inscloudtech/alog/worker/disruptor/DisruptorStarter.java index f8f126f..9bd3674 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/DisruptorStarter.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/DisruptorStarter.java @@ -1,7 +1,7 @@ -package com.inscloudtech.platform.jlog.worker.disruptor; +package com.inscloudtech.alog.worker.disruptor; -import com.inscloudtech.platform.jlog.worker.store.TracerLogToDbStore; -import com.inscloudtech.platform.jlog.worker.store.TracerModelToDbStore; +import com.inscloudtech.alog.worker.store.TracerLogToDbStore; +import com.inscloudtech.alog.worker.store.TracerModelToDbStore; import com.lmax.disruptor.BlockingWaitStrategy; import com.lmax.disruptor.EventFactory; import com.lmax.disruptor.RingBuffer; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/OneTracer.java b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/OneTracer.java similarity index 82% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/OneTracer.java rename to worker/src/main/java/com/inscloudtech/alog/worker/disruptor/OneTracer.java index 8c51625..8c48be8 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/OneTracer.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/OneTracer.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.worker.disruptor; +package com.inscloudtech.alog.worker.disruptor; /** * OneTracer diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/Producer.java b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/Producer.java similarity index 95% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/Producer.java rename to worker/src/main/java/com/inscloudtech/alog/worker/disruptor/Producer.java index 8c50646..62e9979 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/Producer.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/Producer.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.worker.disruptor; +package com.inscloudtech.alog.worker.disruptor; import com.lmax.disruptor.RingBuffer; import org.slf4j.Logger; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/TracerConsumer.java b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/TracerConsumer.java similarity index 82% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/TracerConsumer.java rename to worker/src/main/java/com/inscloudtech/alog/worker/disruptor/TracerConsumer.java index 7bef4a0..155881e 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/disruptor/TracerConsumer.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/disruptor/TracerConsumer.java @@ -1,13 +1,14 @@ -package com.inscloudtech.platform.jlog.worker.disruptor; - -import com.inscloudtech.platform.jlog.common.constant.LogTypeEnum; -import com.inscloudtech.platform.jlog.common.model.TracerBean; -import com.inscloudtech.platform.jlog.common.model.RunLogMessage; -import com.inscloudtech.platform.jlog.common.model.TracerData; -import com.inscloudtech.platform.jlog.common.utils.ProtostuffUtils; -import com.inscloudtech.platform.jlog.common.utils.ZstdUtils; -import com.inscloudtech.platform.jlog.worker.store.TracerLogToDbStore; -import com.inscloudtech.platform.jlog.worker.store.TracerModelToDbStore; +package com.inscloudtech.alog.worker.disruptor; + +import com.inscloudtech.alog.common.constant.Constant; +import com.inscloudtech.alog.common.constant.LogTypeEnum; +import com.inscloudtech.alog.common.model.RunLogMessage; +import com.inscloudtech.alog.common.utils.ProtostuffUtils; +import com.inscloudtech.alog.common.utils.ZstdUtils; +import com.inscloudtech.alog.common.model.TracerBean; +import com.inscloudtech.alog.common.model.TracerData; +import com.inscloudtech.alog.worker.store.TracerLogToDbStore; +import com.inscloudtech.alog.worker.store.TracerModelToDbStore; import com.lmax.disruptor.WorkHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,8 +21,6 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.atomic.LongAdder; -import static com.inscloudtech.platform.jlog.common.constant.Constant.DEFAULT_BYTE; - /** * TracerConsumer * @@ -84,8 +83,11 @@ public class TracerConsumer implements WorkHandler { //普通日志 if (LogTypeEnum.TRADE.equals(tracerData.getType())) { dealTracerLog(tracerData.getTempLogs()); - } else { + } else if (LogTypeEnum.SPAN.equals(tracerData.getType())){ dealFilterModel(tracerData.getTracerBeanList()); + }else{ +// ACTION_LOG + System.out.println("tracerData.getActionLogs() = " + tracerData.getActionLogs()); } } @@ -119,7 +121,7 @@ public class TracerConsumer implements WorkHandler { } for (TracerBean tracerModel : tracerList) { if (tracerModel.getResponseContent() == null) { - tracerModel.setResponseContent(DEFAULT_BYTE); + tracerModel.setResponseContent(Constant.DEFAULT_BYTE); } tracerModel.setCreateTime(formatLongTime(tracerModel.getCreateTimeLong())); Map map = new HashMap(BeanMap.create(tracerModel)); diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerBeanStore.java b/worker/src/main/java/com/inscloudtech/alog/worker/store/TracerBeanStore.java similarity index 99% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerBeanStore.java rename to worker/src/main/java/com/inscloudtech/alog/worker/store/TracerBeanStore.java index 9fee7f1..b5d7049 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerBeanStore.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/store/TracerBeanStore.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.worker.store; +package com.inscloudtech.alog.worker.store; import org.springframework.stereotype.Component; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerLogToDbStore.java b/worker/src/main/java/com/inscloudtech/alog/worker/store/TracerLogToDbStore.java similarity index 92% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerLogToDbStore.java rename to worker/src/main/java/com/inscloudtech/alog/worker/store/TracerLogToDbStore.java index 45e4f13..e64146e 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerLogToDbStore.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/store/TracerLogToDbStore.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.worker.store; +package com.inscloudtech.alog.worker.store; -import com.inscloudtech.platform.jlog.common.utils.AsyncPool; -import com.inscloudtech.platform.jlog.common.utils.AsyncWorker; -import com.inscloudtech.platform.jlog.worker.db.Db; +import com.inscloudtech.alog.common.utils.AsyncPool; +import com.inscloudtech.alog.common.utils.AsyncWorker; +import com.inscloudtech.alog.worker.db.Db; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerModelToDbStore.java b/worker/src/main/java/com/inscloudtech/alog/worker/store/TracerModelToDbStore.java similarity index 91% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerModelToDbStore.java rename to worker/src/main/java/com/inscloudtech/alog/worker/store/TracerModelToDbStore.java index ffe6e53..7b34ac4 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/store/TracerModelToDbStore.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/store/TracerModelToDbStore.java @@ -1,9 +1,9 @@ -package com.inscloudtech.platform.jlog.worker.store; +package com.inscloudtech.alog.worker.store; -import com.inscloudtech.platform.jlog.common.utils.AsyncPool; -import com.inscloudtech.platform.jlog.common.utils.AsyncWorker; -import com.inscloudtech.platform.jlog.common.utils.CollectionUtil; -import com.inscloudtech.platform.jlog.worker.db.Db; +import com.inscloudtech.alog.common.utils.AsyncPool; +import com.inscloudtech.alog.common.utils.AsyncWorker; +import com.inscloudtech.alog.common.utils.CollectionUtil; +import com.inscloudtech.alog.worker.db.Db; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/udp/UdpServer.java b/worker/src/main/java/com/inscloudtech/alog/worker/udp/UdpServer.java similarity index 95% rename from worker/src/main/java/com/inscloudtech/platform/jlog/worker/udp/UdpServer.java rename to worker/src/main/java/com/inscloudtech/alog/worker/udp/UdpServer.java index 67e51d1..7e1e2cb 100644 --- a/worker/src/main/java/com/inscloudtech/platform/jlog/worker/udp/UdpServer.java +++ b/worker/src/main/java/com/inscloudtech/alog/worker/udp/UdpServer.java @@ -1,6 +1,6 @@ -package com.inscloudtech.platform.jlog.worker.udp; +package com.inscloudtech.alog.worker.udp; -import com.inscloudtech.platform.jlog.worker.disruptor.Producer; +import com.inscloudtech.alog.worker.disruptor.Producer; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.*; diff --git a/worker/src/main/resources/logback-spring.xml b/worker/src/main/resources/logback-spring.xml index a344549..22365fd 100644 --- a/worker/src/main/resources/logback-spring.xml +++ b/worker/src/main/resources/logback-spring.xml @@ -57,7 +57,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息， - +