修改请求体数据

pom.xml

@@ -44,12 +44,6 @@
             <artifactId>okhttp</artifactId>
             <version>3.14.4</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>tlog-web-spring-boot-starter</artifactId>
-            <version>1.3.6</version>
-        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/fdkankan/tracking/config/CorsConfig.java

@@ -0,0 +1,27 @@
+package com.fdkankan.tracking.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        //添加跨域的cors配置
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**").   //可以被跨域的路径,/**表示无限制,
+                        allowedOrigins("*"). //允许跨域的域名，如果值为*,则表示允许任何域名使用
+                        allowedMethods("*"). //允许任何方法，值可以为： "GET", "POST" ...
+                        allowedHeaders("*"). //允许任何请求头
+                        allowCredentials(true). //允许带cookie信息
+                        exposedHeaders(HttpHeaders.SET_COOKIE).maxAge(3600L); //maxAge(3600):表示3600秒内，不需要再发送预检验请求，是结果可以缓存的时长
+            }
+        };
+    }
+}

src/main/java/com/fdkankan/tracking/entit/TrackingBody.java

@@ -0,0 +1,196 @@
+package com.fdkankan.tracking.entit;
+
+import java.util.Date;
+
+public class TrackingBody {
+
+    private String appId;
+    private String module;
+    private String requestType;
+    private String userId;
+    private Date requestTime;
+    private String url;
+    private Object requestData;
+    private String trackingType;
+    private String referrer;
+    private String eventType;
+    private String eventName;
+    private String userIP;
+    private String userIpAdress;
+    private String userAgent;
+    private String result;
+    private String networkType;
+    private String requestId;
+    private String parentRequestId;
+    private String duration;
+    private String endTime;
+    private String language;
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Date getRequestTime() {
+        return requestTime;
+    }
+
+    public void setRequestTime(Date requestTime) {
+        this.requestTime = requestTime;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Object getRequestData() {
+        return requestData;
+    }
+
+    public void setRequestData(Object requestData) {
+        this.requestData = requestData;
+    }
+
+    public String getTrackingType() {
+        return trackingType;
+    }
+
+    public void setTrackingType(String trackingType) {
+        this.trackingType = trackingType;
+    }
+
+    public String getReferrer() {
+        return referrer;
+    }
+
+    public void setReferrer(String referrer) {
+        this.referrer = referrer;
+    }
+
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getEventName() {
+        return eventName;
+    }
+
+    public void setEventName(String eventName) {
+        this.eventName = eventName;
+    }
+
+    public String getUserIP() {
+        return userIP;
+    }
+
+    public void setUserIP(String userIP) {
+        this.userIP = userIP;
+    }
+
+    public String getUserIpAdress() {
+        return userIpAdress;
+    }
+
+    public void setUserIpAdress(String userIpAdress) {
+        this.userIpAdress = userIpAdress;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public String getNetworkType() {
+        return networkType;
+    }
+
+    public void setNetworkType(String networkType) {
+        this.networkType = networkType;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public String getParentRequestId() {
+        return parentRequestId;
+    }
+
+    public void setParentRequestId(String parentRequestId) {
+        this.parentRequestId = parentRequestId;
+    }
+
+    public String getDuration() {
+        return duration;
+    }
+
+    public void setDuration(String duration) {
+        this.duration = duration;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+}

src/main/java/com/fdkankan/tracking/entit/TrackingEntity.java

@@ -1,186 +1,26 @@
 package com.fdkankan.tracking.entit;
 
-import java.util.Date;
-
 public class TrackingEntity {
-    private String traceId;
-    private String requestType;
-    private String channel;
-    private String userId;
-    private Date requestTime;
-    private String requestUrl;
-    private String requestData;
-    private String TrackingType;
-    private String srcPageUrl;
-    private String actionType;
-    private String actionName;
-    private String userIP;
-    private String userIpAdress;
-    private String userAgent;
-    private String result;
-    private String networkType;
-    private String requestId;
-    private String parentRequestId;
-    private String duration;
-    private String endTime;
-
-    public String getTraceId() {
-        return traceId;
-    }
-
-    public void setTraceId(String traceId) {
-        this.traceId = traceId;
-    }
-
-    public String getRequestType() {
-        return requestType;
-    }
-
-    public void setRequestType(String requestType) {
-        this.requestType = requestType;
-    }
-
-    public String getChannel() {
-        return channel;
-    }
-
-    public void setChannel(String channel) {
-        this.channel = channel;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public Date getRequestTime() {
-        return requestTime;
-    }
-
-    public void setRequestTime(Date requestTime) {
-        this.requestTime = requestTime;
-    }
-
-    public String getRequestUrl() {
-        return requestUrl;
-    }
-
-    public void setRequestUrl(String requestUrl) {
-        this.requestUrl = requestUrl;
-    }
-
-    public String getRequestData() {
-        return requestData;
-    }
-
-    public void setRequestData(String requestData) {
-        this.requestData = requestData;
-    }
-
-    public String getTrackingType() {
-        return TrackingType;
-    }
-
-    public void setTrackingType(String trackingType) {
-        TrackingType = trackingType;
-    }
-
-    public String getSrcPageUrl() {
-        return srcPageUrl;
-    }
-
-    public void setSrcPageUrl(String srcPageUrl) {
-        this.srcPageUrl = srcPageUrl;
-    }
-
-    public String getActionType() {
-        return actionType;
-    }
-
-    public void setActionType(String actionType) {
-        this.actionType = actionType;
-    }
-
-    public String getActionName() {
-        return actionName;
-    }
-
-    public void setActionName(String actionName) {
-        this.actionName = actionName;
-    }
-
-    public String getUserIP() {
-        return userIP;
-    }
-
-    public void setUserIP(String userIP) {
-        this.userIP = userIP;
-    }
-
-    public String getUserIpAdress() {
-        return userIpAdress;
-    }
-
-    public void setUserIpAdress(String userIpAdress) {
-        this.userIpAdress = userIpAdress;
-    }
-
-    public String getUserAgent() {
-        return userAgent;
-    }
-
-    public void setUserAgent(String userAgent) {
-        this.userAgent = userAgent;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public String getNetworkType() {
-        return networkType;
-    }
+    /**
+     * 打点类型
+     */
+    private String type;
 
-    public void setNetworkType(String networkType) {
-        this.networkType = networkType;
-    }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public String getParentRequestId() {
-        return parentRequestId;
-    }
-
-    public void setParentRequestId(String parentRequestId) {
-        this.parentRequestId = parentRequestId;
-    }
+    private TrackingBody trackingBody;
 
-    public String getDuration() {
-        return duration;
+    public String getType() {
+        return type;
     }
 
-    public void setDuration(String duration) {
-        this.duration = duration;
+    public void setType(String type) {
+        this.type = type;
     }
 
-    public String getEndTime() {
-        return endTime;
+    public TrackingBody getTrackingBody() {
+        return trackingBody;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
+    public void setTrackingBody(TrackingBody trackingBody) {
+        this.trackingBody = trackingBody;
     }
 }

src/main/resources/logback-spring.xml

@@ -61,13 +61,6 @@
 		</filter>
 	</appender>
 
-	<appender name="ASYNC_DEBUG_FILE" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
-		<discardingThreshold>0</discardingThreshold>
-		<queueSize>2048</queueSize>
-		<includeCallerData>true</includeCallerData>
-		<appender-ref ref="DEBUG_FILE"/>
-	</appender>
-
 	<!-- 时间滚动输出 level为 INFO 日志 -->
 	<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<!-- 正在记录的日志文件的路径及文件名 -->
@@ -96,13 +89,6 @@
 		</filter>
 	</appender>
 
-	<appender name="ASYNC_INFO_FILE" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
-		<discardingThreshold>0</discardingThreshold>
-		<queueSize>2048</queueSize>
-		<includeCallerData>true</includeCallerData>
-		<appender-ref ref="INFO_FILE"/>
-	</appender>
-
 	<!-- 时间滚动输出 level为 WARN 日志 -->
 	<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<!-- 正在记录的日志文件的路径及文件名 -->
@@ -130,14 +116,6 @@
 		</filter>
 	</appender>
 
-	<appender name="ASYNC_WARN_FILE" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
-		<discardingThreshold>0</discardingThreshold>
-		<queueSize>2048</queueSize>
-		<includeCallerData>true</includeCallerData>
-		<appender-ref ref="WARN_FILE"/>
-	</appender>
-
-
 	<!-- 时间滚动输出 level为 ERROR 日志 -->
 	<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<!-- 正在记录的日志文件的路径及文件名 -->
@@ -165,13 +143,6 @@
 		</filter>
 	</appender>
 
-	<appender name="ASYNC_ERROR_FILE" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
-		<discardingThreshold>0</discardingThreshold>
-		<queueSize>2048</queueSize>
-		<includeCallerData>true</includeCallerData>
-		<appender-ref ref="ERROR_FILE"/>
-	</appender>
-
 	<appender name="PROGRAM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<!-- 正在记录的日志文件的路径及文件名 -->
 		<file>${log.path}/program/log_program.log</file>
@@ -228,34 +199,6 @@
 			<appender-ref ref="VISIT_FILE"/>
 	</logger>
 
-	<appender name="FEIGN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<!-- 正在记录的日志文件的路径及文件名 -->
-		<file>${log.path}/visit/log_feign.log</file>
-		<!--日志文件输出格式 -->
-		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} %L - %msg%n</pattern>
-			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
-		</encoder>
-		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/feign/log-feign-%d{yyyy-MM-dd}.%i.log
-			</fileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
-		</rollingPolicy>
-		<!-- 此日志文件只记录ERROR级别的 -->
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-	</appender>
-	<logger name="feignVisitLog" level="INFO" additivity="true">
-			<appender-ref ref="FEIGN_FILE"/>
-	</logger>
-
 	<!-- <logger>用来设置某一个包或者具体的某一个类的日志打印级别、 以及指定<appender>。<logger>仅有一个name属性， 一个可选的level和一个可选的addtivity属性。 name:用来指定受此logger约束的某一个包或者具体的某一个类。 level:用来设置打印级别，大小写无关：TRACE,
 		DEBUG, INFO, WARN, ERROR, ALL 和 OFF， 还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。 如果未设置此属性，那么当前logger将会继承上级的级别。 addtivity:是否向上级logger传递打印信息。默认是true。 -->
 	<!--<logger name="org.springframework.web" level="info"/> -->
@@ -265,10 +208,10 @@
 
 	<root level="info">
 		<appender-ref ref="CONSOLE" />
-		<appender-ref ref="ASYNC_DEBUG_FILE" />
-		<appender-ref ref="ASYNC_INFO_FILE" />
-		<appender-ref ref="ASYNC_WARN_FILE" />
-		<appender-ref ref="ASYNC_ERROR_FILE" />
+		<appender-ref ref="DEBUG_FILE" />
+		<appender-ref ref="INFO_FILE" />
+		<appender-ref ref="WARN_FILE" />
+		<appender-ref ref="ERROR_FILE" />
 	</root>
 
 	<!--生产环境:输出到文件 -->