Merge branch 'vip'

austin-stream/src/main/java/com/java3y/austin/stream/constants/AustinFlinkConstant.java

@@ -14,15 +14,15 @@ public class AustinFlinkConstant {
      */
     public static final String GROUP_ID = "austinLogGroup";
     public static final String TOPIC_NAME = "austinTraceLog";
-    public static final String BROKER = "ip:port";
+    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_IP = "austin.redis";
-    public static final String REDIS_PORT = "port";
+    public static final String REDIS_PORT = "5003";
     public static final String REDIS_PASSWORD = "austin";
 
 

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 如果你需要使用apollo，将application.properties配置文件的 apollo.enabled 改为true
-         *  TODO 【optional】
+        System.setProperty("apollo.config-service", "http://austin.apollo.config:5001");
-         * 如果你需要动态配置
-         * 1、启动apollo
-         * 2、将application.properties配置文件的 austin.apollo.enabled 改为true
-         * 3、下方的property替换真实的ip和port
-         */
-        System.setProperty("apollo.config-service", "http://ip:port");
         SpringApplication.run(AustinApplication.class, args);
     }
 }

austin-web/src/main/resources/application.properties

@@ -3,22 +3,22 @@
 # TODO please replace 【must】 config value
 
 # todo [database] ip/port/username/password 【must】
-austin.database.ip=localhost
+austin.database.ip=austin.mysql
-austin.database.port=3306
+austin.database.port=5004
 austin.database.username=root
 austin.database.password=root123_A
 
 # todo [redis] ip/port/password【must】
-austin.redis.ip=localhost
+austin.redis.ip=austin.redis
 austin.redis.port=5003
 austin.redis.password=austin
 
 # TODO  choose : kafka/eventBus/rocketMq/rabbitMq, default  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.ip=austin.kafka
-austin.kafka.port=
+austin.kafka.port=9092
 
 # todo [rocketMq] 【optional】, if austin.mq.pipeline=rocketMq【must】
 austin.rocketmq.nameserver.ip=
@@ -38,7 +38,7 @@ austin.apollo.enabled=false
 austin.nacos.enabled=false
 
 # todo [grayLog] ip 【optional】
-austin.grayLog.ip=127.0.0.1
+austin.grayLog.ip=austin.graylog
 
 ##################### system properties #####################
 server.shutdown=graceful