From 54f0a2eb743fd47b686d2befbeaef37b710b1800 Mon Sep 17 00:00:00 2001 From: fuzhengwei <184172133@qq.com> Date: Tue, 1 Oct 2024 19:03:37 +0800 Subject: [PATCH] feat: v2.4 --- scaffold-lite/README.md | 4 +- scaffold-lite/pom.xml | 2 +- .../resources/archetype-resources/README.md | 10 ++- .../__rootArtifactId__-trigger/pom.xml | 4 + .../docs/dev-ops/docker-compose-app.yml | 8 +- .../docker-compose-environment-aliyun.yml | 87 +++++++++++++++++++ .../dev-ops/docker-compose-environment.yml | 18 +--- .../resources/archetype-resources/pom.xml | 5 ++ 8 files changed, 119 insertions(+), 19 deletions(-) create mode 100644 scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment-aliyun.yml diff --git a/scaffold-lite/README.md b/scaffold-lite/README.md index b55eb1a..de1e94d 100644 --- a/scaffold-lite/README.md +++ b/scaffold-lite/README.md @@ -5,8 +5,8 @@ ### 1. 生成 ```shell -md5 ddd-scaffold-lite-2.3.pom > ddd-scaffold-lite-2.3.pom.md5 -shasum ddd-scaffold-lite-2.3.pom > ddd-scaffold-lite-2.3.pom.sha1 +md5 ddd-scaffold-lite-v2-2.4.pom > ddd-scaffold-lite-v2-2.4.pom.md5 +shasum ddd-scaffold-lite-v2-2.4.pom > ddd-scaffold-lite-v2-2.4.pom.sha1 ``` ```shell diff --git a/scaffold-lite/pom.xml b/scaffold-lite/pom.xml index b54cc1d..7880b55 100644 --- a/scaffold-lite/pom.xml +++ b/scaffold-lite/pom.xml @@ -5,7 +5,7 @@ io.github.fuzhengwei ddd-scaffold-lite-v2 - 2.1 + 2.4 maven-archetype diff --git a/scaffold-lite/src/main/resources/archetype-resources/README.md b/scaffold-lite/src/main/resources/archetype-resources/README.md index 48264e4..35e0c19 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/README.md +++ b/scaffold-lite/src/main/resources/archetype-resources/README.md @@ -1,2 +1,10 @@ -# xfg-frame-archetype - DDD 脚手架 +# xfg-frame-archetype - DDD 脚手架 - @小傅哥 v2.2 + +- docker 使用文档：[https://bugstack.cn/md/road-map/docker.html](https://bugstack.cn/md/road-map/docker.html) +- DDD 教程； + - [DDD 概念理论](https://bugstack.cn/md/road-map/ddd-guide-01.html) + - [DDD 建模方法](https://bugstack.cn/md/road-map/ddd-guide-02.html) + - [DDD 工程模型](https://bugstack.cn/md/road-map/ddd-guide-03.html) + - [DDD 架构设计](https://bugstack.cn/md/road-map/ddd.html) + - [DDD 建模案例](https://bugstack.cn/md/road-map/ddd-model.html) diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-trigger/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-trigger/pom.xml index c73d6cd..f42f809 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-trigger/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-trigger/pom.xml @@ -28,6 +28,10 @@ + + ${groupId} + ${rootArtifactId}-api + ${groupId} ${rootArtifactId}-types diff --git a/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-app.yml b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-app.yml index 3bda59f..7f97487 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-app.yml +++ b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-app.yml @@ -18,4 +18,10 @@ services: driver: "json-file" options: max-size: "10m" - max-file: "3" \ No newline at end of file + max-file: "3" + networks: + - my-network + +networks: + my-network: + driver: bridge diff --git a/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment-aliyun.yml b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment-aliyun.yml new file mode 100644 index 0000000..87bdbe0 --- /dev/null +++ b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment-aliyun.yml @@ -0,0 +1,87 @@ +# 命令执行 docker-compose -f docker-compose-environment-aliyun.yml up -d +# docker 代理和使用文档；https://bugstack.cn/md/road-map/docker.html +version: '3.9' +services: + mysql: + image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/mysql:8.0.32 + container_name: mysql + command: --default-authentication-plugin=mysql_native_password + restart: always + environment: + TZ: Asia/Shanghai + MYSQL_ROOT_PASSWORD: 123456 + ports: + - "13306:3306" + volumes: + - ./mysql/sql:/docker-entrypoint-initdb.d + healthcheck: + test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] + interval: 5s + timeout: 10s + retries: 10 + start_period: 15s + networks: + - my-network + + # phpmyadmin https://hub.docker.com/_/phpmyadmin + phpmyadmin: + image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/phpmyadmin:5.2.1 + container_name: phpmyadmin + hostname: phpmyadmin + ports: + - 8899:80 + environment: + - PMA_HOST=mysql + - PMA_PORT=3306 + - MYSQL_ROOT_PASSWORD=123qwe!@#QWE + depends_on: + mysql: + condition: service_healthy + networks: + - my-network + + # Redis + redis: + image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/redis:6.2 + container_name: redis + restart: always + hostname: redis + privileged: true + ports: + - 16379:6379 + volumes: + - ./redis/redis.conf:/usr/local/etc/redis/redis.conf + command: redis-server /usr/local/etc/redis/redis.conf + networks: + - my-network + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + interval: 10s + timeout: 5s + retries: 3 + + # RedisAdmin https://github.com/joeferner/redis-commander + # 账密 admin/admin + redis-admin: + image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/redis-commander:0.8.0 + container_name: redis-admin + hostname: redis-commander + restart: always + ports: + - 8081:8081 + environment: + - REDIS_HOSTS=local:redis:6379 + - HTTP_USER=admin + - HTTP_PASSWORD=admin + - LANG=C.UTF-8 + - LANGUAGE=C.UTF-8 + - LC_ALL=C.UTF-8 + networks: + - my-network + depends_on: + redis: + condition: service_healthy + +networks: + my-network: + driver: bridge \ No newline at end of file diff --git a/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment.yml b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment.yml index 61a90ce..2a270b8 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment.yml +++ b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/docker-compose-environment.yml @@ -1,4 +1,5 @@ -# 命令执行 docker-compose -f docker-compose-environment.yml up -d +# 命令执行 docker-compose -f docker-compose-environment-aliyun.yml up -d +# docker 代理和使用文档；https://bugstack.cn/md/road-map/docker.html version: '3.9' services: mysql: @@ -9,10 +10,6 @@ services: environment: TZ: Asia/Shanghai MYSQL_ROOT_PASSWORD: 123456 - networks: - - my-network - depends_on: - - mysql-job-dbdata ports: - "13306:3306" volumes: @@ -23,15 +20,8 @@ services: timeout: 10s retries: 10 start_period: 15s - volumes_from: - - mysql-job-dbdata - - # 自动加载数据 - mysql-job-dbdata: - image: alpine:3.18.2 - container_name: mysql-job-dbdata - volumes: - - /var/lib/mysql + networks: + - my-network # phpmyadmin https://hub.docker.com/_/phpmyadmin phpmyadmin: diff --git a/scaffold-lite/src/main/resources/archetype-resources/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/pom.xml index 11d7f4b..0ca97f1 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/pom.xml @@ -117,6 +117,11 @@ + + ${groupId} + ${rootArtifactId}-api + ${version} + ${groupId} ${rootArtifactId}-domain -- GitLab