From bf91eac35b9a022ff9b4fe9c11771af9855f9aa3 Mon Sep 17 00:00:00 2001 From: shuigedeng <981376577@qq.com> Date: Sat, 31 Aug 2024 07:54:30 +0800 Subject: [PATCH 1/3] build: xx --- README.md | 79 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 85afa63..fb72673 100644 --- a/README.md +++ b/README.md @@ -4,37 +4,37 @@

License - Downloads - Downloads - Downloads + Downloads + Downloads + Downloads Downloads Downloads Downloads Downloads - Downloads + Downloads Downloads Downloads Downloads Downloads Downloads - Downloads + Downloads

## 1. 如果您觉得有帮助，请点右上角 "Star" 支持一下谢谢 -`taotao-cloud` (taotao云平台) 基于gradle8.9、jdk21, 支持graalvm21, 采用最新的spring 6.1.11、SpringBoot 3.3.3、SpringCloud 2023.0.3、SpringSecurity 6.3.1、Nacos 2.3.2、Mybatis-Plus 3.5.7、Redis 7等框架，开发的一款企业级微服务架构的云服务平台， 具有组件化、高性能、功能丰富的特点。代码简洁，架构清晰，组件可自由搭配，遵循SpringBoot编程思想，高度模块化和可配置化。 +`taotao-cloud` (taotao云平台) 基于gradle8.10、jdk21, 支持graalvm21, 采用最新的spring 6.1.12、SpringBoot 3.3.3、SpringCloud 2023.0.3、SpringSecurity 6.3.2、Nacos 2.4.1、Mybatis-Plus 3.5.7、Redis 7等框架，开发的一款企业级微服务架构的云服务平台， -具备服务注册&发现、配置中心、服务限流、熔断降级、监控报警、多数据源、工作流、高亮搜索、定时任务、分布式缓存、分布式事务、分布式存储等功能，用于快速构建微服务项目。 +具有组件化、高性能、功能丰富的特点。代码简洁，架构清晰，组件可自由搭配，遵循SpringBoot编程思想，高度模块化和可配置化。 -目前支持Shell、Docker、Docker-compose、K8s、Github/Genkins ci/cd等多种部署方式，实现RBAC权限。 遵循阿里代码规范，采用restful设计风格及DDD(领域驱动设计)思想，代码简洁、架构清晰，非常适合作为基础框架使用。基于DDD（领域驱动设计）的轻量级快速开发框架，致力于企业技术架构的可沉淀和可传承，解决复杂业务场景的扩展问题 +具备服务注册&发现、配置中心、服务限流、熔断降级、监控报警、多数据源、工作流、高亮搜索、定时任务、分布式缓存、分布式事务、分布式存储等功能，用于快速构建微服务项目。 -仓库的目的: 工作以来的技术总结和技术沉淀(业余时间进行开发) **仓库代码中不涉及公司任何业务代码** +目前支持Shell、Docker、Docker-compose、K8s、Github/Genkins ci/cd等多种部署方式，实现RBAC权限。 -主要包括如下几部分 +遵循阿里代码规范，采用restful设计风格及DDD(领域驱动设计)思想，代码简洁、架构清晰，非常适合作为基础框架使用。基于DDD（领域驱动设计）的轻量级快速开发框架，致力于企业技术架构的可沉淀和可传承，解决复杂业务场景的扩展问题 -- **大数据模块** 集成基于**hadoop、hive、dolphinscheduler**的离线批量日志数据处理和分析, 用户行为分析、推荐系统, **flink、flink cdc、flink cep、spark - streaming、presto、seatunnel**流式处理计算框架, **tidb、doris**离线数据仓库, **hudi、paimon**数据湖等大数据处理 +**仓库的目的**: 工作以来的技术总结和技术沉淀(业余时间进行开发) **仓库代码中不涉及公司任何业务代码** +主要包括如下几部分 - **微服务模块** 基于**spring cloud alibaba**微服务基础脚手架框架,用于基础服务的集成和跟业务无关的基础技术集成, 提供**大量的starters组件**作为技术底层支持,同时基础框架集中统一优化中间件相关服务及使用, @@ -42,12 +42,22 @@ - **saas商城模块** 基于**微服务模块**构建的前后端分离的B2B2C商城系统, 支持商家入驻支, 持分布式部署, - 使用**github action - CI/CD**持续集成, 前后端均使用**kubernetes**部署， + 使用**github action CI/CD**持续集成, 前后端均使用**kubernetes**部署， 各个API独立, 管理前端使用**vue3 ant-design-vue**开发, 移动端使用**taro taro-ui**开发, ** 系统全端全部代码开源** +- **大数据模块** 集成基于**hadoop、hive、dolphinscheduler**的离线批量日志数据处理和分析, 用于用户行为分析、推荐系统, + **flink、flink cdc、flink cep、spark streaming、presto、seatunnel**流式处理计算框架, **tidb、doris**离线数据仓库, **hudi、paimon**数据湖等大数据处理 + + +- **数仓模块** 基于Doris、Piamon、Hudi的离线数仓和实时数仓(数据湖) + * 数据源模块：业务数据写入 **MySQL** 数据库,生成的日志数据被写入 **Kafka**, **rocketmq** 消息队列 + * 数据采集模块：**Dinky**开发**FlinkSQL**，消费**Kafka**中的日志数据，并将其写入**Doris**、**Paimon** 、**Hudi**的在线数据存储（ODS）层。使用**DolphinScheduler**配置**SeaTunnel**任务，同步**MySQL**中的业务数据到**Doris**的ODS层。**FlinkSQL/CDC**从**Kafka**和**MySQL**采集数据，分别写入**Paimon** 、**Hudi**的ODS层。 + * 数仓模块：遵循标准的ODS(数据存储)->DWD(数据仓库明细层)/DIM(维度数据层)->DWS(数据服务层)->ADS(应用数据存储)的四级数据分层架构。数据在**Doris** 、**Paimon**、**Hudi**中通过批量和实时两种调度方式流转。 + * 数据可视化：ADS层和DWS层的数据可以利用**SuperSet**和**DataRT**工具进行报表和数据大屏的制作、展示 + + - **sass商城多端前端模块** 主要使用**react antd**进行前后端分离开发, 集成以**taro, taro-ui, react native** 为主的多端合一框架。 @@ -55,7 +65,7 @@ - **python模块** 主要是集成了基于**django**的web开发, 基于**scrapy**爬虫开发, **homeassistant** 家庭自动化框架原理的分析 -总之基于**spring cloud alibaba**的微服务架构 **hadoop hive flink spark hive** +总之基于**spring cloud alibaba**的微服务架构 **hadoop hive flink flink-cdc paimon doris hudi** 等大数据处理实践。旨在提供技术框架的基础能力的封装，减少开发工作，只关注业务 ## 2. spring cloud 微服务架构图 @@ -72,8 +82,8 @@ Requires: ``` JAVA_VERSION >= 21 (推荐使用graalvm-jdk-21) -GRALE_VERSION >= 8.9 -IDEA_VERSION >= 2024.2 +GRALE_VERSION >= 8.10 +IDEA_VERSION >= 2024.2.0.2 ``` Gradle: @@ -116,17 +126,17 @@ Maven: 依赖 | 版本 ----------------------|----------------- - Spring | 6.1.11 + Spring | 6.1.12 Spring Boot | 3.3.3 Spring Cloud | 2023.0.3 Spring Cloud Alibaba | 2023.0.1.2 Spring Cloud Tencent | 1.14.0-2023.0.0-RC2 - Spring Cloud huawei | 1.11.8-2023.0.x + Spring Cloud huawei | 1.11.9-2023.0.x Seata | 2.0.0 Sentinel | 1.8.8 - Spring-kafka | 3.2.1 + Spring-kafka | 3.2.2 Roketmq | 5.2.0 - Spring Security | 6.3.1 + Spring Security | 6.3.2 Mybatis Plus | 3.5.7 Hutool | 6.0.0-M15 Mysql | 8.4.0 @@ -138,16 +148,16 @@ Maven: Elasticsearch | 8.11.5 Xxl-job | 2.4.1 EasyCaptcha | 1.6.2 - Guava | 33.2.1-jre + Guava | 33.3.0-jre Grpc | 1.66.0 - Arthas | 3.7.2 + Arthas | 4.0.0 Dynamic-tp | 1.1.7-3.x Elasticjob | 3.0.4 Powerjob | 5.0.1-beta Forest | 1.5.36 Netty | 4.1.112.Final -## 6. 演示地址 +## 6. 演示地址 (云服务器已到期) * TaotaoCloud脚手架：[https://start.taotaocloud.top/](https://start.taotaocloud.top/) * 文档地址：[https://docs.taotaocloud.top](https://docs.taotaocloud.top) @@ -214,13 +224,13 @@ Maven: ``` taotao-cloud-project -- 父项目 │ ├─taotao-cloud-bigdata -- 大数据模块 -│ ├─taotao-cloud-cache -- cache模块 +│ ├─taotao-cloud-cache -- 本地缓存模块 │ ├─taotao-cloud-design-partterns -- 设计模式 │ ├─taotao-cloud-jdbcpool -- jdbcpool模块 │ ├─taotao-cloud-microservice -- 微服务模块 │ │ ├─taotao-cloud-ai -- ai模块 │ │ ├─taotao-cloud-bff -- bff模块 -│ │ ├─taotao-cloud-business -- 所有的业务模块 +│ │ ├─taotao-cloud-business -- 业务模块 │ │ ├─taotao-cloud-data-sync -- 数据同步模块 │ │ ├─taotao-cloud-data-analysis -- 数据分析模块 │ │ ├─taotao-cloud-gateway -- 网关模块 @@ -229,21 +239,21 @@ taotao-cloud-project -- 父项目 │ │ ├─taotao-cloud-open-platform -- 开放平台模块 │ │ ├─taotao-cloud-recommend -- 推荐模块 │ │ ├─taotao-cloud-shell -- shell模块 -│ │ ├─taotao-cloud-xxljob -- xxl-job模块 +│ │ ├─taotao-cloud-xxljob -- job模块 │ ├─taotao-cloud-mq -- 分布式消息中间件 │ ├─taotao-cloud-plugin -- 插件模块 -│ ├─taotao-cloud-job -- job模块 +│ ├─taotao-cloud-job -- 分布式任务调度中间件 │ ├─taotao-cloud-python -- python模块 │ ├─taotao-cloud-scala -- scala模块 -│ ├─taotao-cloud-rpc -- 分布式rpc框架 -│ ├─taotao-cloud-tx -- 分布式事务框架 +│ ├─taotao-cloud-rpc -- 分布式rpc中间件 +│ ├─taotao-cloud-tx -- 分布式事务中间件 │ ├─taotao-cloud-warehouse -- 数仓模块 │ │ ├─taotao-cloud-offline-warehouse -- 离线仓库模块 │ │ ├─taotao-cloud-offline-weblog -- 离线日志分析模块 -│ │ ├─taotao-cloud-realtime-datalake -- 准实时数据湖模块 -│ │ ├─taotao-cloud-realtime-mall -- 商城日志分析模块 +│ │ ├─taotao-cloud-realtime-datalake -- 实时数据湖模块 +│ │ ├─taotao-cloud-realtime-mall -- 实时商城数据分析模块 │ │ ├─taotao-cloud-realtime-recommend -- 实时推荐模块 -│ │ ├─taotao-cloud-realtime-warehouse -- 实时旅游模块 +│ │ ├─taotao-cloud-realtime-warehouse -- 实时数仓模块 ``` ## 9.开源共建 @@ -318,7 +328,6 @@ taotao-cloud-project -- 父项目 +--- Project ':taotao-cloud-starter-apt' +--- Project ':taotao-cloud-starter-cache' +--- Project ':taotao-cloud-starter-canal' -+--- Project ':taotao-cloud-starter-captcha' +--- Project ':taotao-cloud-starter-common' +--- Project ':taotao-cloud-starter-core' +--- Project ':taotao-cloud-starter-bootstrap' @@ -327,7 +336,6 @@ taotao-cloud-project -- 父项目 +--- Project ':taotao-cloud-starter-dubbo' +--- Project ':taotao-cloud-starter-grpc' +--- Project ':taotao-cloud-starter-idempotent' -+--- Project ':taotao-cloud-starter-idgenerator' +--- Project ':taotao-cloud-starter-ip2region' +--- Project ':taotao-cloud-starter-job' +--- Project ':taotao-cloud-starter-limit' @@ -345,7 +353,6 @@ taotao-cloud-project -- 父项目 +--- Project ':taotao-cloud-starter-prometheus' +--- Project ':taotao-cloud-starter-retry' +--- Project ':taotao-cloud-starter-security' -+--- Project ':taotao-cloud-starter-sensitive' +--- Project ':taotao-cloud-starter-sms' +--- Project ':taotao-cloud-starter-springdoc' +--- Project ':taotao-cloud-starter-third-client' From 6b33b5f4873f0ca86efb8033e9e015cd8bc4d15f Mon Sep 17 00:00:00 2001 From: shuigedeng <981376577@qq.com> Date: Sat, 31 Aug 2024 14:57:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?build:=20=E5=BC=80=E5=90=AF2024.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-release.yml | 4 ++-- .github/workflows/microservice-docker-image.yml | 2 +- .github/workflows/microservice-graalvm.yml | 2 +- README.md | 4 ++-- build.gradle | 2 +- gradle.properties | 2 +- gradle/mybatis-generator.gradle | 2 +- gradle/springboot.gradle | 4 ++-- s.yml | 2 +- taotao-cloud-ddd-api/build.gradle | 8 ++++---- taotao-cloud-ddd-domain/build.gradle | 4 ++-- taotao-cloud-ddd-integration/build.gradle | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 562041e..3c42fb0 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -16,7 +16,7 @@ env: TAOTAO_CLOUD_GITHUB_TOKEN: ${{ secrets.TAOTAO_CLOUD_GITHUB_TOKEN }} TAOTAO_CLOUD_REGISTRY_USERNAME: ${{ secrets.TAOTAO_CLOUD_REGISTRY_USERNAME }} TAOTAO_CLOUD_REGISTRY_PASSWORD: ${{ secrets.TAOTAO_CLOUD_REGISTRY_PASSWORD }} - TAOTAO_CLOUD_VERSION: 2024.09 + TAOTAO_CLOUD_VERSION: 2024.10 jobs: build: @@ -70,7 +70,7 @@ jobs: with: allowUpdates: true artifactErrorsFailBuild: true - artifacts: "taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.09.zip,taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.09.tar.gz,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.09.zip,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.09.tar.gz,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.09.zip,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.09.tar.gz" + artifacts: "taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.10.zip,taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.10.tar.gz,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.10.zip,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.10.tar.gz,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.10.zip,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.10.tar.gz" #body: "sdfsa" bodyFile: "doc/release/2024-09.md" draft: false diff --git a/.github/workflows/microservice-docker-image.yml b/.github/workflows/microservice-docker-image.yml index e728842..3e9390d 100644 --- a/.github/workflows/microservice-docker-image.yml +++ b/.github/workflows/microservice-docker-image.yml @@ -22,7 +22,7 @@ env: TAOTAO_CLOUD_GITHUB_TOKEN: ${{ secrets.TAOTAO_CLOUD_GITHUB_TOKEN }} TAOTAO_CLOUD_REGISTRY_USERNAME: ${{ secrets.TAOTAO_CLOUD_REGISTRY_USERNAME }} TAOTAO_CLOUD_REGISTRY_PASSWORD: ${{ secrets.TAOTAO_CLOUD_REGISTRY_PASSWORD }} - TAOTAO_CLOUD_VERSION: 2024.09 + TAOTAO_CLOUD_VERSION: 2024.10 jobs: build: diff --git a/.github/workflows/microservice-graalvm.yml b/.github/workflows/microservice-graalvm.yml index 1f2ca09..1e08a93 100644 --- a/.github/workflows/microservice-graalvm.yml +++ b/.github/workflows/microservice-graalvm.yml @@ -19,7 +19,7 @@ env: TAOTAO_CLOUD_GITHUB_TOKEN: ${{ secrets.TAOTAO_CLOUD_GITHUB_TOKEN }} TAOTAO_CLOUD_REGISTRY_USERNAME: ${{ secrets.TAOTAO_CLOUD_REGISTRY_USERNAME }} TAOTAO_CLOUD_REGISTRY_PASSWORD: ${{ secrets.TAOTAO_CLOUD_REGISTRY_PASSWORD }} - TAOTAO_CLOUD_VERSION: 2024.09 + TAOTAO_CLOUD_VERSION: 2024.10 jobs: build: diff --git a/README.md b/README.md index fb72673..dfe3402 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Gradle: ``` dependencyManagement{ imports { - mavenBom "io.github.shuigedeng:taotao-cloud-dependencies:2024.09" + mavenBom "io.github.shuigedeng:taotao-cloud-dependencies:2024.10" } } @@ -106,7 +106,7 @@ Maven: io.github.shuigedeng taotao-cloud-dependencies - 2024.09 + 2024.10 pom import diff --git a/build.gradle b/build.gradle index ae77dcb..a02755d 100644 --- a/build.gradle +++ b/build.gradle @@ -367,7 +367,7 @@ subprojects { annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructProcessorVersion}" //https://github.com/entur/mapstruct-spi-protobuf //https://search.maven.org/artifact/no.entur.mapstruct.spi/protobuf-spi-impl - annotationProcessor "no.entur.mapstruct.spi:protobuf-spi-impl:1.44" + annotationProcessor "no.entur.mapstruct.spi:protobuf-spi-impl:1.45" annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}" } diff --git a/gradle.properties b/gradle.properties index e176817..1bdf54b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ org.gradle.configureondemand=true org.gradle.warning.mode=all #######################################\u81EA\u5B9A\u4E49\u5C5E\u6027########################################## -version=2024.09 +version=2024.10 #\u4EE5\u4E0B\u914D\u7F6E\u5728 GRADLE_USER_HOME/gradle.properties diff --git a/gradle/mybatis-generator.gradle b/gradle/mybatis-generator.gradle index 81d1276..15ba58b 100644 --- a/gradle/mybatis-generator.gradle +++ b/gradle/mybatis-generator.gradle @@ -20,7 +20,7 @@ mybatisGenerator { dependencies { mybatisGenerator 'org.mybatis.generator:mybatis-generator-core:1.4.2' mybatisGenerator 'org.mybatis.dynamic-sql:mybatis-dynamic-sql:1.5.2' - mybatisGenerator 'io.github.shuigedeng:taotao-cloud-starter-data-mybatis:2024.09' + mybatisGenerator 'io.github.shuigedeng:taotao-cloud-starter-data-mybatis:2024.10' mybatisGenerator 'mysql:mysql-connector-java:8.0.33' //mybatisGenerator 'org.postgresql:postgresql:42.7.3' //mybatisGenerator // Here add your mariadb dependencies or else diff --git a/gradle/springboot.gradle b/gradle/springboot.gradle index 0a7eb3a..e5c49c1 100644 --- a/gradle/springboot.gradle +++ b/gradle/springboot.gradle @@ -112,7 +112,7 @@ bootBuildImage { environment = [ "BPL_SPRING_CLOUD_BINDINGS_ENABLED": "true", - "BP_IMAGE_LABELS" : "application_name=taotao-cloud-monitor application_version=2024.09", + "BP_IMAGE_LABELS" : "application_name=taotao-cloud-monitor application_version=2024.10", "BP_OCI_AUTHORS" : "981376577@qq.com", //"BP_OCI_CREATED": " ", //"BP_OCI_DESCRIPTION": " ", @@ -127,7 +127,7 @@ bootBuildImage { //"BP_OCI_VERSION": " ", "BPE_APPLICATION_NAME" : "taotao-cloud-monitor", - "BPE_APPLICATION_VERSION" : "2024.09", + "BPE_APPLICATION_VERSION" : "2024.10", "BPE_JMX_ENABLED" : "true", "BPE_LANG" : "zh_CN.UTF-8", "BPE_JMX_PORT" : "5000", diff --git a/s.yml b/s.yml index d07f13f..6ceebcb 100644 --- a/s.yml +++ b/s.yml @@ -1,6 +1,6 @@ # aliyun serverless 配置 -edition: 2024.09 +edition: 2024.10 name: taotao-cloud-microservice access: default vars: diff --git a/taotao-cloud-ddd-api/build.gradle b/taotao-cloud-ddd-api/build.gradle index b8ffe5f..da1e1a1 100644 --- a/taotao-cloud-ddd-api/build.gradle +++ b/taotao-cloud-ddd-api/build.gradle @@ -11,10 +11,10 @@ dependencies { compileOnly "io.github.shuigedeng:taotao-cloud-starter-grpc" //https://search.maven.org/artifact/com.google.protobuf/protobuf-java - api "com.google.protobuf:protobuf-java:4.27.3" + api "com.google.protobuf:protobuf-java:4.28.0" //https://search.maven.org/artifact/com.google.protobuf/protobuf-java-util - api "com.google.protobuf:protobuf-java-util:4.27.3" - api "com.google.protobuf:protobuf-javalite:4.27.3" + api "com.google.protobuf:protobuf-java-util:4.28.0" + api "com.google.protobuf:protobuf-javalite:4.28.0" // 1.3.5 Java 9+ compatibility - Do NOT update to 2.0.0 // protobuf生成的代码带有javax.annotation.Generated 此注解只有在1.3.5中有 在2版本之后换成了jakarta.annotation.Generated @@ -27,7 +27,7 @@ protobuf { protoc { //https://repo1.maven.org/maven2/com/google/protobuf/protoc/ //直接使用Maven Central上已经编译好的protoc编译器， - artifact = "com.google.protobuf:protoc:4.27.3" + artifact = "com.google.protobuf:protoc:4.28.0" //指定本地已经安装的protoc编译器 //path = '/usr/local/bin/protoc' } diff --git a/taotao-cloud-ddd-domain/build.gradle b/taotao-cloud-ddd-domain/build.gradle index 2a433b3..dd02f9c 100644 --- a/taotao-cloud-ddd-domain/build.gradle +++ b/taotao-cloud-ddd-domain/build.gradle @@ -97,9 +97,9 @@ dependencies { api "com.googlecode.aviator:aviator:5.4.3" //https://search.maven.org/artifact/com.google.protobuf/protobuf-java - api "com.google.protobuf:protobuf-java:4.27.3" + api "com.google.protobuf:protobuf-java:4.28.0" //https://search.maven.org/artifact/com.google.protobuf/protobuf-java-util - api "com.google.protobuf:protobuf-java-util:4.27.3" + api "com.google.protobuf:protobuf-java-util:4.28.0" //https://search.maven.org/artifact/com.googlecode.protobuf-java-format/protobuf-java-format //api "com.googlecode.protobuf-java-format:protobuf-java-format:1.4" diff --git a/taotao-cloud-ddd-integration/build.gradle b/taotao-cloud-ddd-integration/build.gradle index 61ddc77..0fc3da6 100644 --- a/taotao-cloud-ddd-integration/build.gradle +++ b/taotao-cloud-ddd-integration/build.gradle @@ -19,5 +19,5 @@ dependencies { api "io.github.shuigedeng:taotao-cloud-starter-facility-alibaba" api "io.github.shuigedeng:taotao-cloud-starter-grpc" api "io.github.shuigedeng:taotao-cloud-starter-dubbo" - api "io.github.shuigedeng:taotao-cloud-goods-api:2024.09" + api "io.github.shuigedeng:taotao-cloud-goods-api:2024.10" } From ae105ad0464486138014ed921acec632d2bb21e6 Mon Sep 17 00:00:00 2001 From: shuigedeng <981376577@qq.com> Date: Sun, 1 Sep 2024 20:29:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?build:=20=E5=BC=80=E5=90=AF2024.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- gradle.properties | 9 +- gradle/docker.gradle | 2 +- gradle/springboot.gradle | 2 +- .../src/main/resources/application-dev.yml | 128 +++++++++--------- .../src/main/resources/application-pre.yml | 14 +- .../src/main/resources/application-pro.yml | 14 +- .../src/main/resources/application-test.yml | 14 +- .../src/main/resources/bootstrap-dev.yml | 16 +-- .../src/main/resources/smart-doc.json | 4 +- 10 files changed, 105 insertions(+), 100 deletions(-) diff --git a/build.gradle b/build.gradle index a02755d..ddee957 100644 --- a/build.gradle +++ b/build.gradle @@ -199,7 +199,7 @@ plugins { //https://plugins.gradle.org/plugin/io.swagger.core.v3.swagger-gradle-plugin //https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin - id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.22" + id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.23" //id 'org.cyclonedx.bom' version '1.8.2' diff --git a/gradle.properties b/gradle.properties index 1bdf54b..f160dce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,15 @@ #\u901A\u8FC7\u5F00\u542F\u5B88\u62A4\u8FDB\u7A0B\uFF0C\u4E0B\u4E00\u6B21\u6784\u5EFA\u7684\u65F6\u5019\uFF0C\u5C06\u4F1A\u8FDE\u63A5\u8FD9\u4E2A\u5B88\u62A4\u8FDB\u7A0B\u8FDB\u884C\u6784\u5EFA\uFF0C\u800C\u4E0D\u662F\u91CD\u65B0 fork \u4E00\u4E2A gradle\u6784\u5EFA\u8FDB\u7A0B org.gradle.daemon=true #JVM\u5806\u5185\u5B58\u5927\u5C0F -org.gradle.jvmargs=-Xmx8192m \ - -Xms2048m \ +org.gradle.jvmargs=-Xmx4096m \ + -Xms1024m \ -XX:ReservedCodeCacheSize=2048m \ -XX:+HeapDumpOnOutOfMemoryError \ + -XX:+UseG1GC \ + -XX:SoftRefLRUPolicyMSPerMB=50 \ + -XX:CICompilerCount=2 \ + -XX:+HeapDumpOnOutOfMemoryError \ + -XX:-OmitStackTraceInFastThrow \ -Dfile.encoding=UTF-8 \ --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ diff --git a/gradle/docker.gradle b/gradle/docker.gradle index 648085f..3ac7058 100644 --- a/gradle/docker.gradle +++ b/gradle/docker.gradle @@ -3,7 +3,7 @@ apply plugin: "com.bmuschko.docker-spring-boot-application" //如果url不指定的话 //Mac默认：url = https://index.docker.io/v1/ //Unix默认: url = unix:///var/run/docker.sock -//Windows默认: url = tcp://127.0.0.1:2375 +//Windows默认: url = tcp://192.168.218.2:2375 docker { //url = 'https://192.168.59.103:2376' diff --git a/gradle/springboot.gradle b/gradle/springboot.gradle index e5c49c1..64a4d35 100644 --- a/gradle/springboot.gradle +++ b/gradle/springboot.gradle @@ -180,7 +180,7 @@ bootBuildImage { docker { //使用docker - //host = "tcp://127.0.0.1:2376" + //host = "tcp://192.168.218.2:2376" //tlsVerify = true //certPath = "/home/users/.minikube/certs" diff --git a/taotao-cloud-ddd-assembly/src/main/resources/application-dev.yml b/taotao-cloud-ddd-assembly/src/main/resources/application-dev.yml index 955f931..19263ec 100644 --- a/taotao-cloud-ddd-assembly/src/main/resources/application-dev.yml +++ b/taotao-cloud-ddd-assembly/src/main/resources/application-dev.yml @@ -73,11 +73,11 @@ jasypt: # minIdle: 5 # maxIdle: 20 # maxTotal: 50 -# host: 127.0.0.1 +# host: 192.168.218.2 # port: 6379 pulsar: - service-url: pulsar://127.0.0.1:6650 + service-url: pulsar://192.168.218.2:6650 io-threads: 10 listener-threads: 10 enable-tcp-no-delay: false @@ -131,7 +131,7 @@ redisson: attemptTimeout: 10000 #等待获取锁超时时间,-1则是一直等待 dataValidTime: 1800000 single_server_config: - address: "127.0.0.1:6379" #服务器地址,必填ip:port + address: "192.168.218.2:6379" #服务器地址,必填ip:port subscription_connection_minimum_idle_size: 1 #用于发布和订阅连接的最小保持连接数（长连接）。Redisson内部经常通过发布和订阅来实现许多功能。长期保持一定数量的发布订阅连接是必须的。 subscription_connection_pool_size: 50 #用于发布和订阅连接的连接池最大容量。连接池的连接数量自动弹性伸缩。 connection_minimum_idle_size: 24 #最小保持连接数（长连接）。长期保持一定数量的连接有利于提高瞬时写入反应速度。 @@ -164,16 +164,16 @@ redisson: # #监测DNS的变化情况的时间间隔。 # dnsMonitoringInterval: 5000 # #服务器节点地址.必填 - # #redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379 - # #redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380 - # #redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381 + # #redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379 + # #redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380 + # #redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381 # nodeAddresses: - # - "127.0.0.1:6381" - # - "127.0.0.1:6382" - # - "127.0.0.1:6383" - # - "127.0.0.1:6384" - # - "127.0.0.1:6385" - # - "127.0.0.1:6386" + # - "192.168.218.2:6381" + # - "192.168.218.2:6382" + # - "192.168.218.2:6383" + # - "192.168.218.2:6384" + # - "192.168.218.2:6385" + # - "192.168.218.2:6386" # #(哨兵模式,云托管,主从模式特有)尝试连接的数据库编号。 # database: 1 # #(哨兵模式特有)主服务器的名称是哨兵进程中用来监测主从服务切换情况的。 @@ -187,10 +187,10 @@ arthas: # ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志 telnetPort: -1 httpPort: -1 - ip: 0.0.0.0 # 127.0.0.1只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 + ip: 0.0.0.0 # 192.168.218.2只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 agent-id: ${spring.application.name} app-name: ${spring.application.name} - tunnel-server: ws://127.0.0.1:7777/ws + tunnel-server: ws://192.168.218.2:7777/ws dubbo: scan: @@ -211,7 +211,7 @@ dubbo: shutwait: 3000 dump-directory: ${user.home}/logs/${spring.application.name}/dubbo/ registry: - address: nacos://127.0.0.1:8848 + address: nacos://192.168.218.2:8848 group: DUBBO_REGISTRY_GROUP cluster: CQ parameters: @@ -278,14 +278,14 @@ dubbo: export-async: true monitor: id: ${spring.application.name} - address: 127.0.0.1:18080 + address: 192.168.218.2:18080 username: admin password: 123456 group: DUBBO_REGISTRY_GROUP version: ${ttcVersion} metadata-report: id: ${spring.application.name} - address: nacos://127.0.0.1:8848 + address: nacos://192.168.218.2:8848 username: nacos password: nacos group: DUBBO_REGISTRY_GROUP @@ -294,7 +294,7 @@ dubbo: cluster-name: CQ config-center: id: ${spring.application.name} - address: nacos://127.0.0.1:8848 + address: nacos://192.168.218.2:8848 username: nacos password: nacos group: DUBBO_REGISTRY_GROUP @@ -335,7 +335,7 @@ seata: data-source-proxy-mode: AT service: grouplist: - SC: 127.0.0.1:8091 + SC: 192.168.218.2:8091 vgroupMapping: taotao_cloud_tx_group: SC # TC 集群（必须与seata-server保持一致） enable-degrade: false # 降级开关 @@ -344,7 +344,7 @@ seata: type: nacos nacos: namespace: taotao-cloud-seata - server-addr: 127.0.0.1:8848 + server-addr: 192.168.218.2:8848 group: SEATA_GROUP username: nacos password: nacos @@ -354,7 +354,7 @@ seata: nacos: namespace: taotao-cloud-seata application: seata-server - server-addr: 127.0.0.1:8848 + server-addr: 192.168.218.2:8848 group: SEATA_GROUP username: nacos password: nacos @@ -402,7 +402,7 @@ seata: enable-client-batch-send-request: true # 客户端事务消息请求是否批量合并发送（默认true） rocketmq: - name-server: http://127.0.0.1:9876 + name-server: http://192.168.218.2:9876 producer: # 发送同一类消息的设置为同一个group，保证唯一 group: ${spring.application.name} # 组名称 @@ -633,11 +633,11 @@ spring: max-request-size: 200MB datasource: type: com.zaxxer.hikari.HikariDataSource - #url: jdbc:mysql://127.0.0.1:13306/${spring.application.name}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&allowMultiQueries=true&autoReconnect=true&queryInterceptors=brave.mysql8.TracingQueryInterceptor&exceptionInterceptors=brave.mysql8.TracingExceptionInterceptor + #url: jdbc:mysql://192.168.218.2:13306/${spring.application.name}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&allowMultiQueries=true&autoReconnect=true&queryInterceptors=brave.mysql8.TracingQueryInterceptor&exceptionInterceptors=brave.mysql8.TracingExceptionInterceptor #driver-class-name: com.mysql.cj.jdbc.Driver - #url: jdbc:p6spy:mysql://127.0.0.1:13306/${spring.application.name}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&allowMultiQueries=true&autoReconnect=true&rewriteBatchedStatements=true + #url: jdbc:p6spy:mysql://192.168.218.2:13306/${spring.application.name}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&allowMultiQueries=true&autoReconnect=true&rewriteBatchedStatements=true #driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:mysql://127.0.0.1:3306/${spring.application.name}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&allowMultiQueries=true&autoReconnect=true&useCursorFetch=true + url: jdbc:mysql://192.168.218.2:3306/${spring.application.name}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&allowMultiQueries=true&autoReconnect=true&useCursorFetch=true driver-class-name: com.mysql.cj.jdbc.Driver username: root password: 123456 @@ -662,7 +662,7 @@ spring: datasource: master: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:p6spy:mysql://${TAOTAO_CLOUD_MYSQL_HOST:127.0.0.1}:${TAOTAO_CLOUD_MYSQL_PORT:3306}/${spring.application.name}?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + url: jdbc:p6spy:mysql://${TAOTAO_CLOUD_MYSQL_HOST:192.168.218.2}:${TAOTAO_CLOUD_MYSQL_PORT:3306}/${spring.application.name}?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: ${TAOTAO_CLOUD_MYSQL_USERNAME:root} password: ${TAOTAO_CLOUD_MYSQL_PASSWORD:123456} driver-class-name: com.p6spy.engine.spy.P6SpyDriver @@ -744,7 +744,7 @@ spring: data: redis: - host: 127.0.0.1 + host: 192.168.218.2 port: 6379 database: 1 #password: ${TAOTAO_CLOUD_REDIS_PASSWORD:taotao-cloud} @@ -753,7 +753,7 @@ spring: # master: # nodes: #cluster: - # nodes: 127.0.0.1:6381,127.0.0.1:6382,127.0.0.1:6383,127.0.0.1:6384,127.0.0.1:6385,127.0.0.1:6386 + # nodes: 192.168.218.2:6381,192.168.218.2:6382,192.168.218.2:6383,192.168.218.2:6384,192.168.218.2:6385,192.168.218.2:6386 # max-redirects: 3 client-type: lettuce lettuce: @@ -783,7 +783,7 @@ spring: # 客户端名称 clientName: "taotao-cloud-redis-client" # 节点地址 - address: "redis://127.0.0.1:6379" + address: "redis://192.168.218.2:6379" # 发布和订阅连接的最小空闲连接数 subscriptionConnectionMinimumIdleSize: 1 # 发布和订阅连接池大小 @@ -807,7 +807,7 @@ spring: # 配置看门狗的默认超时时间为30s，这里改为 10s lockWatchdogTimeout: 10000 rabbitmq: - host: 127.0.0.1 + host: 192.168.218.2 port: 5672 #注意：guest用户只能链接本地服务器 比如localhost 不可以连接远程服务器 username: root @@ -863,7 +863,7 @@ spring: #最长等待多长时间再尝试重新发送消息。这个参数的默认值是 10 秒。 kafka: enabled: true - bootstrap-servers: 127.0.0.1:9092 #kafka的地址 多个逗号连接 + bootstrap-servers: 192.168.218.2:9092 #kafka的地址 多个逗号连接 producer: retries: 1 # 消息发送重试次数 # 当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。 @@ -950,7 +950,7 @@ spring: opaquetoken: client-id: 25953fda237841689743a94871915661 client-secret: a667ed5606f44e159db062239ed5a838 - introspection-uri: http://127.0.0.1 + introspection-uri: http://192.168.218.2 cloud: openfeign: circuitbreaker: #如果 Spring Cloud CircuitBreaker 在 classpath 上，并且feign.circuitbreaker.enabled=true Feign 将使用断路器包装所有方法。 @@ -1042,7 +1042,7 @@ spring: binder: kafka rocketmq: binder: - name-server: 127.0.0.1:9876 + name-server: 192.168.218.2:9876 vip-channel-enabled: false group: demo #RocketMQSpecificPropertiesProvider @@ -1071,7 +1071,7 @@ spring: sync: true rabbit: binder: - admin-addresses: 127.0.0.1:5672 + admin-addresses: 192.168.218.2:5672 bindings: sms-output: producer: @@ -1085,7 +1085,7 @@ spring: #republish-to-dlq: true # 重投到死信队列并带有报错信息 kafka: binder: - brokers: 127.0.0.1:9092 + brokers: 192.168.218.2:9092 auto-create-topics: true bindings: order-output: @@ -1123,7 +1123,7 @@ taotao: secret: ${DINGDING_SECRET:xxxx} zookeeper: enabled: false - connectString: 127.0.0.1:2181 + connectString: 192.168.218.2:2181 sensitive: enabled: true lock: @@ -1332,21 +1332,21 @@ taotao: endpoint: uaa-service-name: dante-cloud-uaa upms-service-name: dante-cloud-upms - gateway-service-uri: http://127.0.0.1:33336 - uaa-service-uri: http://127.0.0.1:33336/ - upms-service-uri: http://127.0.0.1:33336/${herodotus.endpoint.upms-service-name} - access-token-uri: http://127.0.0.1:33336/oauth2/token - authorization-uri: http://127.0.0.1:33336/oauth2/authorize - token-revocation-uri: http://127.0.0.1:33336/oauth2/revoke - token-introspection-uri: http://127.0.0.1:33336/oauth2/introspect - jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks + gateway-service-uri: http://192.168.218.2:33336 + uaa-service-uri: http://192.168.218.2:33336/ + upms-service-uri: http://192.168.218.2:33336/${herodotus.endpoint.upms-service-name} + access-token-uri: http://192.168.218.2:33336/oauth2/token + authorization-uri: http://192.168.218.2:33336/oauth2/authorize + token-revocation-uri: http://192.168.218.2:33336/oauth2/revoke + token-introspection-uri: http://192.168.218.2:33336/oauth2/introspect + jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks issuer-uri: ${herodotus.endpoint.uaa-service-uri} - oidc-client-registration-uri: http://127.0.0.1:33336/connect/register - oidc-user-info-uri: http://127.0.0.1:33336/userinfo - #device-authorization-uri: http://127.0.0.1:33336/oauth2/device_authorization - #device-authorization-endpoint: http://127.0.0.1:33336/oauth2/device_authorization - #device-verification-uri: http://127.0.0.1:33336/oauth2/device_verification - #device-verification-endpoint: http://127.0.0.1:33336/oauth2/device_verification + oidc-client-registration-uri: http://192.168.218.2:33336/connect/register + oidc-user-info-uri: http://192.168.218.2:33336/userinfo + #device-authorization-uri: http://192.168.218.2:33336/oauth2/device_authorization + #device-authorization-endpoint: http://192.168.218.2:33336/oauth2/device_authorization + #device-verification-uri: http://192.168.218.2:33336/oauth2/device_verification + #device-verification-endpoint: http://192.168.218.2:33336/oauth2/device_verification authentication: form-login: category: HUTOOL_GIF @@ -1473,7 +1473,7 @@ management: # enabled: true # zipkin: # enabled: true -# base-url: http://127.0.0.1:9411/ +# base-url: http://192.168.218.2:9411/ # discoveryClientEnabled: false # sender: # type: WEB @@ -1558,7 +1558,7 @@ kylin: primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper redisson: true #是否开启redisson 默认true #zookeeper: - # zk-servers: 127.0.0.1:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper + # zk-servers: 192.168.218.2:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper # session-timeout: 60000 #会话超时时间，默认值60000 单位：毫秒 # connection-timeout: 15000 #连接超时时间，默认值15000 单位：毫秒 # base-sleep-time-ms: 5000 #初始sleep时间，默认值5000 单位：毫秒 @@ -1703,11 +1703,11 @@ grpc: #inProcess: # address: in-process:test #这允许客户端在同一应用程序内使用以下配置连接到服务器： grpc-server: - address: 'static://127.0.0.1:9899' + address: 'static://192.168.218.2:9899' # 服务名（不同服务名可对应不同配置） #grpc-sb-server: # # 服务端地址 - # address: 'static://127.0.0.1:9898' + # address: 'static://192.168.218.2:9898' # # 是否开启保持连接（长连接） # enableKeepAlive: true # # 保持连接时长（默认20s） @@ -1725,17 +1725,17 @@ herodotus: endpoint: uaa-service-name: dante-cloud-uaa upms-service-name: dante-cloud-upms - gateway-service-uri: http://127.0.0.1:33336 - uaa-service-uri: http://127.0.0.1:33336/ - upms-service-uri: http://127.0.0.1:33336/${herodotus.endpoint.upms-service-name} - access-token-uri: http://127.0.0.1:33336/oauth2/token - authorization-uri: http://127.0.0.1:33336/oauth2/authorize - token-revocation-uri: http://127.0.0.1:33336/oauth2/revoke - token-introspection-uri: http://127.0.0.1:33336/oauth2/introspect - jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks + gateway-service-uri: http://192.168.218.2:33336 + uaa-service-uri: http://192.168.218.2:33336/ + upms-service-uri: http://192.168.218.2:33336/${herodotus.endpoint.upms-service-name} + access-token-uri: http://192.168.218.2:33336/oauth2/token + authorization-uri: http://192.168.218.2:33336/oauth2/authorize + token-revocation-uri: http://192.168.218.2:33336/oauth2/revoke + token-introspection-uri: http://192.168.218.2:33336/oauth2/introspect + jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks issuer-uri: ${herodotus.endpoint.uaa-service-uri} - oidc-client-registration-uri: http://127.0.0.1:33336/connect/register - oidc-user-info-uri: http://127.0.0.1:33336/userinfo + oidc-client-registration-uri: http://192.168.218.2:33336/connect/register + oidc-user-info-uri: http://192.168.218.2:33336/userinfo oauth2: authentication: form-login: diff --git a/taotao-cloud-ddd-assembly/src/main/resources/application-pre.yml b/taotao-cloud-ddd-assembly/src/main/resources/application-pre.yml index a274a01..f957e31 100644 --- a/taotao-cloud-ddd-assembly/src/main/resources/application-pre.yml +++ b/taotao-cloud-ddd-assembly/src/main/resources/application-pre.yml @@ -41,7 +41,7 @@ jetcache: # minIdle: 5 # maxIdle: 20 # maxTotal: 50 - # host: 127.0.0.1 + # host: 192.168.218.2 # port: 6379 easy-es: @@ -167,9 +167,9 @@ redisson: #监测DNS的变化情况的时间间隔。 dnsMonitoringInterval: 5000 #服务器节点地址.必填 - #redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379 - #redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380 - #redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381 + #redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379 + #redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380 + #redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381 nodeAddresses: - "192.168.10.200:6381" - "192.168.10.200:6382" @@ -253,7 +253,7 @@ arthas: # ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志 telnetPort: -1 httpPort: -1 - # 127.0.0.1只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 + # 192.168.218.2只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 ip: 0.0.0.0 agent-id: ${spring.application.name} app-name: ${spring.application.name} @@ -840,7 +840,7 @@ spring: oauth2: resourceserver: jwt: - jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks + jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks shardingsphere: enabled: false schema: @@ -1446,7 +1446,7 @@ kylin: primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper redisson: true #是否开启redisson 默认true #zookeeper: - # zk-servers: 127.0.0.1:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper + # zk-servers: 192.168.218.2:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper # session-timeout: 60000 #会话超时时间，默认值60000 单位：毫秒 # connection-timeout: 15000 #连接超时时间，默认值15000 单位：毫秒 # base-sleep-time-ms: 5000 #初始sleep时间，默认值5000 单位：毫秒 diff --git a/taotao-cloud-ddd-assembly/src/main/resources/application-pro.yml b/taotao-cloud-ddd-assembly/src/main/resources/application-pro.yml index 46ad268..a12c883 100644 --- a/taotao-cloud-ddd-assembly/src/main/resources/application-pro.yml +++ b/taotao-cloud-ddd-assembly/src/main/resources/application-pro.yml @@ -41,7 +41,7 @@ jetcache: # minIdle: 5 # maxIdle: 20 # maxTotal: 50 - # host: 127.0.0.1 + # host: 192.168.218.2 # port: 6379 easy-es: @@ -167,9 +167,9 @@ redisson: #监测DNS的变化情况的时间间隔。 dnsMonitoringInterval: 5000 #服务器节点地址.必填 - #redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379 - #redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380 - #redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381 + #redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379 + #redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380 + #redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381 nodeAddresses: - "192.168.10.200:6381" - "192.168.10.200:6382" @@ -253,7 +253,7 @@ arthas: # ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志 telnetPort: -1 httpPort: -1 - # 127.0.0.1只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 + # 192.168.218.2只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 ip: 0.0.0.0 agent-id: ${spring.application.name} app-name: ${spring.application.name} @@ -840,7 +840,7 @@ spring: oauth2: resourceserver: jwt: - jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks + jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks shardingsphere: enabled: false schema: @@ -1446,7 +1446,7 @@ kylin: primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper redisson: true #是否开启redisson 默认true #zookeeper: - # zk-servers: 127.0.0.1:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper + # zk-servers: 192.168.218.2:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper # session-timeout: 60000 #会话超时时间，默认值60000 单位：毫秒 # connection-timeout: 15000 #连接超时时间，默认值15000 单位：毫秒 # base-sleep-time-ms: 5000 #初始sleep时间，默认值5000 单位：毫秒 diff --git a/taotao-cloud-ddd-assembly/src/main/resources/application-test.yml b/taotao-cloud-ddd-assembly/src/main/resources/application-test.yml index e945098..b262870 100644 --- a/taotao-cloud-ddd-assembly/src/main/resources/application-test.yml +++ b/taotao-cloud-ddd-assembly/src/main/resources/application-test.yml @@ -41,7 +41,7 @@ jetcache: # minIdle: 5 # maxIdle: 20 # maxTotal: 50 - # host: 127.0.0.1 + # host: 192.168.218.2 # port: 6379 easy-es: @@ -167,9 +167,9 @@ redisson: #监测DNS的变化情况的时间间隔。 dnsMonitoringInterval: 5000 #服务器节点地址.必填 - #redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379 - #redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380 - #redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381 + #redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379 + #redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380 + #redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381 nodeAddresses: - "192.168.10.200:6381" - "192.168.10.200:6382" @@ -253,7 +253,7 @@ arthas: # ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志 telnetPort: -1 httpPort: -1 - # 127.0.0.1只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 + # 192.168.218.2只能本地访问，0.0.0.0则可网络访问，但是存在安全问题 ip: 0.0.0.0 agent-id: ${spring.application.name} app-name: ${spring.application.name} @@ -840,7 +840,7 @@ spring: oauth2: resourceserver: jwt: - jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks + jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks shardingsphere: enabled: false schema: @@ -1446,7 +1446,7 @@ kylin: primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper redisson: true #是否开启redisson 默认true #zookeeper: - # zk-servers: 127.0.0.1:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper + # zk-servers: 192.168.218.2:2181 #zk的server地址，多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper # session-timeout: 60000 #会话超时时间，默认值60000 单位：毫秒 # connection-timeout: 15000 #连接超时时间，默认值15000 单位：毫秒 # base-sleep-time-ms: 5000 #初始sleep时间，默认值5000 单位：毫秒 diff --git a/taotao-cloud-ddd-assembly/src/main/resources/bootstrap-dev.yml b/taotao-cloud-ddd-assembly/src/main/resources/bootstrap-dev.yml index 2224a88..3186efe 100644 --- a/taotao-cloud-ddd-assembly/src/main/resources/bootstrap-dev.yml +++ b/taotao-cloud-ddd-assembly/src/main/resources/bootstrap-dev.yml @@ -27,7 +27,7 @@ spring: enabled: true nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.218.2:8848 metadata: version: ${ttcVersion} user.name: "admin" @@ -40,7 +40,7 @@ spring: naming-load-cache-at-start: false config: enabled: true - server-addr: 127.0.0.1:8848 + server-addr: 192.168.218.2:8848 namespace: 82f5c2ff-c0d5-478d-9987-7f082d1a55d7 username: nacos password: nacos @@ -60,7 +60,7 @@ spring: # #流控 名称随意 # flow: # nacos: - # server-addr: 127.0.0.1:8848 + # server-addr: 192.168.218.2:8848 # dataId: ${spring.application.name}-flow-rules.json # namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f # username: nacos @@ -72,7 +72,7 @@ spring: # #熔断降级 名称随意 # degrade: # nacos: - # server-addr: 127.0.0.1:8848 + # server-addr: 192.168.218.2:8848 # dataId: ${spring.application.name}-degrade-rules.json # namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f # username: nacos @@ -83,7 +83,7 @@ spring: # #系统规则 名称随意 # system: # nacos: - # server-addr: 127.0.0.1:8848 + # server-addr: 192.168.218.2:8848 # dataId: ${spring.application.name}-dddtem-rules.json # namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f # username: nacos @@ -94,7 +94,7 @@ spring: # #授权规则 名称随意 # authority: # nacos: - # server-addr: 127.0.0.1:8848 + # server-addr: 192.168.218.2:8848 # dataId: ${spring.application.name}-authority-rules.json # namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f # username: nacos @@ -105,7 +105,7 @@ spring: # #参数规则 名称随意 # param-flow: # nacos: - # server-addr: 127.0.0.1:8848 + # server-addr: 192.168.218.2:8848 # dataId: ${spring.application.name}-param-flow-rules.json # namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f # username: nacos @@ -114,7 +114,7 @@ spring: # data-type: json # rule-type: param-flow transport: - dashboard: 127.0.0.1:8858 + dashboard: 192.168.218.2:8858 port: 8712 metric: file-single-size: 1024 * 1024 * 50 diff --git a/taotao-cloud-ddd-assembly/src/main/resources/smart-doc.json b/taotao-cloud-ddd-assembly/src/main/resources/smart-doc.json index 96fda86..a120c60 100644 --- a/taotao-cloud-ddd-assembly/src/main/resources/smart-doc.json +++ b/taotao-cloud-ddd-assembly/src/main/resources/smart-doc.json @@ -1,5 +1,5 @@ { - "serverUrl": "http://127.0.0.1", + "serverUrl": "http://192.168.218.2", "serverEnv": "http://{{server}}", "pathPrefix": "", "isStrict": false, @@ -32,7 +32,7 @@ "isReplace": true, "openUrl": "http://localhost:7700/api", "debugEnvName": "测试环境", - "debugEnvUrl": "http://127.0.0.1", + "debugEnvUrl": "http://192.168.218.2", "tornaDebug": false, "ignoreRequestParams": [ "org.springframework.ui.ModelMap"