diff --git a/README.md b/README.md index 65bcecd..3e48559 100644 --- a/README.md +++ b/README.md @@ -233,8 +233,9 @@ austin项目**强依赖**`MySQL`/`Redis`/(**大概需要2G内存**),**弱依 - [x] 测试环境docker-compose完成接入MySQL/Redis/Flink/xxl-job/Kafka - [x] 在线演示第一版发布 - [x] 数据仓库模块完成 +- [x] 邮件支持附件推送,短信支持指定账号和AUTO推送,access_token存储至Redis - [ ] 总体架构已完成,持续做基础建设和优化代码 -**近期更新时间**:2023年1月29号 +**近期更新时间**:2023年2月28号 -**近期更新功能**:数据仓库模块`austin-data-house`调试成功 \ No newline at end of file +**近期更新功能**:access_token存储到Redis,短信支持指定账号和AUTO推送,邮件支持附件推送 \ No newline at end of file diff --git a/austin-web/src/main/resources/application-dev.properties b/austin-web/src/main/resources/application-dev.properties index 302ea86..ae16400 100644 --- a/austin-web/src/main/resources/application-dev.properties +++ b/austin-web/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ -# TODO please replace 【must】 config value -# TODO please replace 【must】 config value -# TODO please replace 【must】 config value +# TODO please replace [must] config value +# TODO please replace [must] config value +# TODO please replace [must] config value server.port=8080 -# todo [database] ip/port/username/password 【must】 +# todo [database] ip/port/username/password [must] austin.database.ip=austin.mysql austin.database.port=5004 austin.database.username=root austin.database.password=root123_A -# todo [redis] ip/port/password【must】 +# todo [redis] ip/port/password[must] austin.redis.ip=austin.redis austin.redis.port=5003 austin.redis.password=austin @@ -17,31 +17,29 @@ austin.redis.password=austin # TODO choose : kafka/eventBus/rocketMq/rabbitMq, default eventBus austin.mq.pipeline=eventBus -# todo [kafka] ip/port【optional】, if austin.mq.pipeline=kafka 【must】 +# todo [kafka] ip/port[optional], if austin.mq.pipeline=kafka [must] austin.kafka.ip=austin.kafka austin.kafka.port=9092 -# todo [rocketMq] 【optional】, if austin.mq.pipeline=rocketMq【must】 +# todo [rocketMq] [optional], if austin.mq.pipeline=rocketMq[must] austin.rocketmq.nameserver.ip= austin.rocketmq.nameserver.port= -# todo [rabbitMq] 【optional】, if austin.mq.pipeline=rabbitMq【must】 +# todo [rabbitMq] [optional], if austin.mq.pipeline=rabbitMq[must] austin.rabbitmq.ip= austin.rabbitmq.port= -# todo [xxl-job] switch 【optional】, if austin.xxl.job.enabled=true 【must】 +# todo [xxl-job] switch [optional], if austin.xxl.job.enabled=true [must] austin.xxl.job.enabled=false austin.xxl.job.ip=127.0.0.1 austin.xxl.job.port=6767 -# todo choose: apollo/nacos switch 【optional】 ,if apollo and nacos both false, use local.properties +# todo choose: apollo/nacos switch [optional] ,if apollo and nacos both false, use local.properties austin.apollo.enabled=false austin.nacos.enabled=false -# todo [grayLog] ip 【optional】 +# todo [grayLog] ip [optional] austin.grayLog.ip=austin.graylog -# TODO if windows os and need upload file to send message ,replace path !【optional】 -austin.business.upload.crowd.path=/Users/3y/temp - - +# TODO if windows os and need upload file to send message ,replace path ![optional] +austin.business.upload.crowd.path=/Users/3y/temp \ No newline at end of file diff --git a/austin-web/src/main/resources/application-test.properties b/austin-web/src/main/resources/application-test.properties index 412df38..5ff5cc2 100644 --- a/austin-web/src/main/resources/application-test.properties +++ b/austin-web/src/main/resources/application-test.properties @@ -1,6 +1,6 @@ -# TODO please replace 【must】 config value -# TODO please replace 【must】 config value -# TODO please replace 【must】 config value +# TODO please replace [must] config value +# TODO please replace [must] config value +# TODO please replace [must] config value server.port=7777 # docker mysql @@ -17,34 +17,34 @@ austin.redis.password=austin # TODO choose : kafka/eventBus/rocketMq/rabbitMq, default eventBus austin.mq.pipeline=kafka -# todo [kafka] ip/port【optional】, if austin.mq.pipeline=kafka 【must】 +# todo [kafka] ip/port[optional], if austin.mq.pipeline=kafka [must] austin.kafka.ip=austin-kafka austin.kafka.port=9092 -# todo [rocketMq] 【optional】, if austin.mq.pipeline=rocketMq【must】 +# todo [rocketMq] [optional], if austin.mq.pipeline=rocketMq[must] austin.rocketmq.nameserver.ip= austin.rocketmq.nameserver.port= -# todo [rabbitMq] 【optional】, if austin.mq.pipeline=rabbitMq【must】 +# todo [rabbitMq] [optional], if austin.mq.pipeline=rabbitMq[must] austin.rabbitmq.ip= austin.rabbitmq.port= -# todo [xxl-job] switch 【optional】, if austin.xxl.job.enabled=true 【must】 +# todo [xxl-job] switch [optional], if austin.xxl.job.enabled=true [must] austin.xxl.job.enabled=true austin.xxl.job.ip=austin-xxl-job austin.xxl.job.port=8080 -# todo choose: apollo/nacos switch 【optional】 ,if apollo and nacos both false, use local.properties +# todo choose: apollo/nacos switch [optional] ,if apollo and nacos both false, use local.properties austin.apollo.enabled=false austin.nacos.enabled=false -# todo [grayLog] ip 【optional】 +# todo [grayLog] ip [optional] austin.grayLog.ip=austin.graylog -# TODO if windows os and need upload file to send message ,replace path !【optional】 +# TODO if windows os and need upload file to send message ,replace path ![optional] austin.business.upload.crowd.path=/Users/3y/temp -# TODO if [login use officialAccount] switch 【optional】, if austin.login.official.account.enable=true 【must】 +# TODO if [login use officialAccount] switch [optional], if austin.login.official.account.enable=true [must] austin.login.official.account.enable=true austin.login.official.account.appId=wx27f83ca10e06b325 austin.login.official.account.secret=203299484df873a18621d076db46fa99 diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index 1147b5e..75475cb 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -3,7 +3,7 @@ spring.application.name=austin ########################################## database start ########################################## # 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.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