改造

pom.xml

@@ -17,13 +17,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-            <version>2.3.12.RELEASE</version>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-elasticsearch</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>-->
+<!--            <version>2.3.12.RELEASE</version>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-web</artifactId>

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

@@ -1,7 +1,10 @@
 package com.fdkankan.tracking.bean;
 
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class TrackingBody {
 
     private String appId;
@@ -28,187 +31,4 @@ public class TrackingBody {
     private String language;
     private String type;
 
-    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 getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    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 getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    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;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getUrlParam() {
-        return urlParam;
-    }
-
-    public void setUrlParam(String urlParam) {
-        this.urlParam = urlParam;
-    }
-
-    public String getReferrerParam() {
-        return referrerParam;
-    }
-
-    public void setReferrerParam(String referrerParam) {
-        this.referrerParam = referrerParam;
-    }
 }

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

@@ -1,31 +1,31 @@
-package com.fdkankan.tracking.config;
-
-import org.apache.http.HttpHost;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class EsConfig {
-
-    @Value("${es.host}")
-    private String host;
-    @Value("${es.port}")
-    private int port;
-    @Value("${es.scheme}")
-    private String scheme;
-
-    //把方法返回的对象交予spring容器管理
-    @Bean
-    public RestHighLevelClient restHighLevelClient(){
-        HttpHost httpHost=new HttpHost(host,port,scheme);
-        RestClientBuilder restClientBuilder = RestClient.builder(httpHost);
-        RestHighLevelClient restHighLevelClient = new RestHighLevelClient(restClientBuilder);
-        return restHighLevelClient;
-    }
-
-}
+//package com.fdkankan.tracking.config;
+//
+//import org.apache.http.HttpHost;
+//import org.elasticsearch.client.RestClient;
+//import org.elasticsearch.client.RestClientBuilder;
+//import org.elasticsearch.client.RestHighLevelClient;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Configuration
+//public class EsConfig {
+//
+//    @Value("${es.host}")
+//    private String host;
+//    @Value("${es.port}")
+//    private int port;
+//    @Value("${es.scheme}")
+//    private String scheme;
+//
+//    //把方法返回的对象交予spring容器管理
+//    @Bean
+//    public RestHighLevelClient restHighLevelClient(){
+//        HttpHost httpHost=new HttpHost(host,port,scheme);
+//        RestClientBuilder restClientBuilder = RestClient.builder(httpHost);
+//        RestHighLevelClient restHighLevelClient = new RestHighLevelClient(restClientBuilder);
+//        return restHighLevelClient;
+//    }
+//
+//}

src/main/java/com/fdkankan/tracking/controller/TrackingController.java

@@ -1,8 +1,7 @@
 package com.fdkankan.tracking.controller;
 
-import com.fdkankan.tracking.utils.EsUtil;
-import com.fdkankan.tracking.vo.TrackingParamVo;
 import com.fdkankan.tracking.service.TrackingService;
+import com.fdkankan.tracking.vo.TrackingParamVo;
 import com.fdkankan.web.controller.BaseController;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +18,8 @@ public class TrackingController extends BaseController {
 
     @Autowired
     private TrackingService trackingService;
-    @Autowired
-    private EsUtil esUtil;
+//    @Autowired
+//    private EsUtil esUtil;
 
 
 //    @RequestMapping("save")
@@ -49,10 +48,10 @@ public class TrackingController extends BaseController {
         return trackingService.saveLog(param, request);
     }
 
-    @PostMapping("/createIndex")
-    public ResultData createIndex(String index) throws IOException {
-        esUtil.createIndex(index, null);
-        return ResultData.ok();
-    }
+//    @PostMapping("/createIndex")
+//    public ResultData createIndex(String index) throws IOException {
+//        esUtil.createIndex(index, null);
+//        return ResultData.ok();
+//    }
 
 }

src/main/java/com/fdkankan/tracking/service/impl/TrackingServiceImpl.java

@@ -2,8 +2,10 @@ package com.fdkankan.tracking.service.impl;
 
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.fdkankan.elasticsearch.service.DocumentService;
 import com.fdkankan.tracking.bean.TrackingBody;
 import com.fdkankan.tracking.utils.EsUtil;
 import com.fdkankan.tracking.vo.TrackingParamVo;
@@ -11,6 +13,7 @@ import com.fdkankan.tracking.service.TrackingService;
 import com.fdkankan.tracking.utils.IpUtils;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.rest.RestStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +55,10 @@ public class TrackingServiceImpl implements TrackingService {
 //        }
 //    }
 
+//    @Autowired
+//    private EsUtil esUtil;
     @Autowired
-    private EsUtil esUtil;
+    private DocumentService documentService;
 
 
     @Override
@@ -80,8 +85,8 @@ public class TrackingServiceImpl implements TrackingService {
         }
 
         String index = trackingBody.getAppId().split("-")[0];
-        esUtil.insert(trackingBody, index, null);
+        RestStatus restStatus = documentService.addDocument(index, null, null, JSON.toJSONString(trackingBody));
 
-        return ResultData.ok();
+        return ResultData.ok(restStatus.getStatus());
     }
 }

src/main/java/com/fdkankan/tracking/utils/EsUtil.java

@@ -132,7 +132,7 @@ public class EsUtil {
         request.id(id);
         request.timeout(TimeValue.timeValueSeconds(1));
         //将数据放入请求 json
-        request.source(object, XContentType.JSON);
+        request.source(JSON.toJSONString(object), XContentType.JSON);
         //客户端发送请求
         IndexResponse response = restHighLevelClient.index(request, RequestOptions.DEFAULT);
         log.info("添加数据成功 索引为: {}, response 状态: {}, id为: {}",index,response.status().getStatus(), response.getId());

src/main/java/com/fdkankan/tracking/vo/TrackingParamVo.java

@@ -1,7 +1,9 @@
 package com.fdkankan.tracking.vo;
 
 import com.fdkankan.tracking.bean.TrackingBody;
+import lombok.Data;
 
+@Data
 public class TrackingParamVo {
     /**
      * 打点类型
@@ -9,20 +11,4 @@ public class TrackingParamVo {
     private String type;
 
     private TrackingBody payload;
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public TrackingBody getPayload() {
-        return payload;
-    }
-
-    public void setPayload(TrackingBody payload) {
-        this.payload = payload;
-    }
 }

src/main/resources/bootstrap-test.yml

@@ -9,15 +9,18 @@ spring:
         file-extension: yaml
         namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
+#          - data-id: common-db-config.yaml
+#            group: DEFAULT_GROUP
+#            refresh: true
+#
+#          - data-id: common-redis-config.yaml
+#            group: DEFAULT_GROUP
+#            refresh: true
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-config.yaml
+          - data-id: elasticsearch-config.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery: