From 8a27c4cc99051c7e86c0ef2f96bb0a367bed6e5c Mon Sep 17 00:00:00 2001 From: 3y Date: Wed, 16 Feb 2022 22:24:25 +0800 Subject: [PATCH] update README.md and application.properties --- README.md | 12 ++--- .../com/java3y/austin/AustinApplication.java | 2 +- .../src/main/resources/application.properties | 51 ++++++++++++------- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 1dc8323..75ec42e 100644 --- a/README.md +++ b/README.md @@ -54,19 +54,19 @@ austin项目**核心流程**：`austin-api`接收到发送消息请求，直接 **1**、austin使用的MySQL版本**5.7x**。如果目前使用的MySQL版本8.0，注意改变`pom.xml`所依赖的版本 -**2**、适配`application.properties`的配置信息(`spring.datasource`) +**2**、填写`application.properties`中`austin-database`对应的`ip/port/username/password`信息 -**3**、执行`sql`文件夹下的`austin.sql`创建对应的表 +**3**、执行`sql`文件夹下的`austin.sql`创建对应的表以及插入测试数据 -**4**、填写Kafka配置的`bootstrap-servers`地址和端口以及对应的`topicName` +**4**、填写`application.properties`中`austin-kafka`对应的`ip`/`port`信息 -**5**、填写Redis的`host`、`port`和`password` +**5**、填写`application.properties`中`austin-redis`对应的`ip`/`port`信息 -**6**、填写apollo的`appid`/`namespace` +**6**、检查`apollo`的`app.id`/`apollo.bootstrap.namespaces`，检查创建的消息队列topic：`austin.business.topic.name` **7**、以上配置信息都在`application.properties`文件中修改。 -**8**、由于使用了Apollo且我是在云服务器上安装的，我这边会直接跳过`metaserver`服务发现，在`AustinApplication`需要配置对应的apollo地址 +**8**、由于使用了Apollo且我是在云服务器上安装的，我这边会直接跳过`metaserver`服务发现，在`AustinApplication`需要配置对应的apollo地址(注意端口!) **9**、目前短信和邮件账号的信息都配置在**apollo**，配置的示例参照`com.java3y.austin.support.utils#getAccount`中的注释 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 62de5f6..7aa37a3 100644 --- a/austin-web/src/main/java/com/java3y/austin/AustinApplication.java +++ b/austin-web/src/main/java/com/java3y/austin/AustinApplication.java @@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class AustinApplication { public static void main(String[] args) { - // TODO apollo的地址. + // TODO apollo的ip/port【must】 System.setProperty("apollo.config-service", "http://ip:7000"); SpringApplication.run(AustinApplication.class, args); } diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index d952ded..dcd77a9 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -1,18 +1,38 @@ -# TODO please replace ${var} !! -# TODO please replace ${var} !! -# TODO please replace ${var} !! +# TODO please replace 【must】 config value +# 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= + +# todo [kafka] ip/port【must】 +austin-kafka-ip= +austin-kafka-port= + +# todo [redis] ip/port/password【must】 +austin-redis-ip= +austin-redis-port= +austin-redis-password= + +# todo [xxl-job] ip/port【optional】 +austin-xxl-job-ip= +austin-xxl-job-port= + +# todo [grayLog] ip【optional】 +austin-grayLog-ip= ##################### database properties ##################### -# notice:mysql version 5.7x !!! todo ip port username password -spring.datasource.url=jdbc:mysql://${ip}:${port}/austin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull -spring.datasource.username=${username} -spring.datasource.password=${password} +# notice:mysql version 5.7x !!! +spring.datasource.url=jdbc:mysql://${austin-database-ip}:${austin-database-port}/austin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull +spring.datasource.username=${austin-database-username} +spring.datasource.password=${austin-database-password} spring.datasource.driver-class-name=com.mysql.jdbc.Driver ##################### kafka properties ##################### -# todo ip port -spring.kafka.bootstrap-servers=${ip}:${port} +spring.kafka.bootstrap-servers=${austin-kafka-ip}:${austin-kafka-port} spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer @@ -22,23 +42,20 @@ spring.kafka.consumer.auto-commit-interval=1000 spring.kafka.consumer.enable-auto-commit=true ##################### redis properties ##################### -# todo ip port password -spring.redis.host=${ip} -spring.redis.port=${port} -spring.redis.password=${password} +spring.redis.host=${austin-redis-ip} +spring.redis.port=${austin-redis-port} +spring.redis.password=${austin-redis-password} ##################### business properties ##################### austin.business.topic.name=austinBusiness austin.business.log.topic.name=austinLog -# TODO if need graylog ,replace ip ! -austin.business.graylog.ip=120.48.13.113 +austin.business.graylog.ip=${austin-grayLog-ip} # TODO if windows os ,replace path ! austin.business.upload.crowd.path=/Users/3y/temp ##################### xxl properties ##################### -# todo ip port -xxl.job.admin.addresses=http://${ip}:${port}/xxl-job-admin +xxl.job.admin.addresses=http://${austin-xxl-job-ip}:${austin-xxl-job-port}/xxl-job-admin xxl.job.admin.username=admin xxl.job.admin.password=123456 xxl.job.executor.appname=austin