From 9effa312d64448634b0fd3cfd6212526168b4cd5 Mon Sep 17 00:00:00 2001
From: 3y <zhongfucheng_123@163.com>
Date: Wed, 20 Jul 2022 21:23:53 +0800
Subject: [PATCH] merge master into vip

---
 .../stream/constants/AustinFlinkConstant.java |  8 +++---
 .../com/java3y/austin/AustinApplication.java  | 10 ++-----
 .../src/main/resources/application.properties | 28 +++++++++----------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java b/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java
index 4a54da7..b41f5e6 100644
--- a/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java
+++ b/austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java
@@ -13,16 +13,16 @@ public class AustinFlinkConstant {
      * （如果想要自己监听到所有的消息，改掉groupId）
      */
     public static final String GROUP_ID = "austinLogGroup";
-    public static final String TOPIC_NAME = "austinLog";
-    public static final String BROKER = "ip:port";
+    public static final String TOPIC_NAME = "austinTraceLog";
+    public static final String BROKER = "austin.kafka";
 
     /**
      * redis 配置
      * TODO 使用前配置redis ip:port
      * (真实网络ip,这里不能用配置的hosts，看语雀文档得到真实ip)
      */
-    public static final String REDIS_IP = "ip";
-    public static final String REDIS_PORT = "port";
+    public static final String REDIS_IP = "austin.redis";
+    public static final String REDIS_PORT = "5003";
     public static final String REDIS_PASSWORD = "austin";
 
 
diff --git a/austin-web/src/main/java/com/java3y/austin/AustinApplication.java b/austin-web/src/main/java/com/java3y/austin/AustinApplication.java
index f3283be..2f92a06 100644
--- a/austin-web/src/main/java/com/java3y/austin/AustinApplication.java
+++ b/austin-web/src/main/java/com/java3y/austin/AustinApplication.java
@@ -11,14 +11,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class AustinApplication {
     public static void main(String[] args) {
 
-        /**
-         *  TODO 【optional】
-         * 如果你需要动态配置
-         * 1、启动apollo
-         * 2、将application.properties配置文件的 apollo.enabled 改为true
-         * 3、下方的property替换真实的ip和port
-         */
-        System.setProperty("apollo.config-service", "http://ip:port");
+        // TODO 如果你需要使用apollo，将application.properties配置文件的 apollo.enabled 改为true
+        System.setProperty("apollo.config-service", "http://austin.apollo.config:5001");
         SpringApplication.run(AustinApplication.class, args);
     }
 }
diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties
index 6284a79..10cf8b9 100644
--- a/austin-web/src/main/resources/application.properties
+++ b/austin-web/src/main/resources/application.properties
@@ -2,25 +2,23 @@
 # TODO please replace 【must】 config value
 # TODO please replace 【must】 config value
 
-
-
 # todo [database] ip/port/username/password 【must】
-austin-database-ip=
-austin-database-port=
-austin-database-username=
-austin-database-password=
+austin-database-ip=austin.mysql
+austin-database-port=5004
+austin-database-username=root
+austin-database-password=root123_A
 
 # todo [redis] ip/port/password【must】
-austin-redis-ip=
-austin-redis-port=
-austin-redis-password=
+austin-redis-ip=austin.redis
+austin-redis-port=5003
+austin-redis-password=austin
 
 # TODO  kafka/eventbus
-austin-mq-pipeline=eventbus
+austin-mq-pipeline=kafka
 
 # todo [kafka] ip/port【optional】, if austin-mq-pipeline=kafka 【must】
-austin-kafka-ip=
-austin-kafka-port=
+austin-kafka-ip=austin.kafka
+austin-kafka-port=9092
 
 # todo [rocketmq] 【optional】, if austin-mq-pipeline=rocketMq【must】
 austin-rocketmq-nameserver-ip=127.0.0.1
@@ -37,8 +35,8 @@ austin-xxl-job-port=6767
 # todo [apollo] switch 【optional】
 apollo.enabled=false
 
-# todo [grayLog] ip 【optional】
-austin-grayLog-ip=127.0.0.1
+# todo [grayLog] ip【optional】
+austin-grayLog-ip=austin.graylog
 
 ##################### system properties #####################
 server.shutdown=graceful
@@ -94,7 +92,7 @@ spring.redis.password=${austin-redis-password}
 austin.business.topic.name=austinBusiness
 austin.business.recall.topic.name=austinRecall
 austin.business.recall.group.name=recallGroupId
-austin.business.log.topic.name=austinLog
+austin.business.log.topic.name=austinTraceLog
 austin.business.graylog.ip=${austin-grayLog-ip}
 
 # TODO kafka tag filter,if you need, replace  tagIdValue ,eg:com.java3y.austin.yyy