dsx 2 年之前
父节点
当前提交
b9486690c6

+ 35 - 0
.gitignore

@@ -0,0 +1,35 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+/**/target/

+ 33 - 20
pom.xml

@@ -17,36 +17,49 @@
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <version>2.2.7.RELEASE</version>
-        </dependency>
 
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.79</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <version>2.3.12.RELEASE</version>
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>2.2.7.RELEASE</version>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common-web</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacv</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacpp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacv-platform</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>joinery</groupId>
+                    <artifactId>jave</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.aliyun</groupId>
+                    <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.aliyun</groupId>
+                    <artifactId>aliyun-java-sdk-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>3.14.4</version>
-        </dependency>
     </dependencies>
 
     <build>
+        <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

+ 8 - 4
src/main/java/com/fdkankan/tracking/controller/TrackingController.java

@@ -1,10 +1,11 @@
 package com.fdkankan.tracking.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.tracking.entit.TrackingBody;
-import com.fdkankan.tracking.entit.TrackingEntity;
+import com.fdkankan.tracking.entity.TrackingBody;
+import com.fdkankan.tracking.entity.TrackingEntity;
 import com.fdkankan.tracking.service.TrackingService;
 import com.fdkankan.tracking.utils.IpUtils;
+import com.fdkankan.web.response.ResultData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,10 +28,10 @@ public class TrackingController {
 
 
     @RequestMapping("save")
-    public void saveLog(@RequestBody TrackingEntity entity, HttpServletRequest request){
+    public ResultData saveLog(@RequestBody TrackingEntity entity, HttpServletRequest request){
         TrackingBody trackingBody = entity.getPayload();
         if(ObjectUtils.isEmpty(trackingBody)){
-            return;
+            return ResultData.ok();
         }
         trackingBody.setUserAgent(request.getHeader("user-agent"));
         trackingBody.setUserIP(IpUtils.getIPAddress(request));
@@ -43,5 +44,8 @@ public class TrackingController {
         }
         log.info("收到打点请求:{}", JSONObject.toJSONString(entity));
         trackingService.save(entity);
+
+        return ResultData.ok();
     }
+
 }

+ 1 - 1
src/main/java/com/fdkankan/tracking/entit/TrackingBody.java

@@ -1,4 +1,4 @@
-package com.fdkankan.tracking.entit;
+package com.fdkankan.tracking.entity;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/fdkankan/tracking/entit/TrackingEntity.java

@@ -1,4 +1,4 @@
-package com.fdkankan.tracking.entit;
+package com.fdkankan.tracking.entity;
 
 public class TrackingEntity {
     /**

+ 2 - 2
src/main/java/com/fdkankan/tracking/service/TrackingService.java

@@ -2,8 +2,8 @@ package com.fdkankan.tracking.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fdkankan.tracking.entit.TrackingBody;
-import com.fdkankan.tracking.entit.TrackingEntity;
+import com.fdkankan.tracking.entity.TrackingBody;
+import com.fdkankan.tracking.entity.TrackingEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

+ 20 - 18
src/main/resources/bootstrap-test.yml

@@ -3,27 +3,29 @@ spring:
     name: 4dkankan-tracking
   cloud:
     nacos:
+      server-addr: 120.24.144.164:8848
+      namespace: 4dkankan-v4-test
       config:
-        server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-tracking.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
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-        metadata:
-          management:
-            context-path: ${server.servlet.context-path}/actuator
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS
+        namespace: ${spring.cloud.nacos.namespace}
+
+
+
+
+
+
+