Browse Source

v1

master
583641232@qq.com 8 months ago
parent
commit
ae40542549
  1. 2
      Dashboard/pom.xml
  2. 10
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/DashboardApplication.java
  3. 18
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/controller/TracerController.java
  4. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/ConnectionPool.java
  5. 4
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/Db.java
  6. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbConfig.java
  7. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/DbOperator.java
  8. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/db/WhereCause.java
  9. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerListVO.java
  10. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/entity/TracerVO.java
  11. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QueryListModel.java
  12. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/model/QuerySingleModel.java
  13. 16
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/service/TracerService.java
  14. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/CharTest.java
  15. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DateUtils.java
  16. 8
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/DbUtils.java
  17. 4
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ResultHelper.java
  18. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/TwoTuple.java
  19. 2
      Dashboard/src/main/java/com/inscloudtech/alog/dashboard/utils/ZstdUtils.java
  20. 36
      client/pom.xml
  21. 4
      client/src/main/java/com/inscloudtech/alog/client/Context.java
  22. 24
      client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java
  23. 2
      client/src/main/java/com/inscloudtech/alog/client/constant/TracerConstant.java
  24. 28
      client/src/main/java/com/inscloudtech/alog/client/filter/HttpFilter.java
  25. 2
      client/src/main/java/com/inscloudtech/alog/client/filter/RequestWrapper.java
  26. 2
      client/src/main/java/com/inscloudtech/alog/client/filter/ResponseWrapper.java
  27. 2
      client/src/main/java/com/inscloudtech/alog/client/log/LogExceptionStackTrace.java
  28. 2
      client/src/main/java/com/inscloudtech/alog/client/mdc/Mdc.java
  29. 4
      client/src/main/java/com/inscloudtech/alog/client/modeholder/ModeHolder.java
  30. 2
      client/src/main/java/com/inscloudtech/alog/client/percent/DefaultTracerPercentImpl.java
  31. 2
      client/src/main/java/com/inscloudtech/alog/client/percent/ITracerPercent.java
  32. 8
      client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java
  33. 2
      client/src/main/java/com/inscloudtech/alog/client/tracerholder/TracerHolder.java
  34. 8
      client/src/main/java/com/inscloudtech/alog/client/udp/HttpSender.java
  35. 2
      client/src/main/java/com/inscloudtech/alog/client/udp/OneTracer.java
  36. 18
      client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java
  37. 2
      client/src/main/java/com/inscloudtech/alog/client/udp/UdpClientHandler.java
  38. 55
      client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java
  39. 6
      client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java
  40. 12
      clientlog4j/pom.xml
  41. 10
      clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java
  42. 12
      clientlog4j2/pom.xml
  43. 8
      clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java
  44. 12
      clientlogback/pom.xml
  45. 8
      clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java
  46. 8
      common/pom.xml
  47. 8
      common/src/main/java/com/inscloudtech/alog/common/annotation/ActionLog.java
  48. 28
      common/src/main/java/com/inscloudtech/alog/common/annotation/NeedRecordField.java
  49. 4
      common/src/main/java/com/inscloudtech/alog/common/constant/Constant.java
  50. 4
      common/src/main/java/com/inscloudtech/alog/common/constant/LogTypeEnum.java
  51. 2
      common/src/main/java/com/inscloudtech/alog/common/constant/SendMode.java
  52. 16
      common/src/main/java/com/inscloudtech/alog/common/enums/BusinessStatus.java
  53. 6
      common/src/main/java/com/inscloudtech/alog/common/enums/BusinessType.java
  54. 2
      common/src/main/java/com/inscloudtech/alog/common/enums/OperatorType.java
  55. 258
      common/src/main/java/com/inscloudtech/alog/common/event/ActionLogEvent.java
  56. 2
      common/src/main/java/com/inscloudtech/alog/common/handler/CollectMode.java
  57. 13
      common/src/main/java/com/inscloudtech/alog/common/handler/CompressHandler.java
  58. 11
      common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java
  59. 7
      common/src/main/java/com/inscloudtech/alog/common/handler/TagConfig.java
  60. 398
      common/src/main/java/com/inscloudtech/alog/common/model/ActionLogMessage.java
  61. 2
      common/src/main/java/com/inscloudtech/alog/common/model/RunLogMessage.java
  62. 2
      common/src/main/java/com/inscloudtech/alog/common/model/TracerBean.java
  63. 18
      common/src/main/java/com/inscloudtech/alog/common/model/TracerData.java
  64. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/AsyncPool.java
  65. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/AsyncWorker.java
  66. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/CollectionUtil.java
  67. 10
      common/src/main/java/com/inscloudtech/alog/common/utils/ConfigUtil.java
  68. 3
      common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java
  69. 4
      common/src/main/java/com/inscloudtech/alog/common/utils/IdWorker.java
  70. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/IpUtils.java
  71. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/ProtostuffUtils.java
  72. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/StringUtil.java
  73. 2
      common/src/main/java/com/inscloudtech/alog/common/utils/ZstdUtils.java
  74. 10
      config/config-apollo/pom.xml
  75. 20
      config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java
  76. 4
      config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java
  77. 6
      config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java
  78. 12
      config/config-core/pom.xml
  79. 6
      config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandler.java
  80. 6
      config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java
  81. 8
      config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeEvent.java
  82. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeListener.java
  83. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/ConfigChangeType.java
  84. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/Configurator.java
  85. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorFactory.java
  86. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/ConfiguratorProvider.java
  87. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/Constant.java
  88. 16
      config/config-core/src/main/java/com/inscloudtech/alog/core/ExtractHandler.java
  89. 12
      config/config-core/src/main/java/com/inscloudtech/alog/core/FileConfigurator.java
  90. 10
      config/config-core/src/main/java/com/inscloudtech/alog/core/FileNode.java
  91. 2
      config/config-core/src/main/java/com/inscloudtech/alog/core/GzipCompress.java
  92. 10
      config/config-etcd/pom.xml
  93. 4
      config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java
  94. 19
      config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java
  95. 14
      config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java
  96. 10
      config/config-nacos/pom.xml
  97. 14
      config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java
  98. 4
      config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java
  99. 15
      config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java
  100. 10
      config/config-zk/pom.xml

2
Dashboard/pom.xml

@ -11,7 +11,7 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>Dashboard</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dashboard</name>

10
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/DashboardApplication.java → 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 {

18
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/controller/TracerController.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/ConnectionPool.java → 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;

4
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/Db.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbConfig.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/DbOperator.java → 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;
/**
* 数据库条件语句符号

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/db/WhereCause.java → 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

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerListVO.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/entity/TracerVO.java → 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;
/**

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QueryListModel.java → 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;
/**

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/model/QuerySingleModel.java → 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;
/**

16
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/service/TracerService.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/CharTest.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DateUtils.java → 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;

8
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/DbUtils.java → 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;

4
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ResultHelper.java → 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;
/**
* 返回值处理类

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/TwoTuple.java → 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;

2
Dashboard/src/main/java/com/jd/platform/jlog/dashboard/utils/ZstdUtils.java → 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;

36
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">
<parent>
<artifactId>JLog</artifactId>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<version>1.4-SNAPSHOT</version>
<artifactId>ALog</artifactId>
<groupId>com.inscloudtech</groupId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.4-SNAPSHOT</version>
<artifactId>client</artifactId>
<version>0.1.1</version>
<artifactId>alog-client</artifactId>
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>common</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-common</artifactId>
<version>0.1.1</version>
</dependency>
<!-- <dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-zk</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>-->
<!-- <dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-nacos</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>-->
<!-- <dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-etcd</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>-->
<!-- <dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-apollo</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>-->
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>

4
client/src/main/java/com/inscloudtech/platform/jlog/client/Context.java → 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;
/**

24
client/src/main/java/com/inscloudtech/platform/jlog/client/TracerClientStarter.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/constant/TracerConstant.java → 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

28
client/src/main/java/com/inscloudtech/platform/jlog/client/filter/HttpFilter.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/filter/RequestWrapper.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/filter/ResponseWrapper.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/log/LogExceptionStackTrace.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/mdc/Mdc.java → 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

4
client/src/main/java/com/inscloudtech/platform/jlog/client/modeholder/ModeHolder.java → 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;
/**
* 线程间传递通讯模式单播多播

2
client/src/main/java/com/inscloudtech/platform/jlog/client/percent/DefaultTracerPercentImpl.java → 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;
/**
* 切量百分比默认

2
client/src/main/java/com/inscloudtech/platform/jlog/client/percent/ITracerPercent.java → 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;

8
client/src/main/java/com/inscloudtech/platform/jlog/client/task/Monitor.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/tracerholder/TracerHolder.java → 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;

8
client/src/main/java/com/inscloudtech/platform/jlog/client/udp/HttpSender.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/udp/OneTracer.java → 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

18
client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClient.java → 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;

2
client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpClientHandler.java → 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;

55
client/src/main/java/com/inscloudtech/platform/jlog/client/udp/UdpSender.java → 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<RunLogMessage> logBeanQueue = new LinkedBlockingQueue<>(50000);
/**
* 日志集中营最多积压5万条
*/
private static final LinkedBlockingQueue<ActionLogMessage> 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<ActionLogMessage> 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();
}
}
});
}
/**

6
client/src/main/java/com/inscloudtech/platform/jlog/client/worker/WorkerInfoHolder.java → 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<String> selectWorkers() {
List<String> defaultIps = new ArrayList<>();
defaultIps.add("127.0.0.1:9999");
defaultIps.add("127.0.0.1:39999");
if (WORKER_HOLDER.isEmpty()) {
return defaultIps;
}

12
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">
<parent>
<artifactId>JLog</artifactId>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<version>1.4-SNAPSHOT</version>
<artifactId>ALog</artifactId>
<groupId>com.inscloudtech</groupId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@ -24,9 +24,9 @@
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>client</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-client</artifactId>
<version>0.1.1</version>
</dependency>
</dependencies>

10
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;

12
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">
<parent>
<artifactId>JLog</artifactId>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<version>1.4-SNAPSHOT</version>
<artifactId>ALog</artifactId>
<groupId>com.inscloudtech</groupId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -42,9 +42,9 @@
</dependency>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>client</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-client</artifactId>
<version>0.1.1</version>
</dependency>
</dependencies>
</project>

8
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;

12
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">
<parent>
<artifactId>JLog</artifactId>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<version>1.4-SNAPSHOT</version>
<artifactId>ALog</artifactId>
<groupId>com.inscloudtech</groupId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@ -13,9 +13,9 @@
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>client</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-client</artifactId>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>

8
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;
/**

8
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">
<parent>
<artifactId>JLog</artifactId>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>ALog</artifactId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common</artifactId>
<artifactId>alog-common</artifactId>
<properties>
<java.version>1.8</java.version>

8
common/src/main/java/com/inscloudtech/platform/jlog/common/annotation/ActionLog.java → 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;
/**

28
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 "";
}

4
common/src/main/java/com/inscloudtech/platform/jlog/common/constant/Constant.java → 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;

4
common/src/main/java/com/inscloudtech/platform/jlog/common/constant/LogTypeEnum.java → 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;
}

2
common/src/main/java/com/inscloudtech/platform/jlog/common/constant/SendMode.java → 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;

16
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,
}

6
common/src/main/java/com/inscloudtech/platform/jlog/common/enums/BusinessType.java → 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,
/**
* 删除
*/

2
common/src/main/java/com/inscloudtech/platform/jlog/common/enums/OperatorType.java → 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;
/**
* 操作人类别

258
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;
}
}

2
common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CollectMode.java → 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

13
common/src/main/java/com/inscloudtech/platform/jlog/common/handler/CompressHandler.java → 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

11
common/src/main/java/com/inscloudtech/platform/jlog/common/handler/JcProperties.java → 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();

7
common/src/main/java/com/inscloudtech/platform/jlog/common/handler/TagConfig.java → 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;

398
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;
/**
* classNameRunLogMessage
* description
*
* @author wuweifeng
* @version 1.0.0
*/
public class ActionLogMessage {
/**
* tracerId
*/
private long tracerId;
/**
* 时间创建时间
*/
private long createTime;
/**
* 日志内容
*/
private Object content;
/**
* infoerror
*/
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<String,Object> 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<String, Object> getTagMap() {
return tagMap;
}
public void setTagMap(Map<String, Object> 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 +
'}';
}
}

2
common/src/main/java/com/inscloudtech/platform/jlog/common/model/RunLogMessage.java → 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;

2
common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerBean.java → 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;

18
common/src/main/java/com/inscloudtech/platform/jlog/common/model/TracerData.java → 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<RunLogMessage> tempLogs;
/**
* action日志
*/
List<ActionLogMessage> actionLogs;
public List<ActionLogMessage> getActionLogs() {
return actionLogs;
}
public void setActionLogs(List<ActionLogMessage> actionLogs) {
this.actionLogs = actionLogs;
}
//发送地址仅多播时候使用
private transient InetSocketAddress address;

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncPool.java → 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;

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/AsyncWorker.java → 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;

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/CollectionUtil.java → 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.*;

10
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ConfigUtil.java → 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.*;

3
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/FastJsonUtils.java → 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);
}
}

4
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IdWorker.java → 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;
/**

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/IpUtils.java → common/src/main/java/com/inscloudtech/alog/common/utils/IpUtils.java

@ -15,7 +15,7 @@
* </p>
*/
package com.inscloudtech.platform.jlog.common.utils;
package com.inscloudtech.alog.common.utils;
import java.net.InetAddress;

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ProtostuffUtils.java → 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;

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/StringUtil.java → 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

2
common/src/main/java/com/inscloudtech/platform/jlog/common/utils/ZstdUtils.java → 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;

10
config/config-apollo/pom.xml

@ -2,9 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>config</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-config</artifactId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-apollo</artifactId>
@ -12,9 +12,9 @@
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>

20
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;
/**

4
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

6
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

12
config/config-core/pom.xml

@ -2,9 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>config</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-config</artifactId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-core</artifactId>
@ -12,9 +12,9 @@
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>common</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-common</artifactId>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>

6
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandler.java → 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;

6
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ClientHandlerBuilder.java → 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

8
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeEvent.java → 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,

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeListener.java → 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;

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfigChangeType.java → 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;
/**

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Configurator.java → 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;

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorFactory.java → 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;

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ConfiguratorProvider.java → 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;
/**

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/Constant.java → 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;

16
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/ExtractHandler.java → 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

12
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileConfigurator.java → 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.*;
/**

10
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/FileNode.java → 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;

2
config/config-core/src/main/java/com/inscloudtech/platform/jlog/core/GzipCompress.java → 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
config/config-etcd/pom.xml

@ -2,9 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>config</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-config</artifactId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-etcd</artifactId>
@ -12,9 +12,9 @@
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>com.ibm.etcd</groupId>

4
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

19
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

14
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;

10
config/config-nacos/pom.xml

@ -3,9 +3,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>config</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-config</artifactId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-nacos</artifactId>
@ -13,9 +13,9 @@
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>

14
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;
/**

4
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

15
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.*;

10
config/config-zk/pom.xml

@ -17,9 +17,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<artifactId>config</artifactId>
<version>1.4-SNAPSHOT</version>
<groupId>com.inscloudtech</groupId>
<artifactId>alog-config</artifactId>
<version>0.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-zk</artifactId>
@ -27,9 +27,9 @@
<dependencies>
<dependency>
<groupId>com.inscloudtech.platfrom.jlog</groupId>
<groupId>com.inscloudtech</groupId>
<artifactId>config-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save