From 98c9c358e7e65c714fa4061dbf98317bbc062268 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Thu, 14 Nov 2024 18:55:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4docker=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docker/copy.sh | 18 +++++++++--------- docker/docker-compose.yml | 2 +- docker/mysql/dockerfile | 2 +- docker/nacos/conf/application.properties | 4 ++-- docker/nacos/dockerfile | 2 +- docker/nginx/conf/nginx.conf | 4 ++-- docker/nginx/dockerfile | 10 +++++----- docker/redis/dockerfile | 10 +++++----- docker/{ruoyi => wfc}/auth/dockerfile | 10 +++++----- docker/{ruoyi => wfc}/auth/jar/readme.txt | 0 docker/{ruoyi => wfc}/gateway/dockerfile | 10 +++++----- docker/{ruoyi => wfc}/gateway/jar/readme.txt | 0 docker/{ruoyi => wfc}/modules/file/dockerfile | 10 +++++----- .../{ruoyi => wfc}/modules/file/jar/readme.txt | 0 docker/{ruoyi => wfc}/modules/gen/dockerfile | 10 +++++----- .../{ruoyi => wfc}/modules/gen/jar/readme.txt | 0 docker/{ruoyi => wfc}/modules/job/dockerfile | 10 +++++----- .../{ruoyi => wfc}/modules/job/jar/readme.txt | 0 .../{ruoyi => wfc}/modules/system/dockerfile | 10 +++++----- .../modules/system/jar/readme.txt | 0 .../{ruoyi => wfc}/visual/monitor/dockerfile | 10 +++++----- .../visual/monitor/jar/readme.txt | 0 sql/wfc-cloud.sql | 3 +++ sql/wfc-config.sql | 3 +++ 25 files changed, 68 insertions(+), 62 deletions(-) rename docker/{ruoyi => wfc}/auth/dockerfile (57%) rename docker/{ruoyi => wfc}/auth/jar/readme.txt (100%) rename docker/{ruoyi => wfc}/gateway/dockerfile (57%) rename docker/{ruoyi => wfc}/gateway/jar/readme.txt (100%) rename docker/{ruoyi => wfc}/modules/file/dockerfile (56%) rename docker/{ruoyi => wfc}/modules/file/jar/readme.txt (100%) rename docker/{ruoyi => wfc}/modules/gen/dockerfile (57%) rename docker/{ruoyi => wfc}/modules/gen/jar/readme.txt (100%) rename docker/{ruoyi => wfc}/modules/job/dockerfile (57%) rename docker/{ruoyi => wfc}/modules/job/jar/readme.txt (100%) rename docker/{ruoyi => wfc}/modules/system/dockerfile (55%) rename docker/{ruoyi => wfc}/modules/system/jar/readme.txt (100%) rename docker/{ruoyi => wfc}/visual/monitor/dockerfile (55%) rename docker/{ruoyi => wfc}/visual/monitor/jar/readme.txt (100%) diff --git a/README.md b/README.md index 734c71e..57d7507 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# WfcCloud-Vue-AntD +# Back-End at CRM ## 项目介绍 WfcCloud-Vue-AntD是一个基于Spring Cloud、OAuth2.0、Ant Design Vue的前后端分离的开发平台，提供了一整套微服务解决方案，包括核心模块如：组织机构、角色用户、菜单权限、网关路由、数据权限等，常用中间件如：日志脱敏、任务调度、短信邮箱、接口文档、代码生成等，高效稳定，极大的缩短研发周期，帮助企业快速构建业务系统。 diff --git a/docker/copy.sh b/docker/copy.sh index b6745e9..3c22375 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -9,8 +9,8 @@ usage() { # copy sql echo "begin copy sql " -cp ../sql/ry_20231130.sql ./mysql/db -cp ../sql/ry_config_20231204.sql ./mysql/db +cp ../sql/wfc-cloud.sql ./mysql/db +cp ../sql/wfc-config.sql ./mysql/db # copy html echo "begin copy html " @@ -19,23 +19,23 @@ cp -r ../wfc-ui/dist/** ./nginx/html/dist # copy jar echo "begin copy wfc-gateway " -cp ../wfc-gateway/target/wfc-gateway.jar ./ruoyi/gateway/jar +cp ../wfc-gateway/target/wfc-gateway.jar ./wfc/gateway/jar echo "begin copy wfc-auth " -cp ../wfc-auth/target/wfc-auth.jar ./ruoyi/auth/jar +cp ../wfc-auth/target/wfc-auth.jar ./wfc/auth/jar echo "begin copy wfc-visual " -cp ../wfc-visual/wfc-monitor/target/wfc-visual-monitor.jar ./ruoyi/visual/monitor/jar +cp ../wfc-visual/wfc-monitor/target/wfc-visual-monitor.jar ./wfc/visual/monitor/jar echo "begin copy wfc-modules-system " -cp ../wfc-modules/wfc-system/target/wfc-modules-system.jar ./ruoyi/modules/system/jar +cp ../wfc-modules/wfc-system/target/wfc-modules-system.jar ./wfc/modules/system/jar echo "begin copy wfc-modules-file " -cp ../wfc-modules/wfc-file/target/wfc-modules-file.jar ./ruoyi/modules/file/jar +cp ../wfc-modules/wfc-file/target/wfc-modules-file.jar ./wfc/modules/file/jar echo "begin copy wfc-modules-job " -cp ../wfc-modules/wfc-job/target/wfc-modules-job.jar ./ruoyi/modules/job/jar +cp ../wfc-modules/wfc-job/target/wfc-modules-job.jar ./wfc/modules/job/jar echo "begin copy wfc-modules-gen " -cp ../wfc-modules/wfc-gen/target/wfc-modules-gen.jar ./ruoyi/modules/gen/jar +cp ../wfc-modules/wfc-gen/target/wfc-modules-gen.jar ./wfc/modules/gen/jar diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a622de6..42705c7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -36,7 +36,7 @@ services: '--lower-case-table-names=1' ] environment: - MYSQL_DATABASE: 'ry-cloud' + MYSQL_DATABASE: 'wfc-cloud' MYSQL_ROOT_PASSWORD: 123456 wfc-redis: container_name: wfc-redis diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile index cc006f4..8683a7f 100644 --- a/docker/mysql/dockerfile +++ b/docker/mysql/dockerfile @@ -1,7 +1,7 @@ # 基础镜像 FROM mysql:5.7 # author -MAINTAINER ruoyi +MAINTAINER wfc # 执行sql脚本 ADD ./db/*.sql /docker-entrypoint-initdb.d/ diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index f1468f8..b81fcf0 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -1,6 +1,6 @@ spring.datasource.platform=mysql db.num=1 -db.url.0=jdbc:mysql://localhost:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.url.0=jdbc:mysql://localhost:3306/wfc-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.user=root db.password=123456 @@ -16,7 +16,7 @@ management.metrics.export.influx.enabled=false server.tomcat.accesslog.enabled=true server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i -server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs +server.tomcat.basedir=/home/wfc/nacos/tomcat/logs nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile index b74762c..e509e94 100644 --- a/docker/nacos/dockerfile +++ b/docker/nacos/dockerfile @@ -1,7 +1,7 @@ # 基础镜像 FROM nacos/nacos-server # author -MAINTAINER ruoyi +MAINTAINER wfc # 复制conf文件到路径 COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 83de2a3..e2ef5be 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -15,7 +15,7 @@ http { server_name localhost; location / { - root /home/ruoyi/projects/ruoyi-ui; + root /home/wfc/projects/wfc-ui; try_files $uri $uri/ /index.html; index index.html index.htm; } @@ -25,7 +25,7 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://ruoyi-gateway:8080/; + proxy_pass http://wfc-gateway:8080/; } # 避免actuator暴露 diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile index d5cbce1..ffe31bb 100644 --- a/docker/nginx/dockerfile +++ b/docker/nginx/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM nginx # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi/projects/wfc-ui +VOLUME /home/wfc/projects/wfc-ui # 创建目录 -RUN mkdir -p /home/ruoyi/projects/wfc-ui +RUN mkdir -p /home/wfc/projects/wfc-ui # 指定路径 -WORKDIR /home/ruoyi/projects/wfc-ui +WORKDIR /home/wfc/projects/wfc-ui # 复制conf文件到路径 COPY ./conf/nginx.conf /etc/nginx/nginx.conf # 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/wfc-ui +COPY ./html/dist /home/wfc/projects/wfc-ui diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile index 05c2bc4..9a227d6 100644 --- a/docker/redis/dockerfile +++ b/docker/redis/dockerfile @@ -1,13 +1,13 @@ # 基础镜像 FROM redis # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi/redis +VOLUME /home/wfc/redis # 创建目录 -RUN mkdir -p /home/ruoyi/redis +RUN mkdir -p /home/wfc/redis # 指定路径 -WORKDIR /home/ruoyi/redis +WORKDIR /home/wfc/redis # 复制conf文件到路径 -COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf +COPY ./conf/redis.conf /home/wfc/redis/redis.conf diff --git a/docker/ruoyi/auth/dockerfile b/docker/wfc/auth/dockerfile similarity index 57% rename from docker/ruoyi/auth/dockerfile rename to docker/wfc/auth/dockerfile index e3b2686..cfa1d29 100644 --- a/docker/ruoyi/auth/dockerfile +++ b/docker/wfc/auth/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-auth.jar /home/ruoyi/wfc-auth.jar +COPY ./jar/wfc-auth.jar /home/wfc/wfc-auth.jar # 启动认证服务 ENTRYPOINT ["java","-jar","wfc-auth.jar"] \ No newline at end of file diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/wfc/auth/jar/readme.txt similarity index 100% rename from docker/ruoyi/auth/jar/readme.txt rename to docker/wfc/auth/jar/readme.txt diff --git a/docker/ruoyi/gateway/dockerfile b/docker/wfc/gateway/dockerfile similarity index 57% rename from docker/ruoyi/gateway/dockerfile rename to docker/wfc/gateway/dockerfile index f9bf79c..4f57b4f 100644 --- a/docker/ruoyi/gateway/dockerfile +++ b/docker/wfc/gateway/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-gateway.jar /home/ruoyi/wfc-gateway.jar +COPY ./jar/wfc-gateway.jar /home/wfc/wfc-gateway.jar # 启动网关服务 ENTRYPOINT ["java","-jar","wfc-gateway.jar"] \ No newline at end of file diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/wfc/gateway/jar/readme.txt similarity index 100% rename from docker/ruoyi/gateway/jar/readme.txt rename to docker/wfc/gateway/jar/readme.txt diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/wfc/modules/file/dockerfile similarity index 56% rename from docker/ruoyi/modules/file/dockerfile rename to docker/wfc/modules/file/dockerfile index 8380e5d..9b79a0c 100644 --- a/docker/ruoyi/modules/file/dockerfile +++ b/docker/wfc/modules/file/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-file.jar /home/ruoyi/wfc-modules-file.jar +COPY ./jar/wfc-modules-file.jar /home/wfc/wfc-modules-file.jar # 启动文件服务 ENTRYPOINT ["java","-jar","wfc-modules-file.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/file/jar/readme.txt b/docker/wfc/modules/file/jar/readme.txt similarity index 100% rename from docker/ruoyi/modules/file/jar/readme.txt rename to docker/wfc/modules/file/jar/readme.txt diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/wfc/modules/gen/dockerfile similarity index 57% rename from docker/ruoyi/modules/gen/dockerfile rename to docker/wfc/modules/gen/dockerfile index b6c3d2f..27d8b95 100644 --- a/docker/ruoyi/modules/gen/dockerfile +++ b/docker/wfc/modules/gen/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-gen.jar /home/ruoyi/wfc-modules-gen.jar +COPY ./jar/wfc-modules-gen.jar /home/wfc/wfc-modules-gen.jar # 启动代码生成服务 ENTRYPOINT ["java","-jar","wfc-modules-gen.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/jar/readme.txt b/docker/wfc/modules/gen/jar/readme.txt similarity index 100% rename from docker/ruoyi/modules/gen/jar/readme.txt rename to docker/wfc/modules/gen/jar/readme.txt diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/wfc/modules/job/dockerfile similarity index 57% rename from docker/ruoyi/modules/job/dockerfile rename to docker/wfc/modules/job/dockerfile index 1e60607..4180408 100644 --- a/docker/ruoyi/modules/job/dockerfile +++ b/docker/wfc/modules/job/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-job.jar /home/ruoyi/wfc-modules-job.jar +COPY ./jar/wfc-modules-job.jar /home/wfc/wfc-modules-job.jar # 启动定时任务服务 ENTRYPOINT ["java","-jar","wfc-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/job/jar/readme.txt b/docker/wfc/modules/job/jar/readme.txt similarity index 100% rename from docker/ruoyi/modules/job/jar/readme.txt rename to docker/wfc/modules/job/jar/readme.txt diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/wfc/modules/system/dockerfile similarity index 55% rename from docker/ruoyi/modules/system/dockerfile rename to docker/wfc/modules/system/dockerfile index 591bba5..8999e83 100644 --- a/docker/ruoyi/modules/system/dockerfile +++ b/docker/wfc/modules/system/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-modules-system.jar /home/ruoyi/wfc-modules-system.jar +COPY ./jar/wfc-modules-system.jar /home/wfc/wfc-modules-system.jar # 启动系统服务 ENTRYPOINT ["java","-jar","wfc-modules-system.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/system/jar/readme.txt b/docker/wfc/modules/system/jar/readme.txt similarity index 100% rename from docker/ruoyi/modules/system/jar/readme.txt rename to docker/wfc/modules/system/jar/readme.txt diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/wfc/visual/monitor/dockerfile similarity index 55% rename from docker/ruoyi/visual/monitor/dockerfile rename to docker/wfc/visual/monitor/dockerfile index eb831ee..f2473be 100644 --- a/docker/ruoyi/visual/monitor/dockerfile +++ b/docker/wfc/visual/monitor/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER ruoyi +MAINTAINER wfc # 挂载目录 -VOLUME /home/ruoyi +VOLUME /home/wfc # 创建目录 -RUN mkdir -p /home/ruoyi +RUN mkdir -p /home/wfc # 指定路径 -WORKDIR /home/ruoyi +WORKDIR /home/wfc # 复制jar文件到路径 -COPY ./jar/wfc-visual-monitor.jar /home/ruoyi/wfc-visual-monitor.jar +COPY ./jar/wfc-visual-monitor.jar /home/wfc/wfc-visual-monitor.jar # 启动系统服务 ENTRYPOINT ["java","-jar","wfc-visual-monitor.jar"] \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/wfc/visual/monitor/jar/readme.txt similarity index 100% rename from docker/ruoyi/visual/monitor/jar/readme.txt rename to docker/wfc/visual/monitor/jar/readme.txt diff --git a/sql/wfc-cloud.sql b/sql/wfc-cloud.sql index 19a9997..17a1b05 100644 --- a/sql/wfc-cloud.sql +++ b/sql/wfc-cloud.sql @@ -1,3 +1,6 @@ +CREATE database if NOT EXISTS `wfc-cloud` default character set utf8mb4; +USE `wfc-cloud`; + /* Navicat Premium Data Transfer diff --git a/sql/wfc-config.sql b/sql/wfc-config.sql index 36fc8a7..d052133 100644 --- a/sql/wfc-config.sql +++ b/sql/wfc-config.sql @@ -1,3 +1,6 @@ +CREATE database if NOT EXISTS `wfc-config` default character set utf8mb4; +USE `wfc-config`; + /* Navicat Premium Data Transfer