diff --git a/README.md b/README.md index 94b83e460..5bad2a2d2 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ ---

- Spring Authorization Server 1.1.1 + Spring Authorization Server 1.1.2 Spring Boot 3.1.2 Spring Cloud 2022.0.4 Spring Cloud Alibaba 2022.0.0.0 - Spring Cloud Tencent 1.11.8-2022.0.1 + Spring Cloud Tencent 1.11.9-2022.0.1 Nacos 2.2.4

- Version 3.1.2.3 - Dante Engine 3.1.2.3 - Dante OSS 1.3.0 + Version 3.1.2.4 + Dante Engine 3.1.2.4 + Dante OSS 1.3.1 Java 17 License Apache 2.0 Total Visits @@ -41,7 +41,7 @@ ## 企业级技术中台微服务架构与服务能力开发平台 -Dante Cloud (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.1、Spring Boot 3.1.2、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.11.8-2022.0.1、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。 +Dante Cloud (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.2、Spring Boot 3.1.2、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.11.9-2022.0.1、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。 ## 定位 @@ -149,8 +149,8 @@ Dante Cloud (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和 | Spring Boot | 3.1.2 | | Spring Cloud | 2022.0.4 | | Spring Cloud Alibaba | 2022.0.0.0 | -| Spring Cloud Tencent | 1.11.8-2022.0.1 | -| Spring Authorization Server | 1.1.1 | +| Spring Cloud Tencent | 1.11.9-2022.0.1 | +| Spring Authorization Server | 1.1.2 | | Spring Boot Admin | 3.1.5 | | Nacos | 2.2.4 | | Sentinel | 1.8.6 | @@ -236,10 +236,11 @@ dante-cloud **Dante Cloud 技术解析高级文档（Cookbook） 专栏【试行】** -| 序号 | 文章标题 | 付费 | 说明 | 扫码阅读 | -|:--:|-------------------------------|:--:|---------------------------------------------------------------------------|--------------------------------------------------------------| -| 1 | Dante Cloud 及相关知识学习方法和学习路径的建议 | 免费 | | ![Dante Cloud 及相关知识学习方法和学习路径的建议](./readme/cookbook/0001.png) | -| 2 | OAuth 2 中的 Scope 与 Role 深度解析 | 付费 | 全网独家，深度解析 OAuth2 协议中和 Spring Security 生态各组件中 Scope 和 Role 概念与原理，以及在实战中的应用 | ![OAuth 2 中的 Scope 与 Role 深度解析](./readme/cookbook/0002.png) | +| 序号 | 文章标题 | 付费 | 说明 | 扫码阅读 | +|:--:|-------------------------------|:--:|---------------------------------------------------------------------------|------------------------------------------------------------------------| +| 1 | Dante Cloud 及相关知识学习方法和学习路径的建议 | 免费 | | ![Dante Cloud 及相关知识学习方法和学习路径的建议](./documents/readme/cookbook/0001.png) | +| 2 | OAuth 2 中的 Scope 与 Role 深度解析 | 付费 | 全网独家，深度解析 OAuth2 协议中和 Spring Security 生态各组件中 Scope 和 Role 概念与原理，以及在实战中的应用 | ![OAuth 2 中的 Scope 与 Role 深度解析](./documents/readme/cookbook/0002.png) | +| 2 | Spring Boot 3 之自动配置与注入顺序控制 | 付费 | Spring 生态重要知识点，掌握步入微服务的关键开关 | ![Spring Boot 3 之自动配置与注入顺序控制](./documents/readme/cookbook/0003.png) | ## [8]、授权协议 diff --git a/configurations/backup/alibaba/3.1.2.4/nacos_config_export_20230821174824.zip b/configurations/backup/alibaba/3.1.2.4/nacos_config_export_20230821174824.zip new file mode 100644 index 000000000..1ba5e2a42 Binary files /dev/null and b/configurations/backup/alibaba/3.1.2.4/nacos_config_export_20230821174824.zip differ diff --git a/configurations/backup/yamls/development/dante-cloud-environment.yaml b/configurations/backup/yamls/development/dante-cloud-environment.yaml index 2f37fa4f8..f3a72ba5a 100644 --- a/configurations/backup/yamls/development/dante-cloud-environment.yaml +++ b/configurations/backup/yamls/development/dante-cloud-environment.yaml @@ -5,14 +5,14 @@ herodotus: database: host: 127.0.0.1 port: 15432 - name: nherodotus + name: dante_cloud username: herodotus password: herodotus redis: host: 127.0.0.1 port: 16379 password: - database: 6 + database: 3 kafka: bootstrap-servers: 127.0.0.1:9092 switch: diff --git a/configurations/backup/yamls/docker/dante-cloud-environment.yaml b/configurations/backup/yamls/docker/dante-cloud-environment.yaml index 7e3519d9e..bfca55a85 100644 --- a/configurations/backup/yamls/docker/dante-cloud-environment.yaml +++ b/configurations/backup/yamls/docker/dante-cloud-environment.yaml @@ -5,14 +5,14 @@ herodotus: database: host: 127.0.0.1 port: 15432 - name: nherodotus + name: dante_cloud username: ENC(VQOHWBUv8CXJE50zyMEhCozzElZhNbJ8suinU7Ph651G1xl4QPweElrhtXP4V0T8) password: ENC(VQOHWBUv8CXJE50zyMEhCozzElZhNbJ8suinU7Ph651G1xl4QPweElrhtXP4V0T8) redis: host: 127.0.0.1 port: 6379 password: - database: 6 + database: 3 kafka: bootstrap-servers: 127.0.0.1:9092 switch: diff --git a/configurations/backup/yamls/logs/dante-logback-spring-mdc.xml b/configurations/backup/yamls/logs/dante-logback-spring-mdc.xml new file mode 100644 index 000000000..be81ec830 --- /dev/null +++ b/configurations/backup/yamls/logs/dante-logback-spring-mdc.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + ${CONSOLE_LOG_CHARSET} + + ${TRACE_ID_CONSOLE_LOG_PATTERN} + + + + + + + ${FILE_LOG_CHARSET} + + ${TRACE_ID_FILE_LOG_PATTERN} + + + ${LOG_FILE} + + ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-7} + + + + + + + 192.168.101.10:5044 + + {"service":"${SERVICE_NAME}"} + + + + + + + + + ${TRACE_ID_APM_LOG_PATTERN} + + + + + + + + + + \ No newline at end of file diff --git a/configurations/backup/yamls/logs/dante-logback-spring.xml b/configurations/backup/yamls/logs/dante-logback-spring.xml new file mode 100644 index 000000000..86f4e1855 --- /dev/null +++ b/configurations/backup/yamls/logs/dante-logback-spring.xml @@ -0,0 +1,39 @@ + + + + + + + + + + ${CONSOLE_LOG_CHARSET} + + ${TRACE_ID_CONSOLE_LOG_PATTERN} + + + + + + + ${FILE_LOG_CHARSET} + + ${TRACE_ID_FILE_LOG_PATTERN} + + + ${LOG_FILE} + + ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-7} + + + + + + + + + \ No newline at end of file diff --git a/configurations/backup/yamls/production/dante-cloud-environment.yaml b/configurations/backup/yamls/production/dante-cloud-environment.yaml index 95fc72e2f..4aa7c0842 100644 --- a/configurations/backup/yamls/production/dante-cloud-environment.yaml +++ b/configurations/backup/yamls/production/dante-cloud-environment.yaml @@ -5,14 +5,14 @@ herodotus: database: host: 127.0.0.1 port: 13306 - name: herodotus + name: dante-cloud username: ENC(VQOHWBUv8CXJE50zyMEhCozzElZhNbJ8suinU7Ph651G1xl4QPweElrhtXP4V0T8) password: ENC(VQOHWBUv8CXJE50zyMEhCozzElZhNbJ8suinU7Ph651G1xl4QPweElrhtXP4V0T8) redis: host: 127.0.0.1 port: 6379 password: - database: 6 + database: 3 kafka: bootstrap-servers: 127.0.0.1:9092 switch: diff --git a/configurations/backup/yamls/service/dante-cloud-oss-ability.yaml b/configurations/backup/yamls/service/dante-cloud-oss-ability.yaml index 407abfb29..aedf304a4 100644 --- a/configurations/backup/yamls/service/dante-cloud-oss-ability.yaml +++ b/configurations/backup/yamls/service/dante-cloud-oss-ability.yaml @@ -11,9 +11,15 @@ spring: herodotus: oss: + dialect: minio + proxy: + source: http://localhost:3000/api + destination: http://127.0.0.1:9000 minio: endpoint: http://127.0.0.1:9000 access-key: herodotus secret-key: herodotus - use-proxy: true - proxy-source-endpoint: http://localhost:3000/api \ No newline at end of file + s3: + endpoint: http://127.0.0.1:9000 + access-key: herodotus + secret-key: herodotus \ No newline at end of file diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 8633335fb..d0d1a36be 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.1.2.3 +VERSION=3.1.2.4 GATEWAY_SERVICE_NAME=dante-cloud-gateway GATEWAY_SERVICE_PORT=8847 UAA_SERVICE_NAME=dante-cloud-uaa diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env index 8633335fb..d0d1a36be 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.1.2.3 +VERSION=3.1.2.4 GATEWAY_SERVICE_NAME=dante-cloud-gateway GATEWAY_SERVICE_PORT=8847 UAA_SERVICE_NAME=dante-cloud-uaa diff --git a/configurations/scripts/nacos/sqls/nacos-mysql_2.2.3.sql b/configurations/scripts/nacos/sqls/nacos-mysql_2.2.3.sql new file mode 100644 index 000000000..146626488 --- /dev/null +++ b/configurations/scripts/nacos/sqls/nacos-mysql_2.2.3.sql @@ -0,0 +1,221 @@ +/* + * 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(128) 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, + `encrypted_data_key` text NOT NULL COMMENT '秘钥', + 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(128) 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 '租户字段', + `encrypted_data_key` text NOT NULL 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(20) 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` text NOT NULL 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'); diff --git a/configurations/scripts/postgresql.md b/configurations/scripts/postgresql.md index 23aae8a1d..210897a21 100644 --- a/configurations/scripts/postgresql.md +++ b/configurations/scripts/postgresql.md @@ -1,11 +1,23 @@ # postgresql 数据库创建脚本 + ``` // 创建用户 herodotus 密码是 herodotus CREATE USER herodotus WITH PASSWORD 'herodotus'; -// 创建数据库 nherodotus, 并将用户 herodotus 分配给该数据 -CREATE DATABASE nherodotus OWNER herodotus; +// 创建数据库 dante_cloud, 并将用户 herodotus 分配给该数据 +CREATE DATABASE dante_cloud OWNER herodotus; + +// 将数据库 dante_cloud 的所有权限分配给 herodotus +GRANT ALL PRIVILEGES ON DATABASE dante_cloud TO herodotus; +``` -// 将数据库 nherodotus 的所有权限分配给 herodotus -GRANT ALL PRIVILEGES ON DATABASE nherodotus TO herodotus; ``` +// 创建用户 athena 密码是 athena +CREATE USER athena WITH PASSWORD 'athena'; + +// 创建数据库 dante_athena, 并将用户 athena 分配给该数据 +CREATE DATABASE dante_athena OWNER athena; + +// 将数据库 dante_athena 的所有权限分配给 herodotus +GRANT ALL PRIVILEGES ON DATABASE dante_athena TO athena; +``` \ No newline at end of file diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 0f2065c50..38fa2a113 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -32,13 +32,13 @@ cn.herodotus.engine dependencies - 3.1.2.3 + 3.1.2.4 cn.herodotus.dante dependencies - 3.1.2.3 + 3.1.2.4 pom dante-cloud-dependencies @@ -58,7 +58,7 @@ - 1.3.0 + 1.3.1 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index 06338b229..b686324d5 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-module-common - 3.1.2.3 + 3.1.2.4 jar diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index c5bcf96c2..bd5e07784 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/modules/dante-module-metadata/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-module-metadata - 3.1.2.3 + 3.1.2.4 jar diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml index 5df665103..1427e5e97 100644 --- a/modules/dante-module-security/pom.xml +++ b/modules/dante-module-security/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-module-security - 3.1.2.3 + 3.1.2.4 jar diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index 57bd71aa8..436c4a8ed 100644 --- a/modules/dante-module-social/pom.xml +++ b/modules/dante-module-social/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-module-social - 3.1.2.3 + 3.1.2.4 jar diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 10f671015..1a885d3a2 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-module-strategy - 3.1.2.3 + 3.1.2.4 jar diff --git a/modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java b/modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java index ec95ef95d..e5a1cb1a0 100644 --- a/modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java @@ -50,7 +50,8 @@ public HerodotusLocalPermissionDetailsService(SysPermissionService sysPermission @Override public List findAll() { - List authorities = sysPermissionService.findAll();; + List authorities = sysPermissionService.findAll(); + ; if (CollectionUtils.isNotEmpty(authorities)) { return toEntities(authorities); } diff --git a/modules/pom.xml b/modules/pom.xml index ecc155667..2237cf749 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 modules - 3.1.2.3 + 3.1.2.4 pom dante-cloud-modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index bd5495ad3..33ecfc690 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -32,11 +32,11 @@ packages cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 authentication-spring-boot-starter - 3.1.2.3 + 3.1.2.4 jar diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index 31500b256..626c06836 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ packages cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index 65bad2cc0..4394871b6 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 packages - 3.1.2.3 + 3.1.2.4 pom dante-cloud-packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index 893e4d128..4f04a2323 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -32,11 +32,11 @@ packages cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 service-spring-boot-starter - 3.1.2.3 + 3.1.2.4 jar diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 708e2f4c7..3ae3a6552 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,11 +32,11 @@ platform cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-cloud-gateway - 3.1.2.3 + 3.1.2.4 jar diff --git a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/configuration/GatewayConfiguration.java b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/configuration/GatewayConfiguration.java index 46a743a68..9ce088be9 100644 --- a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/configuration/GatewayConfiguration.java +++ b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/configuration/GatewayConfiguration.java @@ -60,6 +60,7 @@ public class GatewayConfiguration { /** * Gateway 跨域处理 + * * @return WebFilter */ @Bean diff --git a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalCertificationFilter.java b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalCertificationFilter.java index fe0b0c656..faba0a2eb 100644 --- a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalCertificationFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalCertificationFilter.java @@ -89,8 +89,8 @@ public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { return WebFluxUtils.writeJsonResponse(exchange.getResponse(), new Result().type(ResultErrorCodes.ACCESS_DENIED).status(HttpStatus.SC_FORBIDDEN)); } - String webSocketToken = exchange.getRequest().getHeaders().getFirst(com.google.common.net.HttpHeaders.SEC_WEBSOCKET_PROTOCOL); - if (StringUtils.isNotBlank(webSocketToken) && StringUtils.endsWith(webSocketToken,".stomp")) { + String webSocketToken = exchange.getRequest().getHeaders().getFirst(com.google.common.net.HttpHeaders.SEC_WEBSOCKET_PROTOCOL); + if (StringUtils.isNotBlank(webSocketToken) && StringUtils.endsWith(webSocketToken, ".stomp")) { return chain.filter(exchange); } diff --git a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalSqlInjectionFilter.java b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalSqlInjectionFilter.java index 1d529090f..cb249c90e 100644 --- a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalSqlInjectionFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalSqlInjectionFilter.java @@ -166,6 +166,7 @@ public Flux getBody() { /** * 从Flux中获取字符串的方法 + * * @return 请求体 */ private String resolveBodyFromRequest(ServerHttpRequest serverHttpRequest) { diff --git a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/handler/RefreshRoutesListener.java b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/handler/RefreshRoutesListener.java index 7cf29ebc6..a8d8305b4 100644 --- a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/handler/RefreshRoutesListener.java +++ b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/handler/RefreshRoutesListener.java @@ -98,7 +98,7 @@ private AbstractSwaggerUiConfigProperties.SwaggerUrl createSwaggerUrl(String ser String data = API_URI; if (StringUtils.containsIgnoreCase(service, "bpmn")) { - data = "/openapi.json"; + data = "/openapi.json"; } String url = "/" + service.toLowerCase() + data; diff --git a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/utils/WebFluxUtils.java b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/utils/WebFluxUtils.java index ed0fe756f..32fab463d 100644 --- a/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/utils/WebFluxUtils.java +++ b/platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/utils/WebFluxUtils.java @@ -68,8 +68,9 @@ public static Mono isStaticResources(String uri, ServerWebExchange exch /** * 判断路径是否与路径模式匹配 + * * @param patterns 路径模式数组 - * @param path url + * @param path url * @return 是否匹配 */ public static boolean isPathMatch(String[] patterns, String path) { @@ -78,8 +79,9 @@ public static boolean isPathMatch(String[] patterns, String path) { /** * 判断路径是否与路径模式匹配 + * * @param patterns 路径模式字符串List - * @param path url + * @param path url * @return 是否匹配 */ public static boolean isPathMatch(List patterns, String path) { @@ -109,6 +111,7 @@ public static boolean isJsonMediaType(String contentType) { /** * 从Flux中获取字符串的方法 + * * @return 请求体 */ public static String getRequestBody(ServerHttpRequest serverHttpRequest) { diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 3eab1bc3b..62cb6de97 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,11 +31,11 @@ cn.herodotus.dante platform - 3.1.2.3 + 3.1.2.4 dante-cloud-message - 3.1.2.3 + 3.1.2.4 jar diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 7d857b1fa..1f455d879 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-cloud-monitor - 3.1.2.3 + 3.1.2.4 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 4b08d2115..aa18f2ae4 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,11 +32,11 @@ platform cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-cloud-uaa - 3.1.2.3 + 3.1.2.4 jar diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 36996e65f..01897dfe4 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 4.0.0 dante-cloud-upms - 3.1.2.3 + 3.1.2.4 diff --git a/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/configuration/UpmsConfiguration.java b/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/configuration/UpmsConfiguration.java index e9cfe429b..90d983cfb 100644 --- a/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/configuration/UpmsConfiguration.java +++ b/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/configuration/UpmsConfiguration.java @@ -35,7 +35,6 @@ import org.springframework.context.annotation.Import; /** - * *

Description: Upms 服务配置

* * @author : gengwei.zheng diff --git a/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/service/AuthorizationService.java b/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/service/AuthorizationService.java index 15b6cbd21..404a6e0d0 100644 --- a/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/service/AuthorizationService.java +++ b/platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/service/AuthorizationService.java @@ -56,11 +56,11 @@ protected MsgConvertor getMsgConvertor() { public Map authorized(String code, String state) { - String clientDetails = "14a9cf797931430896ad13a6b1855611:a05fe1fc50ed42a4990c6c6fc4bec398"; + String clientDetails = "14a9cf797931430896ad13a6b1855611:a05fe1fc50ed42a4990c6c6fc4bec398"; return http().sync("/oauth2/token") .bodyType(OkHttps.JSON) - .addHeader("Authorization", "Basic " + Base64.encode(clientDetails) ) + .addHeader("Authorization", "Basic " + Base64.encode(clientDetails)) .addUrlPara("grant_type", "authorization_code") .addUrlPara("code", code) .addUrlPara("redirect_uri", "http://192.168.101.10:8847/dante-cloud-upms/open/authorized") diff --git a/platform/pom.xml b/platform/pom.xml index 23ebdc198..9e9a42b53 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 platform diff --git a/pom.xml b/pom.xml index f380d6c2a..8754e121e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,12 @@ cn.herodotus.dante dependencies - 3.1.2.3 + 3.1.2.4 dependencies/pom.xml dante-cloud - 3.1.2.3 + 3.1.2.4 pom dante-cloud @@ -110,7 +110,7 @@ false - 2e4f5cf6-2ac8-4fe0-99be-b0562659c120 + 192.168.101.10:8848 diff --git a/readme/cookbook/0003.png b/readme/cookbook/0003.png new file mode 100644 index 000000000..49d103af1 Binary files /dev/null and b/readme/cookbook/0003.png differ diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 753ac587c..1477198b0 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -31,11 +31,11 @@ services cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-cloud-bpmn-ability - 3.1.2.3 + 3.1.2.4 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index b30f7bd90..05adc15ea 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -32,11 +32,11 @@ services cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 dante-cloud-bpmn-logic - 3.1.2.3 + 3.1.2.4 jar diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index 144f8056a..9253196e5 100644 --- a/services/dante-cloud-oss-ability/pom.xml +++ b/services/dante-cloud-oss-ability/pom.xml @@ -31,11 +31,11 @@ cn.herodotus.dante services - 3.1.2.3 + 3.1.2.4 dante-cloud-oss-ability - 3.1.2.3 + 3.1.2.4 jar diff --git a/services/pom.xml b/services/pom.xml index 78a3e98bb..5276b4a22 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 3.1.2.3 + 3.1.2.4 services - 3.1.2.3 + 3.1.2.4 pom dante-cloud-services