From ec8fa48c3f8279efa27fbd6456b5c0351da5a4fb Mon Sep 17 00:00:00 2001 From: Giorno Date: Mon, 18 Jul 2022 23:52:09 +0800 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 c958eda4a7f62df17d12f36e9c169d4d6e6ee940 Mon Sep 17 00:00:00 2001 From: Giorno Date: Thu, 28 Jul 2022 14:45:44 +0800 Subject: [PATCH 7/9] 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 8/9] 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 9/9] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0getProperty=E9=BB=98?= =?UTF-8?q?=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; }