From 88e864b7f068fc20490148e15abd5bb6eb7ab44b Mon Sep 17 00:00:00 2001 From: fuzhengwei <184172133@qq.com> Date: Sun, 11 May 2025 10:15:03 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8F=91=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20jdk17=20v1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scaffold-lite/README.md | 4 +- scaffold-lite/pom.xml | 240 +++++++++--------- .../__rootArtifactId__-api/pom.xml | 2 - .../__rootArtifactId__-app/.local-config | 2 + .../__rootArtifactId__-app/Dockerfile | 4 +- .../__rootArtifactId__-app/push.sh | 41 +++ .../__rootArtifactId__-domain/pom.xml | 12 - .../__rootArtifactId__-infrastructure/pom.xml | 16 +- .../__rootArtifactId__-trigger/pom.xml | 14 - .../__rootArtifactId__-types/pom.xml | 14 - .../docker-compose-environment-aliyun.yml | 1 + .../dev-ops/docker-compose-environment.yml | 1 + .../docs/dev-ops/mysql/my.cnf | 24 ++ .../resources/archetype-resources/pom.xml | 12 +- 14 files changed, 205 insertions(+), 182 deletions(-) create mode 100644 scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/.local-config create mode 100644 scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/push.sh create mode 100644 scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/mysql/my.cnf diff --git a/scaffold-lite/README.md b/scaffold-lite/README.md index fe13437..46861dc 100644 --- a/scaffold-lite/README.md +++ b/scaffold-lite/README.md @@ -9,8 +9,8 @@ ### 1. 生成 ```shell -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 +md5 ddd-scaffold-lite-jdk17-1.0.pom > ddd-scaffold-lite-jdk17-1.0.pom.md5 +shasum ddd-scaffold-lite-jdk17-1.0.pom > ddd-scaffold-lite-jdk17-1.0.pom.sha1 ``` ```shell diff --git a/scaffold-lite/pom.xml b/scaffold-lite/pom.xml index 33e9b1c..c49aeb9 100644 --- a/scaffold-lite/pom.xml +++ b/scaffold-lite/pom.xml @@ -4,12 +4,38 @@ 4.0.0 io.github.fuzhengwei - ddd-scaffold-lite-v2 - 2.4 + ddd-scaffold-lite-jdk17 + 1.0 maven-archetype - ddd-scaffold-lite-v2 + ddd-scaffold-lite-jdk17-v1.0 + https://github.com/fuzhengwei/ddd-scaffold-lite + ddd scaffold lite ddd jdk 17 by xiaofuge + + + + Apache + https://opensource.org/license/apache-2-0/ + repo + + + + + + ossrh + fuzhengwei + 184172133@qq.com + https://github.com/fuzhengwei + xfg-wrench + https://github.com/fuzhengwei/ddd-scaffold-lite + + Project Manager + Developer + + Asia/Shanghai + + 1.8 @@ -29,71 +55,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + ${maven-checksum-plugin.version} + + + create-checksums + + artifacts + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + UTF-8 + true + UTF-8 + UTF-8 + + + + attach-javadocs + + jar + + + -Xdoclint:none + + /Library/Java/JavaVirtualMachines/jdk1.8.0_311.jdk/Contents/Home/bin/javadoc + + + + + org.apache.maven.plugins @@ -106,57 +132,39 @@ deploy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ddd scaffold lite by xiaofuge - https://spring.io/projects/spring-boot/xfg-frame-archetype - - - fuzhengwei - 184172133@qq.com - fuzhengwei - https://github.com/fuzhengwei - - + + - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + -Xdoclint:none + + /Library/Java/JavaVirtualMachines/jdk1.8.0_311.jdk/Contents/Home/bin/javadoc + + + + + + + + + https://github.com/spring-projects/spring-boot/xfg-frame-archetype diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml index f004ba8..978eb3c 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml @@ -13,12 +13,10 @@ org.projectlombok lombok - 1.18.26 jakarta.validation jakarta.validation-api - 3.0.2 diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/.local-config b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/.local-config new file mode 100644 index 0000000..48812d6 --- /dev/null +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/.local-config @@ -0,0 +1,2 @@ +ALIYUN_USERNAME=你的账号 +ALIYUN_PASSWORD=你的密码 \ No newline at end of file diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile index 1b41401..faeac44 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile @@ -1,5 +1,5 @@ -# 基础镜像 -FROM openjdk:8-jre-slim +# 基础镜像，可以先执行 docker pull openjdk:17-jdk-slim +FROM openjdk:17-jdk-slim # 作者 MAINTAINER xiaofuge diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/push.sh b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/push.sh new file mode 100644 index 0000000..cff35ce --- /dev/null +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/push.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# https://cr.console.aliyun.com/cn-hangzhou/instance/credentials + +# Ensure the script exits if any command fails +set -e + +# Define variables for the registry and image +ALIYUN_REGISTRY="registry.cn-hangzhou.aliyuncs.com" +NAMESPACE="system" +IMAGE_NAME="${artifactId}" +IMAGE_TAG="${version}" + +# 读取本地配置文件 +if [ -f ".local-config" ]; then + source .local-config +else + echo ".local-config 文件不存在，请创建并填写 ALIYUN_USERNAME 和 ALIYUN_PASSWORD" + exit 1 +fi + +# Login to Aliyun Docker Registry +echo "Logging into Aliyun Docker Registry..." +docker login --username="${ALIYUN_USERNAME}" --password="${ALIYUN_PASSWORD}" $ALIYUN_REGISTRY + +# Tag the Docker image +echo "Tagging the Docker image..." +docker tag ${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${ALIYUN_REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} + +# Push the Docker image to Aliyun +echo "Pushing the Docker image to Aliyun..." +docker push ${ALIYUN_REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} + +echo "Docker image pushed successfully! " + +echo "检出地址：docker pull ${ALIYUN_REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" +echo "标签设置：docker tag ${ALIYUN_REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} ${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + +# Logout from Aliyun Docker Registry +echo "Logging out from Aliyun Docker Registry..." +docker logout $ALIYUN_REGISTRY diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml index bcb18a7..a2dab4e 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml @@ -48,18 +48,6 @@ ${rootArtifactId}-domain - - org.apache.maven.plugins - maven-archetype-plugin - 3.2.0 - - - - create-from-project - - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml index a3f7ba3..cfec187 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml @@ -14,10 +14,12 @@ org.mybatis.spring.boot mybatis-spring-boot-starter + org.projectlombok lombok + ${groupId} @@ -27,20 +29,6 @@ ${rootArtifactId}-infrastructure - - - org.apache.maven.plugins - maven-archetype-plugin - 3.2.0 - - - - create-from-project - - - - - 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 f42f809..169f543 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 @@ -44,20 +44,6 @@ ${rootArtifactId}-trigger - - - org.apache.maven.plugins - maven-archetype-plugin - 3.2.0 - - - - create-from-project - - - - - diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-types/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-types/pom.xml index a11d72e..161bbca 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-types/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-types/pom.xml @@ -34,20 +34,6 @@ ${rootArtifactId}-types - - - org.apache.maven.plugins - maven-archetype-plugin - 3.2.0 - - - - create-from-project - - - - - 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 index 87bdbe0..60ef9c0 100644 --- 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 @@ -13,6 +13,7 @@ services: ports: - "13306:3306" volumes: + - ./mysql/my.cnf:/etc/mysql/conf.d/mysql.cnf:ro - ./mysql/sql:/docker-entrypoint-initdb.d healthcheck: test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] 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 2a270b8..4d1cae6 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 @@ -13,6 +13,7 @@ services: ports: - "13306:3306" volumes: + - ./mysql/my.cnf:/etc/mysql/conf.d/mysql.cnf:ro - ./mysql/sql:/docker-entrypoint-initdb.d healthcheck: test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] diff --git a/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/mysql/my.cnf b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/mysql/my.cnf new file mode 100644 index 0000000..0768a14 --- /dev/null +++ b/scaffold-lite/src/main/resources/archetype-resources/docs/dev-ops/mysql/my.cnf @@ -0,0 +1,24 @@ +[client] +port = 3306 +default-character-set = utf8mb4 + +[mysqld] +user = mysql +port = 3306 +sql_mode = NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +default-storage-engine = InnoDB +default-authentication-plugin = mysql_native_password +character-set-server = utf8mb4 +collation-server = utf8mb4_unicode_ci +init_connect = 'SET NAMES utf8mb4' + +slow_query_log +#long_query_time = 3 +slow-query-log-file = /var/log/mysql/mysql.slow.log +log-error = /var/log/mysql/mysql.error.log + +default-time-zone = '+8:00' + +[mysql] +default-character-set = utf8mb4 \ No newline at end of file diff --git a/scaffold-lite/src/main/resources/archetype-resources/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/pom.xml index 0ca97f1..bc8b7c2 100644 --- a/scaffold-lite/src/main/resources/archetype-resources/pom.xml +++ b/scaffold-lite/src/main/resources/archetype-resources/pom.xml @@ -31,10 +31,10 @@ - 1.8 + 17 UTF-8 - 8 - 8 + 17 + 17 UTF-8 @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.12 + 3.4.3 @@ -65,7 +65,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.1.4 + 3.0.4