From 607cec67efa7431fdd8e8ab1107081f91e713615 Mon Sep 17 00:00:00 2001 From: john Date: Sat, 13 May 2023 18:51:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E6=8C=81Docker=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E6=89=93=E5=8C=85=EF=BC=8Cdocker-compose=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ballcat-codegen-backend/Dockerfile | 17 ++++++++++++++ ballcat-codegen-backend/docker-compose.yml | 20 +++++++++++++++++ ballcat-codegen-backend/pom.xml | 22 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 7 +++--- .../src/main/resources/application-prod.yml | 5 +++++ .../src/main/resources/logback-spring.xml | 2 +- ballcat-codegen-frontend/components.d.ts | 1 + pom.xml | 6 +++++ 8 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 ballcat-codegen-backend/Dockerfile create mode 100644 ballcat-codegen-backend/docker-compose.yml create mode 100644 ballcat-codegen-backend/src/main/resources/application-prod.yml diff --git a/ballcat-codegen-backend/Dockerfile b/ballcat-codegen-backend/Dockerfile new file mode 100644 index 0000000..d8be1f5 --- /dev/null +++ b/ballcat-codegen-backend/Dockerfile @@ -0,0 +1,17 @@ +FROM openjdk:8 +MAINTAINER john + +ENV TZ 'Asia/Shanghai' +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +VOLUME /tmp + +ARG JAR_FILE +ADD target/${JAR_FILE} /workspace/app.jar + +EXPOSE 8080 +ENTRYPOINT ["java","-jar","-Dfile.encoding=UTF-8","-Dsun.jnu.encoding=UTF-8","/workspace/app.jar"] \ No newline at end of file diff --git a/ballcat-codegen-backend/docker-compose.yml b/ballcat-codegen-backend/docker-compose.yml new file mode 100644 index 0000000..8c2abef --- /dev/null +++ b/ballcat-codegen-backend/docker-compose.yml @@ -0,0 +1,20 @@ +version: "3.9" + +services: + datatrace: + image: ballcat-codegen:latest + container_name: ballcat-codegen + restart: always + ports: + - "7777:7777" + volumes: + - "./logs:/workspace/logs" + environment: + - TZ=Asia/Shanghai + - LANG=en_US.UTF-8 + - JAVA_OPTS=-Xmx256m -Xms256m -Xmn256m -Xss1m + - DB_HOST=192.168.1.66 + - DB_PORT=3306 + - DB_NAME=ballcat_codegen + - DB_USER=root + - DB_PASSWORD=root diff --git a/ballcat-codegen-backend/pom.xml b/ballcat-codegen-backend/pom.xml index bdbd7ad..148f116 100644 --- a/ballcat-codegen-backend/pom.xml +++ b/ballcat-codegen-backend/pom.xml @@ -105,6 +105,7 @@ + ballcat-codegen true @@ -189,6 +190,27 @@ + + + com.spotify + dockerfile-maven-plugin + + + default + + + build + + + + + ballcat-codegen + latest + + ${project.build.finalName}.jar + + + \ No newline at end of file diff --git a/ballcat-codegen-backend/src/main/resources/application-dev.yml b/ballcat-codegen-backend/src/main/resources/application-dev.yml index bef7f37..226ba48 100644 --- a/ballcat-codegen-backend/src/main/resources/application-dev.yml +++ b/ballcat-codegen-backend/src/main/resources/application-dev.yml @@ -1,6 +1,5 @@ spring: datasource: - url: jdbc:mysql://mysql:3306/ballcat_codegen?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&createDatabaseIfNotExist=true - username: root - password: '123456' - + url: jdbc:mysql://${DB_HOST:ballcat-mysql}:${DB_PORT:3306}/${DB_NAME:ballcat_codegen}?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&createDatabaseIfNotExist=true + username: ${DB_USER:root} + password: ${DB_PASSWORD:123456} diff --git a/ballcat-codegen-backend/src/main/resources/application-prod.yml b/ballcat-codegen-backend/src/main/resources/application-prod.yml new file mode 100644 index 0000000..226ba48 --- /dev/null +++ b/ballcat-codegen-backend/src/main/resources/application-prod.yml @@ -0,0 +1,5 @@ +spring: + datasource: + url: jdbc:mysql://${DB_HOST:ballcat-mysql}:${DB_PORT:3306}/${DB_NAME:ballcat_codegen}?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&createDatabaseIfNotExist=true + username: ${DB_USER:root} + password: ${DB_PASSWORD:123456} diff --git a/ballcat-codegen-backend/src/main/resources/logback-spring.xml b/ballcat-codegen-backend/src/main/resources/logback-spring.xml index 6c1dfa4..a56dda7 100644 --- a/ballcat-codegen-backend/src/main/resources/logback-spring.xml +++ b/ballcat-codegen-backend/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - + diff --git a/ballcat-codegen-frontend/components.d.ts b/ballcat-codegen-frontend/components.d.ts index eed31f3..d523942 100644 --- a/ballcat-codegen-frontend/components.d.ts +++ b/ballcat-codegen-frontend/components.d.ts @@ -21,6 +21,7 @@ declare module '@vue/runtime-core' { ADescriptionsItem: typeof import('ant-design-vue/es')['DescriptionsItem'] ADirectoryTree: typeof import('ant-design-vue/es')['DirectoryTree'] ADivider: typeof import('ant-design-vue/es')['Divider'] + AEmpty: typeof import('ant-design-vue/es')['Empty'] AForm: typeof import('ant-design-vue/es')['Form'] AFormItem: typeof import('ant-design-vue/es')['FormItem'] AInput: typeof import('ant-design-vue/es')['Input'] diff --git a/pom.xml b/pom.xml index db4cf3a..79b9bd8 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,12 @@ 1.4.1 true + + 1.8 + ${java.version} + ${java.version} + UTF-8 + UTF-8 -- Gitee From 39e8475bf6f27f51c10024649ad555c3b15e679c Mon Sep 17 00:00:00 2001 From: john Date: Sat, 13 May 2023 19:01:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/README.md b/README.md index 1ee9ca6..f36a0de 100644 --- a/README.md +++ b/README.md @@ -43,3 +43,63 @@ com/hccake/ballcat/codegen/GeneratorApplication.java +##### Docker打包 + +采用 dockerfile-maven-plugin 插件生成 docker 镜像 + +``` + + com.spotify + dockerfile-maven-plugin + + + default + + + build + + + + + ballcat-codegen + latest + + ${project.build.finalName}.jar + + + +``` + +执行 `mvn clean package` 打包命令时会根据后端项目根目录下的 Dockerfile 自动构建 docker 镜像。 + + + +##### docker-compose部署 + +修改后端项目根目录下的 docker-compose.yml，配置你的数据库信息 + +``` +version: "3.9" + +services: + datatrace: + image: ballcat-codegen:latest + container_name: ballcat-codegen + restart: always + ports: + - "7777:7777" + volumes: + - "./logs:/workspace/logs" + environment: + - TZ=Asia/Shanghai + - LANG=en_US.UTF-8 + - JAVA_OPTS=-Xmx256m -Xms256m -Xmn256m -Xss1m + - DB_HOST=192.168.1.66 + - DB_PORT=3306 + - DB_NAME=ballcat_codegen + - DB_USER=root + - DB_PASSWORD=root + +``` + +终端切换到 docker-compose.yml 所在目录，执行 `docker-compose up -d` 一键部署。 -- Gitee From d4a6f94372df4c1e9a8686beaa1b6176350a3e69 Mon Sep 17 00:00:00 2001 From: john Date: Sun, 14 May 2023 11:18:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=9C=8D=E5=8A=A1=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ballcat-codegen-backend/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballcat-codegen-backend/docker-compose.yml b/ballcat-codegen-backend/docker-compose.yml index 8c2abef..313295a 100644 --- a/ballcat-codegen-backend/docker-compose.yml +++ b/ballcat-codegen-backend/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: - datatrace: + codegen: image: ballcat-codegen:latest container_name: ballcat-codegen restart: always -- Gitee From 9c2ad6f6c74f9ee274eaf299325182e255b9b9e7 Mon Sep 17 00:00:00 2001 From: john Date: Sun, 14 May 2023 11:29:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f36a0de..0978db1 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ com/hccake/ballcat/codegen/GeneratorApplication.java ##### Docker打包 -采用 dockerfile-maven-plugin 插件生成 docker 镜像 +采用 dockerfile-maven-plugin 插件生成 docker 镜像，所在路径 ballcat-codegen-backend/pom.xml ``` @@ -70,19 +70,19 @@ com/hccake/ballcat/codegen/GeneratorApplication.java ``` -执行 `mvn clean package` 打包命令时会根据后端项目根目录下的 Dockerfile 自动构建 docker 镜像。 +执行 `mvn clean package` 打包命令时会根据 ballcat-codegen-backend 根目录下的 Dockerfile 自动构建 docker 镜像。 ##### docker-compose部署 -修改后端项目根目录下的 docker-compose.yml，配置你的数据库信息 +打开 ballcat-codegen-backend 根目录下的 docker-compose.yml文件，修改环境变量配置你的数据库连接信息 ``` version: "3.9" services: - datatrace: + codegen: image: ballcat-codegen:latest container_name: ballcat-codegen restart: always -- Gitee