Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tianao-analysis/src/main/resources/application-prod.yml
xiahailong 2 years ago
parent
commit
0361ed67a9

+ 11 - 0
es-track-common/src/main/java/cn/com/taiji/constants/EsIndexConstants.java

@@ -0,0 +1,11 @@
+package cn.com.taiji.constants;
+
+/**
+ * @author chenfangchao
+ * @title: EsIndexConstants
+ * @projectName es-track-analysis
+ * @description: TODO
+ * @date 2023/2/6 10:54 AM
+ */
+public class EsIndexConstants {
+}

+ 1 - 0
pom.xml

@@ -10,6 +10,7 @@
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>es-track-common</module>
+        <module>tianao-analysis</module>
     </modules>
 
     <properties>

+ 27 - 0
tianao-analysis/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <artifactId>es-track-analysis</artifactId>
+        <groupId>cn.com.taiji</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>tianao-analysis</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.taiji</groupId>
+            <artifactId>es-track-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>

+ 18 - 0
tianao-analysis/src/main/java/cn/com/taiji/TianaoAnalySisApplication.java

@@ -0,0 +1,18 @@
+package cn.com.taiji;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author chenfangchao
+ * @title: TianaoAnalySisApplication
+ * @projectName es-track-analysis
+ * @description: TODO
+ * @date 2023/2/6 10:51 AM
+ */
+@SpringBootApplication
+public class TianaoAnalySisApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(TianaoAnalySisApplication.class,args);
+    }
+}

es-track-common/src/main/resources/application-prod.yml → tianao-analysis/src/main/resources/application-prod.yml


+ 3 - 0
es-track-common/src/main/resources/application.yml

@@ -1,3 +1,6 @@
+server:
+  port: 8081
+
 taiji:
   elasticsearch.rest:
     uris: 120.25.233.10:9200

+ 10 - 0
tianao-analysis/target/classes/application.yml

@@ -0,0 +1,10 @@
+server:
+  port: 8081
+
+taiji:
+  elasticsearch.rest:
+    uris: 120.25.233.10:9200
+    username: elastic       #如果你设置了基于x-pack的验证就要填写账号和密码
+    password: root@2022!       #没有则不用配置
+    connection-timeout: 100 #连接超时
+    max-connection: 100  #最大连接数

BIN
tianao-analysis/target/classes/cn/com/taiji/TianaoAnalySisApplication.class