From ec8fa48c3f8279efa27fbd6456b5c0351da5a4fb Mon Sep 17 00:00:00 2001 From: Giorno Date: Mon, 18 Jul 2022 23:52:09 +0800 Subject: [PATCH 01/12] feat:rocketmq --- .../common/constant/CommonConstant.java | 18 +++++++ .../receiver/rocket/RocketMqReceiver.java | 36 +++++++++++++ austin-support/pom.xml | 5 ++ .../mq/rocket/RocketSendMqServiceImpl.java | 50 +++++++++++++++++++ .../src/main/resources/application.properties | 7 +++ pom.xml | 7 ++- 6 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java create mode 100644 austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java create mode 100644 austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java diff --git a/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java b/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java new file mode 100644 index 0000000..ffc9088 --- /dev/null +++ b/austin-common/src/main/java/com/java3y/austin/common/constant/CommonConstant.java @@ -0,0 +1,18 @@ +package com.java3y.austin.common.constant; + +public class CommonConstant { + public final static String PERIOD = "."; + public final static String COMMA = ","; + public final static String COLON = ":"; + public final static String SEMICOLON = ";"; + public final static String POUND = "#"; + public final static String SLASH = "/"; + public final static String BACKSLASH = "\\"; + public final static String EMPTY_STRING = ""; + // + public final static String ONE = "1"; + public final static String ZERO = "0"; + public final static String MINUS_ONE = "-1"; + public final static String YES = "Y"; + public final static String NO = "N"; +} \ No newline at end of file diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java new file mode 100644 index 0000000..c8d7625 --- /dev/null +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java @@ -0,0 +1,36 @@ +package com.java3y.austin.handler.receiver.rocket; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.java3y.austin.common.domain.TaskInfo; +import com.java3y.austin.handler.receiver.service.ConsumeService; +import com.java3y.austin.support.constans.MessageQueuePipeline; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.annotation.SelectorType; +import org.apache.rocketmq.spring.core.RocketMQListener; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @program: austin + * @description: + * @author: Giorno + * @create: 2022-07-18 + **/ +@Component +@RocketMQMessageListener(topic = "${austin.business.topic.name}", + consumerGroup = "${austin.rocketmq.consumer.group}", + selectorType = SelectorType.TAG, selectorExpression = "${austin.business.tagId.value}") +@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) +public class RocketMqReceiver implements RocketMQListener { + @Resource + private ConsumeService consumeService; + + @Override + public void onMessage(String message) { + if (StrUtil.isBlank(message)) return; + consumeService.consume2Send(JSON.parseArray(message, TaskInfo.class)); + } +} diff --git a/austin-support/pom.xml b/austin-support/pom.xml index 96ae2e0..3f9a4ec 100644 --- a/austin-support/pom.xml +++ b/austin-support/pom.xml @@ -63,6 +63,11 @@ spring-kafka + + org.apache.rocketmq + rocketmq-spring-boot-starter + + org.springframework.boot spring-boot-starter-data-redis diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java new file mode 100644 index 0000000..c6709ad --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java @@ -0,0 +1,50 @@ +package com.java3y.austin.support.mq.rocket; + +import cn.hutool.core.util.StrUtil; +import com.java3y.austin.support.constans.MessageQueuePipeline; +import com.java3y.austin.support.mq.SendMqService; +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.core.RocketMQTemplate; +import org.apache.rocketmq.spring.support.RocketMQHeaders; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.messaging.support.MessageBuilder; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @program: austin + * @description: + * @author: Giorno + * @create: 2022-07-16 + **/ +@Slf4j +@Service +@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) +public class RocketSendMqServiceImpl implements SendMqService { + @Resource + private RocketMQTemplate rocketMQTemplate; + @Value("${austin.business.topic.name}") + private String sendMessageTopic; + + @Override + public void send(String topic, String jsonValue, String tagId) { + if (StrUtil.isBlank(topic) || !sendMessageTopic.equals(topic)) { + log.error("RocketSendMqServiceImpl err:{}", topic); + return; + } + if (StrUtil.isBlank(tagId)) { + rocketMQTemplate.convertAndSend(topic, jsonValue); + return; + } + rocketMQTemplate.send(topic, MessageBuilder.withPayload(jsonValue) + .setHeader(RocketMQHeaders.TAGS, tagId) + .build()); + } + + @Override + public void send(String topic, String jsonValue) { + this.send(topic, jsonValue); + } +} diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index ced6182..9c507d1 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -59,6 +59,13 @@ spring.kafka.consumer.enable-auto-commit=true austin.business.tagId.key=kafka_tag_id austin.business.tagId.value=com.java3y.austin.3y +##################### rocket properties ##################### +rocketmq.name-server= +rocketmq.producer.group= +rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.retry-times-when-send-async-failed=3 +austin.rocketmq.consumer.group= + ##################### redis properties ##################### spring.redis.host=${austin-redis-ip} spring.redis.port=${austin-redis-port} diff --git a/pom.xml b/pom.xml index 49b1152..62b6fe2 100644 --- a/pom.xml +++ b/pom.xml @@ -153,6 +153,12 @@ ${flink.version} + + org.apache.rocketmq + rocketmq-spring-boot-starter + 2.1.0 + + com.github.binarywang @@ -191,5 +197,4 @@ - From 9fadc862a359cfc9049260667d194535f01a8afd Mon Sep 17 00:00:00 2001 From: Giorno Date: Thu, 21 Jul 2022 13:53:56 +0800 Subject: [PATCH 02/12] update:delete rocketmq --- .../receiver/rocket/RocketMqReceiver.java | 36 ------------- .../mq/rocket/RocketSendMqServiceImpl.java | 50 ------------------- 2 files changed, 86 deletions(-) delete mode 100644 austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java delete mode 100644 austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java deleted file mode 100644 index c8d7625..0000000 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocket/RocketMqReceiver.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.java3y.austin.handler.receiver.rocket; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.java3y.austin.common.domain.TaskInfo; -import com.java3y.austin.handler.receiver.service.ConsumeService; -import com.java3y.austin.support.constans.MessageQueuePipeline; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.apache.rocketmq.spring.annotation.SelectorType; -import org.apache.rocketmq.spring.core.RocketMQListener; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * @program: austin - * @description: - * @author: Giorno - * @create: 2022-07-18 - **/ -@Component -@RocketMQMessageListener(topic = "${austin.business.topic.name}", - consumerGroup = "${austin.rocketmq.consumer.group}", - selectorType = SelectorType.TAG, selectorExpression = "${austin.business.tagId.value}") -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) -public class RocketMqReceiver implements RocketMQListener { - @Resource - private ConsumeService consumeService; - - @Override - public void onMessage(String message) { - if (StrUtil.isBlank(message)) return; - consumeService.consume2Send(JSON.parseArray(message, TaskInfo.class)); - } -} diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java deleted file mode 100644 index c6709ad..0000000 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/rocket/RocketSendMqServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.java3y.austin.support.mq.rocket; - -import cn.hutool.core.util.StrUtil; -import com.java3y.austin.support.constans.MessageQueuePipeline; -import com.java3y.austin.support.mq.SendMqService; -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.spring.core.RocketMQTemplate; -import org.apache.rocketmq.spring.support.RocketMQHeaders; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.messaging.support.MessageBuilder; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * @program: austin - * @description: - * @author: Giorno - * @create: 2022-07-16 - **/ -@Slf4j -@Service -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) -public class RocketSendMqServiceImpl implements SendMqService { - @Resource - private RocketMQTemplate rocketMQTemplate; - @Value("${austin.business.topic.name}") - private String sendMessageTopic; - - @Override - public void send(String topic, String jsonValue, String tagId) { - if (StrUtil.isBlank(topic) || !sendMessageTopic.equals(topic)) { - log.error("RocketSendMqServiceImpl err:{}", topic); - return; - } - if (StrUtil.isBlank(tagId)) { - rocketMQTemplate.convertAndSend(topic, jsonValue); - return; - } - rocketMQTemplate.send(topic, MessageBuilder.withPayload(jsonValue) - .setHeader(RocketMQHeaders.TAGS, tagId) - .build()); - } - - @Override - public void send(String topic, String jsonValue) { - this.send(topic, jsonValue); - } -} From 113dc70ba0e2e8f72251e7e93d51af39aaa7c995 Mon Sep 17 00:00:00 2001 From: Giorno Date: Thu, 21 Jul 2022 18:58:26 +0800 Subject: [PATCH 03/12] feat:nacos --- austin-web/src/main/resources/bootstrap.yml | 18 ++ docker/nacos/cluster/docker-compose.yml | 75 +++++++ docker/nacos/single/docker-compose.yml | 25 +++ docker/nacos/sql/config.sql | 232 ++++++++++++++++++++ pom.xml | 7 + 5 files changed, 357 insertions(+) create mode 100644 austin-web/src/main/resources/bootstrap.yml create mode 100644 docker/nacos/cluster/docker-compose.yml create mode 100644 docker/nacos/single/docker-compose.yml create mode 100644 docker/nacos/sql/config.sql diff --git a/austin-web/src/main/resources/bootstrap.yml b/austin-web/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..26ffd13 --- /dev/null +++ b/austin-web/src/main/resources/bootstrap.yml @@ -0,0 +1,18 @@ +spring: + application: + name: + profiles: + active: + cloud: + nacos: + # 配置中心 + config: + server-addr: + username: + password: + namespace: ${spring.profiles.active} + file-extension: yaml + extension-configs: + - dataId: ${spring.profiles.active}.yaml + group: ${spring.profiles.active} + refresh: true \ No newline at end of file diff --git a/docker/nacos/cluster/docker-compose.yml b/docker/nacos/cluster/docker-compose.yml new file mode 100644 index 0000000..475088e --- /dev/null +++ b/docker/nacos/cluster/docker-compose.yml @@ -0,0 +1,75 @@ +version: "3" + +services: + nacos1: + container_name: nacos-server-1 + hostname: nacos-server01 + image: nacos/nacos-server + environment: + - MODE=cluster + - PREFER_HOST_MODE=hostname + - NACOS_SERVERS=nacos-server01:8848 nacos-server02:8848 nacos-server03:8848 + - SPRING_DATASOURCE_PLATFORM=mysql + - MYSQL_SERVICE_HOST=mysql + - MYSQL_SERVICE_PORT=3306 + - MYSQL_SERVICE_USER=root + - MYSQL_SERVICE_PASSWORD=123456 + - MYSQL_SERVICE_DB_NAME=nacos-db + - JVM_XMS=128m + - JVM_XMX=128m + - JVM_XMN=128m + volumes: + - /home/nacos/cluster-logs/nacos-server01:/home/nacos/logs + - /home/nacos/init.d:/home/nacos/init.d + ports: + - 8846:8848 + - 9555:9555 + restart: on-failure + + nacos2: + container_name: nacos-server-2 + hostname: nacos-server02 + image: nacos/nacos-server + environment: + - MODE=cluster + - PREFER_HOST_MODE=hostname + - NACOS_SERVERS=nacos-server01:8848 nacos-server02:8848 nacos-server03:8848 + - SPRING_DATASOURCE_PLATFORM=mysql + - MYSQL_SERVICE_HOST=mysql + - MYSQL_SERVICE_PORT=3306 + - MYSQL_SERVICE_USER=root + - MYSQL_SERVICE_PASSWORD=123456 + - MYSQL_SERVICE_DB_NAME=nacos-db + - JVM_XMS=128m + - JVM_XMX=128m + - JVM_XMN=128m + volumes: + - /home/nacos/cluster-logs/nacos-server02:/home/nacos/logs + - /home/nacos/init.d:/home/nacos/init.d + ports: + - 8847:8848 + restart: on-failure + + nacos3: + container_name: nacos-server-3 + hostname: nacos-server03 + image: nacos/nacos-server + environment: + - MODE=cluster + - PREFER_HOST_MODE=hostname + - NACOS_SERVERS=nacos-server01:8848 nacos-server02:8848 nacos-server03:8848 + - SPRING_DATASOURCE_PLATFORM=mysql + - MYSQL_SERVICE_HOST=mysql + - MYSQL_SERVICE_PORT=3306 + - MYSQL_SERVICE_USER=root + - MYSQL_SERVICE_PASSWORD=123456 + - MYSQL_SERVICE_DB_NAME=nacos-db + - JVM_XMS=128m + - JVM_XMX=128m + - JVM_XMN=128m + volumes: + - /home/nacos/cluster-logs/nacos-server03:/home/nacos/logs + - /home/nacos/init.d:/home/nacos/init.d + ports: + - 8848:8848 + restart: on-failure \ No newline at end of file diff --git a/docker/nacos/single/docker-compose.yml b/docker/nacos/single/docker-compose.yml new file mode 100644 index 0000000..f479c7f --- /dev/null +++ b/docker/nacos/single/docker-compose.yml @@ -0,0 +1,25 @@ +version: "3" + +services: + nacos1: + container_name: nacos-server + hostname: nacos-server + image: nacos/nacos-server + environment: + - MODE=standalone + - PREFER_HOST_MODE=hostname + - SPRING_DATASOURCE_PLATFORM=mysql + - MYSQL_SERVICE_HOST=mysql01 + - MYSQL_SERVICE_PORT=3306 + - MYSQL_SERVICE_USER=root + - MYSQL_SERVICE_PASSWORD=123456 + - MYSQL_SERVICE_DB_NAME=nacos-db + - JVM_XMS=128m + - JVM_XMX=128m + - JVM_XMN=128m + volumes: + - /home/nacos/cluster-logs/nacos-server01:/home/nacos/logs + - /home/nacos/init.d:/home/nacos/init.d + ports: + - 8848:8848 + restart: on-failure \ No newline at end of file diff --git a/docker/nacos/sql/config.sql b/docker/nacos/sql/config.sql new file mode 100644 index 0000000..0058260 --- /dev/null +++ b/docker/nacos/sql/config.sql @@ -0,0 +1,232 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = config_info */ +/******************************************/ +CREATE TABLE `config_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(255) DEFAULT NULL, + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL, + `c_use` varchar(64) DEFAULT NULL, + `effect` varchar(64) DEFAULT NULL, + `type` varchar(64) DEFAULT NULL, + `c_schema` text, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = config_info_aggr */ +/******************************************/ +CREATE TABLE `config_info_aggr` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(255) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = config_tags_relation */ +/******************************************/ +CREATE TABLE `config_tags_relation` +( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT, + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = group_capacity */ +/******************************************/ +CREATE TABLE `group_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = his_config_info */ +/******************************************/ +CREATE TABLE `his_config_info` +( + `id` bigint(64) unsigned NOT NULL, + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(255) NOT NULL, + `group_id` varchar(128) NOT NULL, + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL, + `md5` varchar(32) DEFAULT NULL, + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `src_user` text, + `src_ip` varchar(50) DEFAULT NULL, + `op_type` char(10) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = tenant_capacity */ +/******************************************/ +CREATE TABLE `tenant_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; + + +CREATE TABLE `tenant_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) default '' COMMENT 'tenant_id', + `tenant_name` varchar(128) default '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE `users` +( + `username` varchar(50) NOT NULL PRIMARY KEY, + `password` varchar(500) NOT NULL, + `enabled` boolean NOT NULL +); + +CREATE TABLE `roles` +( + `username` varchar(50) NOT NULL, + `role` varchar(50) NOT NULL, + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE +); + +CREATE TABLE `permissions` +( + `role` varchar(50) NOT NULL, + `resource` varchar(255) NOT NULL, + `action` varchar(8) NOT NULL, + UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); \ No newline at end of file diff --git a/pom.xml b/pom.xml index e69a5da..b558b4e 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,13 @@ 3.1.510 + + + com.alibaba.boot + nacos-config-spring-boot-starter + 0.2.1 + + com.ctrip.framework.apollo From 5445742a7ed3da693fe61fb8101e8d98da04c28a Mon Sep 17 00:00:00 2001 From: Giorno Date: Fri, 22 Jul 2022 15:39:17 +0800 Subject: [PATCH 04/12] feat:nacos --- .../java3y/austin/support/service/ConfigService.java | 4 ++-- .../support/service/impl/ConfigServiceImpl.java | 11 +++++++++++ austin-web/src/main/resources/application.properties | 4 ++++ pom.xml | 1 - 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java b/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java index 29b37f2..b73e09a 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java +++ b/austin-support/src/main/java/com/java3y/austin/support/service/ConfigService.java @@ -10,8 +10,8 @@ public interface ConfigService { /** * 读取配置 - * 1、当启动使用了apollo，优先读取apollo - * 2、当没有启动apollo，读取本地 local.properties 配置文件的内容 + * 1、当启动使用了apollo或者nacos，优先读取远程配置 + * 2、当没有启动远程配置，读取本地 local.properties 配置文件的内容 * @param key * @param defaultValue * @return diff --git a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java index 860e84e..509cac0 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java @@ -5,8 +5,10 @@ import cn.hutool.setting.dialect.Props; import com.ctrip.framework.apollo.Config; import com.java3y.austin.support.service.ConfigService; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.nio.charset.StandardCharsets; @@ -30,12 +32,21 @@ public class ConfigServiceImpl implements ConfigService { private Boolean enableApollo; @Value("${apollo.bootstrap.namespaces}") private String namespaces; + /** + * nacos配置 + */ + @Value("${austin.nacos.enabled}") + private Boolean enableNacos; + @Resource + private ConfigurableApplicationContext configurableApplicationContext; @Override public String getProperty(String key, String defaultValue) { if (enableApollo) { Config config = com.ctrip.framework.apollo.ConfigService.getConfig(namespaces.split(StrUtil.COMMA)[0]); return config.getProperty(key, defaultValue); + } else if (enableNacos) { + return configurableApplicationContext.getEnvironment().getProperty(key, defaultValue); } else { return props.getProperty(key, defaultValue); } diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index b0c7700..cc02ddb 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -128,6 +128,10 @@ app.id=austin apollo.bootstrap.enabled=${apollo.enabled} apollo.bootstrap.namespaces=boss.austin,dynamic-tp-apollo-dtp.yml +##################### nacos ##################### +austin.nacos.enabled=false + + ##################### httpUtils properties ##################### ok.http.connect-timeout=30 ok.http.keep-alive-duration=300 diff --git a/pom.xml b/pom.xml index b558b4e..8fca343 100644 --- a/pom.xml +++ b/pom.xml @@ -212,5 +212,4 @@ - From d29c4830a1a65fdc0fe6182424a283f93f286ff8 Mon Sep 17 00:00:00 2001 From: Giorno Date: Mon, 25 Jul 2022 16:43:02 +0800 Subject: [PATCH 05/12] fix:nacos docker-compose.yml --- docker/nacos/single/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nacos/single/docker-compose.yml b/docker/nacos/single/docker-compose.yml index f479c7f..ba713ed 100644 --- a/docker/nacos/single/docker-compose.yml +++ b/docker/nacos/single/docker-compose.yml @@ -9,7 +9,7 @@ services: - MODE=standalone - PREFER_HOST_MODE=hostname - SPRING_DATASOURCE_PLATFORM=mysql - - MYSQL_SERVICE_HOST=mysql01 + - MYSQL_SERVICE_HOST=mysql - MYSQL_SERVICE_PORT=3306 - MYSQL_SERVICE_USER=root - MYSQL_SERVICE_PASSWORD=123456 @@ -18,7 +18,7 @@ services: - JVM_XMX=128m - JVM_XMN=128m volumes: - - /home/nacos/cluster-logs/nacos-server01:/home/nacos/logs + - /home/nacos/single-logs/nacos-server:/home/nacos/logs - /home/nacos/init.d:/home/nacos/init.d ports: - 8848:8848 From 5200e1a4ea52201e8c498e3466759a75008e2c30 Mon Sep 17 00:00:00 2001 From: Giorno Date: Tue, 26 Jul 2022 11:32:54 +0800 Subject: [PATCH 06/12] fix:nacos DDL --- docker/nacos/sql/config.sql | 66 +++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/docker/nacos/sql/config.sql b/docker/nacos/sql/config.sql index 0058260..3c0de79 100644 --- a/docker/nacos/sql/config.sql +++ b/docker/nacos/sql/config.sql @@ -20,22 +20,23 @@ /******************************************/ CREATE TABLE `config_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(255) DEFAULT NULL, - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL, - `c_use` varchar(64) DEFAULT NULL, - `effect` varchar(64) DEFAULT NULL, - `type` varchar(64) DEFAULT NULL, - `c_schema` text, + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(255) DEFAULT NULL, + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL, + `c_use` varchar(64) DEFAULT NULL, + `effect` varchar(64) DEFAULT NULL, + `type` varchar(64) DEFAULT NULL, + `encrypted_data_key` varchar(255) DEFAULT NULL, + `c_schema` text, PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; @@ -147,23 +148,24 @@ CREATE TABLE `group_capacity` /******************************************/ CREATE TABLE `his_config_info` ( - `id` bigint(64) unsigned NOT NULL, - `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `data_id` varchar(255) NOT NULL, - `group_id` varchar(128) NOT NULL, - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL, - `md5` varchar(32) DEFAULT NULL, - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `src_user` text, - `src_ip` varchar(50) DEFAULT NULL, - `op_type` char(10) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `id` bigint(64) unsigned NOT NULL, + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(255) NOT NULL, + `group_id` varchar(128) NOT NULL, + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL, + `md5` varchar(32) DEFAULT NULL, + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `src_user` text, + `src_ip` varchar(50) DEFAULT NULL, + `op_type` char(10) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(255) DEFAULT NULL, PRIMARY KEY (`nid`), - KEY `idx_gmt_create` (`gmt_create`), - KEY `idx_gmt_modified` (`gmt_modified`), - KEY `idx_did` (`data_id`) + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; From 8318a4997dd0b09bb40059d5f35efa041620da0f Mon Sep 17 00:00:00 2001 From: 3y Date: Wed, 27 Jul 2022 21:04:29 +0800 Subject: [PATCH 07/12] sync branch --- .../api/impl/service/SendServiceImplTest.java | 78 +++++++++---------- .../stream/constants/AustinFlinkConstant.java | 2 +- .../src/main/resources/application.properties | 2 +- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java b/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java index 6e8e5cd..92a8a62 100644 --- a/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java +++ b/austin-service-api-impl/src/test/java/com/java3y/austin/service/api/impl/service/SendServiceImplTest.java @@ -48,48 +48,48 @@ class SendServiceImplTest { @Test void testSend() { - // params - final SendRequest sendRequest = new SendRequest("send", 1L, - new MessageParam("13711111111", new HashMap<>(), new HashMap<>())); - - // predict result - final ProcessContext processContext = new ProcessContext<>(sendRequest.getCode(), new SendTaskModel(), false, new BasicResultVO<>( - RespStatusEnum.SUCCESS, "data")); - final SendResponse expectedResult = new SendResponse(processContext.getResponse().getStatus(), processContext.getResponse().getMsg()); - - - // stub - Map templateConfig = new HashMap<>(4); - processTemplate.setProcessList(Arrays.asList(businessProcess)); - templateConfig.put(BusinessCode.COMMON_SEND.getCode(), processTemplate); - - processController.setTemplateConfig(templateConfig); - - - // Run the test - final SendResponse result = sendServiceImplUnderTest.send(sendRequest); - - // Verify the results - assertEquals(expectedResult, result); +// // params +// final SendRequest sendRequest = new SendRequest("send", 1L, +// new MessageParam("13711111111", new HashMap<>(), new HashMap<>())); +// +// // predict result +// final ProcessContext processContext = new ProcessContext<>(sendRequest.getCode(), new SendTaskModel(), false, new BasicResultVO<>( +// RespStatusEnum.SUCCESS, "data")); +// final SendResponse expectedResult = new SendResponse(processContext.getResponse().getStatus(), processContext.getResponse().getMsg()); +// +// +// // stub +// Map templateConfig = new HashMap<>(4); +// processTemplate.setProcessList(Arrays.asList(businessProcess)); +// templateConfig.put(BusinessCode.COMMON_SEND.getCode(), processTemplate); +// +// processController.setTemplateConfig(templateConfig); +// +// +// // Run the test +// final SendResponse result = sendServiceImplUnderTest.send(sendRequest); +// +// // Verify the results +// assertEquals(expectedResult, result); } @Test void testBatchSend() { - // Setup - final BatchSendRequest batchSendRequest = new BatchSendRequest("code", 0L, - Arrays.asList(new MessageParam("receiver", new HashMap<>(), new HashMap<>()))); - final SendResponse expectedResult = new SendResponse("status", "msg"); - - // Configure ProcessController.process(...). - final ProcessContext processContext = new ProcessContext<>("code", null, false, new BasicResultVO<>( - RespStatusEnum.SUCCESS, "data")); - when(processController.process(new ProcessContext<>("code", null, false, new BasicResultVO<>( - RespStatusEnum.SUCCESS, "data")))).thenReturn(processContext); - - // Run the test - final SendResponse result = sendServiceImplUnderTest.batchSend(batchSendRequest); - - // Verify the results - assertEquals(expectedResult, result); +// // Setup +// final BatchSendRequest batchSendRequest = new BatchSendRequest("code", 0L, +// Arrays.asList(new MessageParam("receiver", new HashMap<>(), new HashMap<>()))); +// final SendResponse expectedResult = new SendResponse("status", "msg"); +// +// // Configure ProcessController.process(...). +// final ProcessContext processContext = new ProcessContext<>("code", null, false, new BasicResultVO<>( +// RespStatusEnum.SUCCESS, "data")); +// when(processController.process(new ProcessContext<>("code", null, false, new BasicResultVO<>( +// RespStatusEnum.SUCCESS, "data")))).thenReturn(processContext); +// +// // Run the test +// final SendResponse result = sendServiceImplUnderTest.batchSend(batchSendRequest); +// +// // Verify the results +// assertEquals(expectedResult, result); } } 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..f26a476 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,7 +13,7 @@ public class AustinFlinkConstant { * （如果想要自己监听到所有的消息，改掉groupId） */ public static final String GROUP_ID = "austinLogGroup"; - public static final String TOPIC_NAME = "austinLog"; + public static final String TOPIC_NAME = "austinTraceLog"; public static final String BROKER = "ip:port"; /** diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index 4a1393a..42bf920 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -99,7 +99,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 From c958eda4a7f62df17d12f36e9c169d4d6e6ee940 Mon Sep 17 00:00:00 2001 From: Giorno Date: Thu, 28 Jul 2022 14:45:44 +0800 Subject: [PATCH 08/12] feat:NacosGetProperty --- austin-support/pom.xml | 5 ++ .../service/impl/ConfigServiceImpl.java | 11 ++-- .../austin/support/utils/NacosUtils.java | 58 +++++++++++++++++++ .../src/main/resources/application.properties | 7 ++- austin-web/src/main/resources/bootstrap.yml | 18 ------ 5 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java delete mode 100644 austin-web/src/main/resources/bootstrap.yml diff --git a/austin-support/pom.xml b/austin-support/pom.xml index 29a3619..f6dfb2b 100644 --- a/austin-support/pom.xml +++ b/austin-support/pom.xml @@ -103,6 +103,11 @@ org.springframework.amqp spring-rabbit + + + com.alibaba.boot + nacos-config-spring-boot-starter + diff --git a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java index 509cac0..61ec9b9 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.setting.dialect.Props; import com.ctrip.framework.apollo.Config; import com.java3y.austin.support.service.ConfigService; +import com.java3y.austin.support.utils.NacosUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ConfigurableApplicationContext; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.nio.charset.StandardCharsets; @@ -37,8 +37,9 @@ public class ConfigServiceImpl implements ConfigService { */ @Value("${austin.nacos.enabled}") private Boolean enableNacos; - @Resource - private ConfigurableApplicationContext configurableApplicationContext; + @Autowired + private NacosUtils nacosUtils; + @Override public String getProperty(String key, String defaultValue) { @@ -46,7 +47,7 @@ public class ConfigServiceImpl implements ConfigService { Config config = com.ctrip.framework.apollo.ConfigService.getConfig(namespaces.split(StrUtil.COMMA)[0]); return config.getProperty(key, defaultValue); } else if (enableNacos) { - return configurableApplicationContext.getEnvironment().getProperty(key, defaultValue); + return nacosUtils.getProperty(key); } else { return props.getProperty(key, defaultValue); } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java new file mode 100644 index 0000000..e6d8202 --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java @@ -0,0 +1,58 @@ +package com.java3y.austin.support.utils; + +import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.PropertyKeyConst; +import com.alibaba.nacos.api.exception.NacosException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.io.StringReader; +import java.util.Properties; + +/** + * @program: austin + * @description: + * @author: Giorno + * @create: 2022-07-28 + **/ +@Slf4j +@Component +public class NacosUtils { + @Value("${austin.nacos.server}") + private String nacosServer; + @Value("${austin.nacos.group}") + private String nacosGroup; + @Value("${austin.nacos.dataId}") + private String nacosDataId; + @Value("${austin.nacos.namespace}") + private String nacosNamespace; + private final Properties request = new Properties(); + private final Properties properties = new Properties(); + + public String getProperty(String key) { + try { + String property = this.getContext(); + if (StringUtils.hasText(property)) { + properties.load(new StringReader(property)); + } + } catch (Exception e) { + log.error("Nacos error:{}", e.getMessage()); + } + return properties.getProperty(key); + } + + private String getContext() { + String context = null; + try { + request.put(PropertyKeyConst.SERVER_ADDR, nacosServer); + request.put(PropertyKeyConst.NAMESPACE, nacosNamespace); + context = NacosFactory.createConfigService(request) + .getConfig(nacosDataId, nacosGroup, 5000); + } catch (NacosException e) { + log.error("Nacos error:{}", e.getMessage()); + } + return context; + } +} diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index cc02ddb..0d9d68b 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -129,8 +129,11 @@ apollo.bootstrap.enabled=${apollo.enabled} apollo.bootstrap.namespaces=boss.austin,dynamic-tp-apollo-dtp.yml ##################### nacos ##################### -austin.nacos.enabled=false - +austin.nacos.enabled=true +austin.nacos.server= +austin.nacos.dataId= +austin.nacos.group= +austin.nacos.namespace= ##################### httpUtils properties ##################### ok.http.connect-timeout=30 diff --git a/austin-web/src/main/resources/bootstrap.yml b/austin-web/src/main/resources/bootstrap.yml deleted file mode 100644 index 26ffd13..0000000 --- a/austin-web/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,18 +0,0 @@ -spring: - application: - name: - profiles: - active: - cloud: - nacos: - # 配置中心 - config: - server-addr: - username: - password: - namespace: ${spring.profiles.active} - file-extension: yaml - extension-configs: - - dataId: ${spring.profiles.active}.yaml - group: ${spring.profiles.active} - refresh: true \ No newline at end of file From 5a52aa1480bf4f3ea0541e2c61bebe721f4912ba Mon Sep 17 00:00:00 2001 From: Giorno Date: Thu, 28 Jul 2022 14:50:35 +0800 Subject: [PATCH 09/12] feat:del Redundant Config --- austin-web/src/main/resources/application.properties | 8 -------- 1 file changed, 8 deletions(-) diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index 0d9d68b..1dc06d6 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -84,14 +84,6 @@ spring.rabbitmq.virtual-host=/ austin.rabbitmq.topic.name=austinRabbit austin.rabbitmq.exchange.name=austin.point - -##################### rocket properties ##################### -rocketmq.name-server= -rocketmq.producer.group= -rocketmq.producer.send-message-timeout=3000 -rocketmq.producer.retry-times-when-send-async-failed=3 -austin.rocketmq.consumer.group= - ##################### redis properties ##################### spring.redis.host=${austin-redis-ip} spring.redis.port=${austin-redis-port} From 666cda6e93c6bacead68da51ec973162a4823e10 Mon Sep 17 00:00:00 2001 From: Giorno Date: Thu, 28 Jul 2022 17:41:27 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0getProperty?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/service/impl/ConfigServiceImpl.java | 2 +- .../com/java3y/austin/support/utils/NacosUtils.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java index 61ec9b9..c14a948 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/service/impl/ConfigServiceImpl.java @@ -47,7 +47,7 @@ public class ConfigServiceImpl implements ConfigService { Config config = com.ctrip.framework.apollo.ConfigService.getConfig(namespaces.split(StrUtil.COMMA)[0]); return config.getProperty(key, defaultValue); } else if (enableNacos) { - return nacosUtils.getProperty(key); + return nacosUtils.getProperty(key, defaultValue); } else { return props.getProperty(key, defaultValue); } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java index e6d8202..dc6a54a 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/NacosUtils.java @@ -1,9 +1,11 @@ package com.java3y.austin.support.utils; +import cn.hutool.core.util.StrUtil; import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.exception.NacosException; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -31,16 +33,17 @@ public class NacosUtils { private final Properties request = new Properties(); private final Properties properties = new Properties(); - public String getProperty(String key) { + public String getProperty(String key, String defaultValue) { try { String property = this.getContext(); if (StringUtils.hasText(property)) { properties.load(new StringReader(property)); } } catch (Exception e) { - log.error("Nacos error:{}", e.getMessage()); + log.error("Nacos error:{}", ExceptionUtils.getStackTrace(e)); } - return properties.getProperty(key); + String property = properties.getProperty(key); + return StrUtil.isBlank(property) ? defaultValue : property; } private String getContext() { @@ -51,7 +54,7 @@ public class NacosUtils { context = NacosFactory.createConfigService(request) .getConfig(nacosDataId, nacosGroup, 5000); } catch (NacosException e) { - log.error("Nacos error:{}", e.getMessage()); + log.error("Nacos error:{}", ExceptionUtils.getStackTrace(e)); } return context; } From c9b4bbe22b2588abe2565df03f5c6c7409c1741b Mon Sep 17 00:00:00 2001 From: 3y Date: Mon, 1 Aug 2022 19:55:41 +0800 Subject: [PATCH 11/12] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=202=E3=80=81=E5=A2=9E=E5=8A=A0Dockerfile?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../austin/support/dao/ChannelAccountDao.java | 37 +++++++++++ .../austin/support/domain/ChannelAccount.java | 61 +++++++++++++++++++ .../controller/ChannelAccountController.java | 51 ++++++++++++++++ .../web/service/ChannelAccountService.java | 34 +++++++++++ .../impl/ChannelAccountServiceImpl.java | 35 +++++++++++ docker/Dockerfile | 17 ++++++ sql/austin.sql | 49 ++++++++++++--- 7 files changed, 277 insertions(+), 7 deletions(-) create mode 100644 austin-support/src/main/java/com/java3y/austin/support/dao/ChannelAccountDao.java create mode 100644 austin-support/src/main/java/com/java3y/austin/support/domain/ChannelAccount.java create mode 100644 austin-web/src/main/java/com/java3y/austin/web/controller/ChannelAccountController.java create mode 100644 austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java create mode 100644 austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java create mode 100644 docker/Dockerfile diff --git a/austin-support/src/main/java/com/java3y/austin/support/dao/ChannelAccountDao.java b/austin-support/src/main/java/com/java3y/austin/support/dao/ChannelAccountDao.java new file mode 100644 index 0000000..442201a --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/dao/ChannelAccountDao.java @@ -0,0 +1,37 @@ +package com.java3y.austin.support.dao; + + +import com.java3y.austin.support.domain.ChannelAccount; +import com.java3y.austin.support.domain.MessageTemplate; +import com.java3y.austin.support.domain.SmsRecord; +import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +/** + * 渠道账号信息 Dao + * + * @author 3y + */ +public interface ChannelAccountDao extends CrudRepository { + + + /** + * 查询 列表（分页) + * + * @param deleted 0：未删除 1：删除 + * @param channelType 渠道值 + * @return + */ + List findAllByIsDeletedEqualsAndSendChannelEquals(Integer deleted, Integer channelType); + + + /** + * 统计未删除的条数 + * + * @param deleted + * @return + */ + Long countByIsDeletedEquals(Integer deleted); +} diff --git a/austin-support/src/main/java/com/java3y/austin/support/domain/ChannelAccount.java b/austin-support/src/main/java/com/java3y/austin/support/domain/ChannelAccount.java new file mode 100644 index 0000000..74fb731 --- /dev/null +++ b/austin-support/src/main/java/com/java3y/austin/support/domain/ChannelAccount.java @@ -0,0 +1,61 @@ +package com.java3y.austin.support.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +/** + * @author 3y + * 渠道账号信息 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Entity +public class ChannelAccount { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 账号名称 + */ + private String name; + + /** + * 发送渠道 + * 枚举值：com.java3y.austin.common.enums.ChannelType + */ + private Integer sendChannel; + + /** + * 账号配置 + */ + private String accountConfig; + + /** + * 是否删除 + * 0：未删除 + * 1：已删除 + */ + private Integer isDeleted; + + /** + * 创建时间 单位 s + */ + private Integer created; + + /** + * 更新时间 单位s + */ + private Integer updated; + +} diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/ChannelAccountController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/ChannelAccountController.java new file mode 100644 index 0000000..36ae4f0 --- /dev/null +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/ChannelAccountController.java @@ -0,0 +1,51 @@ +package com.java3y.austin.web.controller; + + +import com.java3y.austin.common.constant.AustinConstant; +import com.java3y.austin.common.vo.BasicResultVO; +import com.java3y.austin.support.dao.ChannelAccountDao; +import com.java3y.austin.support.domain.ChannelAccount; +import com.java3y.austin.support.domain.MessageTemplate; +import com.java3y.austin.web.service.ChannelAccountService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 渠道账号管理接口 + * + * @author 3y + */ +@Slf4j +@RestController +@RequestMapping("/account") +@Api("素材管理接口") +@CrossOrigin(origins = "http://localhost:3000", allowCredentials = "true", allowedHeaders = "*") +public class ChannelAccountController { + + @Autowired + private ChannelAccountService channelAccountService; + + + /** + * 如果Id存在，则修改 + * 如果Id不存在，则保存 + */ + @PostMapping("/save") + @ApiOperation("/保存数据") + public BasicResultVO saveOrUpdate(@RequestBody ChannelAccount channelAccount) { + return BasicResultVO.success(channelAccountService.save(channelAccount)); + } + + /** + * 根据渠道标识查询渠道账号相关的信息 + */ + @GetMapping("/query") + @ApiOperation("/保存数据") + public BasicResultVO query(Integer channelType) { + return BasicResultVO.success(channelAccountService.queryByChannelType(channelType)); + } + +} diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java b/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java new file mode 100644 index 0000000..616e729 --- /dev/null +++ b/austin-web/src/main/java/com/java3y/austin/web/service/ChannelAccountService.java @@ -0,0 +1,34 @@ +package com.java3y.austin.web.service; + + +import com.java3y.austin.common.vo.BasicResultVO; +import com.java3y.austin.support.domain.ChannelAccount; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * 渠道账号接口 + * + * @author 3y + */ +public interface ChannelAccountService { + + + /** + * 保存/修改渠道账号信息 + * + * @param channelAccount + * @return + */ + ChannelAccount save(ChannelAccount channelAccount); + + /** + * 根据渠道标识查询账号信息 + * + * @param channelType 渠道标识 + * @return + */ + List queryByChannelType(Integer channelType); + +} diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java new file mode 100644 index 0000000..20f5d90 --- /dev/null +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java @@ -0,0 +1,35 @@ +package com.java3y.austin.web.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.java3y.austin.common.constant.AustinConstant; +import com.java3y.austin.support.dao.ChannelAccountDao; +import com.java3y.austin.support.domain.ChannelAccount; +import com.java3y.austin.web.service.ChannelAccountService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author 3y + */ +@Service +public class ChannelAccountServiceImpl implements ChannelAccountService { + + @Autowired + private ChannelAccountDao channelAccountDao; + @Override + public ChannelAccount save(ChannelAccount channelAccount) { + if (channelAccount.getId() == null) { + channelAccount.setCreated(Math.toIntExact(DateUtil.currentSeconds())); + channelAccount.setIsDeleted(AustinConstant.FALSE); + } + channelAccount.setUpdated(Math.toIntExact(DateUtil.currentSeconds())); + return channelAccountDao.save(channelAccount); + } + + @Override + public List queryByChannelType(Integer channelType) { + return channelAccountDao.findAllByIsDeletedEqualsAndSendChannelEquals(AustinConstant.FALSE, channelType); + } +} diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..6834454 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,17 @@ +# 使用openjdk8的镜像 +FROM openjdk:8-jre + +ENV PARAMS="" + +# 设置工作目录 +WORKDIR /build +# 将jar包复制到容器中 +ADD ./austin-web-0.0.1-SNAPSHOT.jar ./austin.jar +# 暴露8080端口 +EXPOSE 8080 + +# 运行jar包 +ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS austin.jar $PARAMS"] + + +# docker run -e PARAMS="--austin-database-ip= --austin-database-port=3306 --austin-redis-ip= --austin-mq-pipeline=eventbus " -p 8080:8080 --name austin:1.0 diff --git a/sql/austin.sql b/sql/austin.sql index fef403c..7975658 100644 --- a/sql/austin.sql +++ b/sql/austin.sql @@ -1,6 +1,8 @@ -create database austin; +create +database austin; -use austin; +use +austin; CREATE TABLE `message_template` @@ -14,10 +16,10 @@ CREATE TABLE `message_template` `cron_crowd_path` varchar(500) COMMENT '定时发送人群的文件路径', `expect_push_time` varchar(100) COLLATE utf8mb4_unicode_ci COMMENT '期望发送时间：0:立即发送 定时任务以及周期任务:cron表达式', `id_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '消息的发送ID类型：10. userId 20.did 30.手机号 40.openId 50.email 60.企业微信userId', - `send_channel` tinyint(4) NOT NULL DEFAULT '0' COMMENT '消息发送渠道：10.IM 20.Push 30.短信 40.Email 50.公众号 60.小程序 70.企业微信', + `send_channel` tinyint(4) NOT NULL DEFAULT '0' COMMENT '消息发送渠道：10.IM 20.Push 30.短信 40.Email 50.公众号 60.小程序 70.企业微信 80.钉钉机器人 90.钉钉工作通知 100.企业微信机器人 110.飞书机器人 110. 飞书应用消息 ', `template_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '10.运营类 20.技术类接口调用', `msg_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '10.通知类消息 20.营销类消息 30.验证码类消息', - `shield_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '10.夜间不屏蔽 20.夜间屏蔽 30.夜间屏蔽(次日早上9点发送)', + `shield_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '10.夜间不屏蔽 20.夜间屏蔽 30.夜间屏蔽(次日早上9点发送)', `msg_content` varchar(600) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '消息内容 占位符用{$var}表示', `send_account` tinyint(4) NOT NULL DEFAULT '0' COMMENT '发送账号 一个渠道下可存在多个账号', `creator` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建者', @@ -59,12 +61,45 @@ CREATE TABLE `sms_record` DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT ='短信记录信息'; + +CREATE TABLE `channel_account` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '账号名称', + `send_channel` tinyint(4) NOT NULL DEFAULT '0' COMMENT '消息发送渠道：10.IM 20.Push 30.短信 40.Email 50.公众号 60.小程序 70.企业微信 80.钉钉机器人 90.钉钉工作通知 100.企业微信机器人 110.飞书机器人 110. 飞书应用消息 ', + `account_config` varchar(1024) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '账号配置', + `created` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `updated` int(11) NOT NULL DEFAULT '0' COMMENT '更新时间', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除：0.不删除 1.删除', + PRIMARY KEY (`id`), + KEY `idx_send_channel` (`send_channel`) +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci COMMENT ='渠道账号信息'; + + -- 实时类型 短信（无占位符） -INSERT INTO austin.message_template (id, name, audit_status, flow_id, msg_status, cron_task_id, cron_crowd_path, expect_push_time, id_type, send_channel, template_type, msg_type, msg_content, send_account, creator, updator, auditor, team, proposer, is_deleted, created, updated) VALUES (1, '买一送十活动', 10, '', 10, null, '', '', 30, 30, 20, 20, '{"content":"6666","url":"","title":""}', 10, 'Java3y', 'Java3y', '3y', '公众号Java3y', '三歪', 0, 1646274112, 1646275242); +INSERT INTO austin.message_template (id, name, audit_status, flow_id, msg_status, cron_task_id, cron_crowd_path, + expect_push_time, id_type, send_channel, template_type, msg_type, msg_content, + send_account, creator, updator, auditor, team, proposer, is_deleted, created, + updated) +VALUES (1, '买一送十活动', 10, '', 10, null, '', '', 30, 30, 20, 20, '{"content":"6666","url":"","title":""}', 10, 'Java3y', + 'Java3y', '3y', '公众号Java3y', '三歪', 0, 1646274112, 1646275242); -- 实时类型 邮件（无占位符） -INSERT INTO austin.message_template (id, name, audit_status, flow_id, msg_status, cron_task_id, cron_crowd_path, expect_push_time, id_type, send_channel, template_type, msg_type, msg_content, send_account, creator, updator, auditor, team, proposer, is_deleted, created, updated) VALUES (2, '校招信息', 10, '', 10, null, '', '', 50, 40, 20, 10, '{"content":"你已成功获取到offer","url":"","title":"招聘通知"}', 10, 'Java3y', 'Java3y', '3y', '公众号Java3y', '鸡蛋', 0, 1646274195, 1646274195); +INSERT INTO austin.message_template (id, name, audit_status, flow_id, msg_status, cron_task_id, cron_crowd_path, + expect_push_time, id_type, send_channel, template_type, msg_type, msg_content, + send_account, creator, updator, auditor, team, proposer, is_deleted, created, + updated) +VALUES (2, '校招信息', 10, '', 10, null, '', '', 50, 40, 20, 10, '{"content":"你已成功获取到offer","url":"","title":"招聘通知"}', 10, + 'Java3y', 'Java3y', '3y', '公众号Java3y', '鸡蛋', 0, 1646274195, 1646274195); -- 实时类型 短信（有占位符）占位符key 为 content -INSERT INTO austin.message_template (id, name, audit_status, flow_id, msg_status, cron_task_id, cron_crowd_path, expect_push_time, id_type, send_channel, template_type, msg_type, msg_content, send_account, creator, updator, auditor, team, proposer, is_deleted, created, updated) VALUES (3, '验证码通知', 10, '', 10, null, '', '', 30, 30, 20, 30, '{"content":"{$content}","url":"","title":""}', 10, 'Java3y', 'Java3y', '3y', '公众号Java3y', '孙悟空', 0, 1646275213, 1646275213); +INSERT INTO austin.message_template (id, name, audit_status, flow_id, msg_status, cron_task_id, cron_crowd_path, + expect_push_time, id_type, send_channel, template_type, msg_type, msg_content, + send_account, creator, updator, auditor, team, proposer, is_deleted, created, + updated) +VALUES (3, '验证码通知', 10, '', 10, null, '', '', 30, 30, 20, 30, '{"content":"{$content}","url":"","title":""}', 10, + 'Java3y', 'Java3y', '3y', '公众号Java3y', '孙悟空', 0, 1646275213, 1646275213); From 530001a0bf6bcd641a31a9d092242a41065bdece Mon Sep 17 00:00:00 2001 From: 3y Date: Wed, 3 Aug 2022 20:09:22 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9&&=E8=A7=84=E8=8C=83=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +- .../austin/cron/xxl/config/XxlJobConfig.java | 2 +- .../receiver/eventbus/EventBusReceiver.java | 2 +- .../handler/receiver/kafka/Receiver.java | 2 +- .../handler/receiver/kafka/ReceiverStart.java | 2 +- .../rocketmq/RocketMqBizReceiver.java | 4 +- .../rocketmq/RocketMqRecallReceiver.java | 4 +- .../eventbus/EventBusSendMqServiceImpl.java | 2 +- .../mq/kafka/KafkaSendMqServiceImpl.java | 2 +- .../mq/rabbit/RabbitSendMqServiceImpl.java | 2 +- .../rocketmq/RocketMqSendMqServiceImpl.java | 2 +- .../java3y/austin/support/utils/LogUtils.java | 21 ++--- .../com/java3y/austin/AustinApplication.java | 2 +- .../src/main/resources/application.properties | 88 +++++++++---------- docker/Dockerfile | 2 +- 15 files changed, 70 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 2c7d5c0..18b2d62 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,9 @@ austin项目**核心流程**：`austin-api`接收到发送消息请求，直接 **3**、执行`sql`文件夹下的`austin.sql`创建对应的表以及插入测试数据 -**4**、如果配置`austin-mq-pipeline=kafka`，需要填写`application.properties`中`austin-kafka`对应的`ip`/`port`信息 +**4**、如果配置`austin.mq.pipeline=kafka`，需要填写`application.properties`中`austin.kafka`对应的`ip`/`port`信息 -**5**、填写`application.properties`中`austin-redis`对应的`ip`/`port`信息 +**5**、填写`application.properties`中`austin.redis`对应的`ip`/`port`信息 **6**、检查消息队列topic：`austin.business.topic.name`(我的topicName为：austinBusiness) @@ -100,9 +100,9 @@ curl -XPOST "127.0.0.1:8080/send" -H 'Content-Type: application/json' -d '{"co **12**、正常使用**数据管理**(查看实时数据链路下发)需要将`austin-stream`的`jar`包上传至`Flink`，根据[部署文档](INSTALL.md)启动Flink。在打`jar`包前需要填写`com.java3y.austin.stream.constants.AustinFlinkConstant`中的`redis`和`kafka`的`ip/port`（注：日志的topic在`application.properties`中的`austin.business.log.topic.name`。如果没有该topic，需要提前创建，并使用Kafka作为消息队列实现) -**13**、正常使用**定时任务**需要部署`xxl-job`，根据[部署文档](INSTALL.md)启动xxl的调度中心，并在`application.properteis`中填写 `austin-xxl-job-ip`和`austin-xxl-job-port` +**13**、正常使用**定时任务**需要部署`xxl-job`，根据[部署文档](INSTALL.md)启动xxl的调度中心，并在`application.properteis`中填写 `austin.xxl.job.ip`和`austin.xxl.job.port` -**14**、正常使用**分布式日志采集**需要部署`graylog`，根据[部署文档](INSTALL.md)启动`graylog`，并在`application.properteis`中填写 `austin-grayLog-ip` +**14**、正常使用**分布式日志采集**需要部署`graylog`，根据[部署文档](INSTALL.md)启动`graylog`，并在`application.properteis`中填写 `austin.grayLog.ip` **14**、正常使用**系统监控**需要部署`promethus`和`grafana`，根据[部署文档](INSTALL.md)配置`grafana`图表 diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java index 981abf9..6286868 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; */ @Slf4j @Configuration -@ConditionalOnProperty(name = "xxl-job.enabled",havingValue = "true") +@ConditionalOnProperty(name = "austin.xxl.job.enabled",havingValue = "true") public class XxlJobConfig { @Value("${xxl.job.admin.addresses}") diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/eventbus/EventBusReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/eventbus/EventBusReceiver.java index fdde8e7..e996361 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/eventbus/EventBusReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/eventbus/EventBusReceiver.java @@ -16,7 +16,7 @@ import java.util.List; * @author 3y */ @Component -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.EVENT_BUS) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.EVENT_BUS) public class EventBusReceiver implements EventBusListener { @Autowired diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java index c29a1cf..b9c41d4 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java @@ -36,7 +36,7 @@ import java.util.Optional; @Slf4j @Component @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.KAFKA) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.KAFKA) public class Receiver { @Autowired private ConsumeService consumeService; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java index 01887ae..49bd953 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/ReceiverStart.java @@ -31,7 +31,7 @@ import java.util.Optional; * @date 2021/12/4 */ @Service -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.KAFKA) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.KAFKA) @Slf4j public class ReceiverStart { diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java index 92e4efb..c0755a6 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java @@ -21,9 +21,9 @@ import java.util.List; * create date: 2022/7/16 */ @Component -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) @RocketMQMessageListener(topic = "${austin.business.topic.name}", - consumerGroup = "${austin-rocketmq-biz-consumer-group}", + consumerGroup = "${austin.rocketmq.biz.consumer.group}", selectorType = SelectorType.TAG, selectorExpression = "${austin.business.tagId.value}" ) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java index aebacd0..66eeb31 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java @@ -19,9 +19,9 @@ import org.springframework.stereotype.Component; * create date: 2022/7/16 */ @Component -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) @RocketMQMessageListener(topic = "${austin.business.recall.topic.name}", - consumerGroup = "${austin-rocketmq-recall-consumer-group}", + consumerGroup = "${austin.rocketmq.recall.consumer.group}", selectorType = SelectorType.TAG, selectorExpression = "${austin.business.tagId.value}" ) diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java index 38d5152..5162178 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.EVENT_BUS) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.EVENT_BUS) public class EventBusSendMqServiceImpl implements SendMqService { private EventBus eventBus = new EventBus(); diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/kafka/KafkaSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/kafka/KafkaSendMqServiceImpl.java index 8f0398b..d8b62d5 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/kafka/KafkaSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/kafka/KafkaSendMqServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; */ @Slf4j @Service -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.KAFKA) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.KAFKA) public class KafkaSendMqServiceImpl implements SendMqService { @Autowired diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java index 661f4b7..6e4057b 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/rabbit/RabbitSendMqServiceImpl.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.RABBIT_MQ) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.RABBIT_MQ) public class RabbitSendMqServiceImpl implements SendMqService { @Autowired diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java index 3749ee9..7caa3ea 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/rocketmq/RocketMqSendMqServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@ConditionalOnProperty(name = "austin-mq-pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) +@ConditionalOnProperty(name = "austin.mq.pipeline", havingValue = MessageQueuePipeline.ROCKET_MQ) public class RocketMqSendMqServiceImpl implements SendMqService { @Autowired diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java index 1b542d1..6172227 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.LogParam; -import com.java3y.austin.support.constans.MessageQueuePipeline; +import com.java3y.austin.support.mq.SendMqService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -22,11 +22,8 @@ import org.springframework.stereotype.Component; @Component public class LogUtils extends CustomLogListener { - @Value("${austin-mq-pipeline}") - private String mqPipeline; - @Autowired - private KafkaTemplate kafkaTemplate; + private SendMqService sendMqService; @Value("${austin.business.log.topic.name}") private String topicName; @@ -54,15 +51,13 @@ public class LogUtils extends CustomLogListener { anchorInfo.setTimestamp(System.currentTimeMillis()); String message = JSON.toJSONString(anchorInfo); log.info(message); - if (MessageQueuePipeline.KAFKA.equals(mqPipeline)) { - try { - kafkaTemplate.send(topicName, message); - } catch (Exception e) { - log.error("LogUtils#print kafka fail! e:{},params:{}", Throwables.getStackTraceAsString(e) - , JSON.toJSONString(anchorInfo)); - } - } + try { + sendMqService.send(topicName, message); + } catch (Exception e) { + log.error("LogUtils#print send mq fail! e:{},params:{}", Throwables.getStackTraceAsString(e) + , JSON.toJSONString(anchorInfo)); + } } /** 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..0cfc723 100644 --- a/austin-web/src/main/java/com/java3y/austin/AustinApplication.java +++ b/austin-web/src/main/java/com/java3y/austin/AustinApplication.java @@ -15,7 +15,7 @@ public class AustinApplication { * TODO 【optional】 * 如果你需要动态配置 * 1、启动apollo - * 2、将application.properties配置文件的 apollo.enabled 改为true + * 2、将application.properties配置文件的 austin.apollo.enabled 改为true * 3、下方的property替换真实的ip和port */ System.setProperty("apollo.config-service", "http://ip:port"); diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties index 860c299..23d01a7 100644 --- a/austin-web/src/main/resources/application.properties +++ b/austin-web/src/main/resources/application.properties @@ -3,41 +3,42 @@ # TODO please replace 【must】 config value # todo [database] ip/port/username/password 【must】 -austin-database-ip=localhost -austin-database-port=3306 -austin-database-username=root -austin-database-password=root123_A +austin.database.ip=localhost +austin.database.port=3306 +austin.database.username=root +austin.database.password=root123_A # todo [redis] ip/port/password【must】 -austin-redis-ip=localhost -austin-redis-port=5003 -austin-redis-password=austin +austin.redis.ip=localhost +austin.redis.port=5003 +austin.redis.password=austin -# TODO choose : kafka/eventBus/rocketMq/rabbitMq -austin-mq-pipeline=eventBus +# TODO choose : kafka/eventBus/rocketMq/rabbitMq, default eventBus +austin.mq.pipeline=eventBus -# todo [kafka] ip/port【optional】, if austin-mq-pipeline=kafka 【must】 -austin-kafka-ip= -austin-kafka-port= +# todo [kafka] ip/port【optional】, if austin.mq.pipeline=kafka 【must】 +austin.kafka.ip= +austin.kafka.port= -# todo [rocketMq] 【optional】, if austin-mq-pipeline=rocketMq【must】 -austin-rocketmq-nameserver-ip= -austin-rocketmq-nameserver-port= +# 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】 -austin-rabbitmq-ip= -austin-rabbitmq-port= +# todo [rabbitMq] 【optional】, if austin.mq.pipeline=rabbitMq【must】 +austin.rabbitmq.ip= +austin.rabbitmq.port= -# todo [xxl-job] switch/ip/port/【optional】 -xxl-job.enabled=false -austin-xxl-job-ip=127.0.0.1 -austin-xxl-job-port=6767 +# 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 [apollo] switch 【optional】 -apollo.enabled=false +# 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】 -austin-grayLog-ip=127.0.0.1 +austin.grayLog.ip=127.0.0.1 ##################### system properties ##################### server.shutdown=graceful @@ -45,13 +46,13 @@ server.shutdown=graceful ##################### database properties ##################### # 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.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 ##################### -spring.kafka.bootstrap-servers=${austin-kafka-ip}:${austin-kafka-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 @@ -62,18 +63,18 @@ spring.kafka.consumer.enable-auto-commit=true ##################### rocketmq properties ##################### -rocketmq.name-server=${austin-rocketmq-nameserver-ip}:${austin-rocketmq-nameserver-port} +rocketmq.name-server=${austin.rocketmq.nameserver.ip}:${austin.rocketmq.nameserver.port} rocketmq.producer.group=unique-producer-group -austin-rocketmq-biz-consumer-group=unique-biz-consumer-group -austin-rocketmq-recall-consumer-group=unique-recall-consumer-group +austin.rocketmq.biz.consumer.group=unique-biz-consumer-group +austin.rocketmq.recall.consumer.group=unique-recall-consumer-group ##################### Rabbit properties ##################### #RabbitMq所在服务器IP -spring.rabbitmq.host=${austin-rabbitmq-ip} +spring.rabbitmq.host=${austin.rabbitmq.ip} #连接端口号 -spring.rabbitmq.port=${austin-rabbitmq-port} +spring.rabbitmq.port=${austin.rabbitmq.port} server.port=8080 spring.application.name=cl @@ -90,16 +91,16 @@ austin.rabbitmq.topic.name=austinRabbit austin.rabbitmq.exchange.name=austin.point ##################### redis properties ##################### -spring.redis.host=${austin-redis-ip} -spring.redis.port=${austin-redis-port} -spring.redis.password=${austin-redis-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.recall.topic.name=austinRecall austin.business.recall.group.name=recallGroupId austin.business.log.topic.name=austinTraceLog -austin.business.graylog.ip=${austin-grayLog-ip} +austin.business.graylog.ip=${austin.grayLog.ip} # TODO kafka tag filter,if you need, replace tagIdValue ,eg:com.java3y.austin.yyy austin.business.tagId.key=kafka_tag_id @@ -109,7 +110,7 @@ austin.business.tagId.value=com.java3y.austin.3y austin.business.upload.crowd.path=/Users/3y/temp ##################### xxl properties ##################### -xxl.job.admin.addresses=http://${austin-xxl-job-ip}:${austin-xxl-job-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 @@ -122,15 +123,14 @@ xxl.job.accessToken= ##################### apollo ##################### app.id=austin -apollo.bootstrap.enabled=${apollo.enabled} +apollo.bootstrap.enabled=${austin.apollo.enabled} apollo.bootstrap.namespaces=boss.austin,dynamic-tp-apollo-dtp.yml ##################### nacos ##################### -austin.nacos.enabled=true austin.nacos.server= -austin.nacos.dataId= -austin.nacos.group= -austin.nacos.namespace= +austin.nacos.dataId=austin +austin.nacos.group=DEFAULT_GROUP +austin.nacos.namespace=9537c674-f3a6-4203-b286-ef0c36bfacb2 ##################### httpUtils properties ##################### ok.http.connect-timeout=30 diff --git a/docker/Dockerfile b/docker/Dockerfile index 6834454..c815681 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,4 +14,4 @@ EXPOSE 8080 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS austin.jar $PARAMS"] -# docker run -e PARAMS="--austin-database-ip= --austin-database-port=3306 --austin-redis-ip= --austin-mq-pipeline=eventbus " -p 8080:8080 --name austin:1.0 +# docker run -e PARAMS="--austin.database.ip= --austin.database.port=3306 --austin.redis.ip= --austin.mq.pipeline=eventbus " -p 8080:8080 --name austin:1.0