From b5af9513da096ef6172e1a505d6dff8d8ed2f470 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 25 Sep 2024 16:08:03 +0800
Subject: [PATCH] scripts
---
bin/run-auth.bat | 14 ------------
bin/run-gateway.bat | 14 ------------
bin/run-modules-file.bat | 14 ------------
bin/run-modules-gen.bat | 14 ------------
bin/run-modules-job.bat | 14 ------------
bin/run-monitor.bat | 14 ------------
bonus-modules/bonus-material/pom.xml | 2 +-
docker/bonus/auth/dockerfile | 22 -------------------
docker/bonus/auth/jar/readme.txt | 1 -
docker/bonus/gateway/dockerfile | 22 -------------------
docker/bonus/gateway/jar/readme.txt | 1 -
docker/bonus/modules/file/dockerfile | 22 -------------------
docker/bonus/modules/file/jar/readme.txt | 1 -
docker/bonus/modules/gen/dockerfile | 22 -------------------
docker/bonus/modules/gen/jar/readme.txt | 1 -
docker/bonus/modules/job/dockerfile | 22 -------------------
docker/bonus/modules/job/jar/readme.txt | 1 -
.../modules/{system => material}/dockerfile | 4 ++--
.../{system => material}/jar/readme.txt | 0
docker/bonus/visual/monitor/dockerfile | 22 -------------------
docker/bonus/visual/monitor/jar/readme.txt | 1 -
docker/copy.sh | 22 ++-----------------
docker/deploy.sh | 2 +-
docker/docker-compose.yml | 2 +-
24 files changed, 7 insertions(+), 247 deletions(-)
delete mode 100644 bin/run-auth.bat
delete mode 100644 bin/run-gateway.bat
delete mode 100644 bin/run-modules-file.bat
delete mode 100644 bin/run-modules-gen.bat
delete mode 100644 bin/run-modules-job.bat
delete mode 100644 bin/run-monitor.bat
delete mode 100644 docker/bonus/auth/dockerfile
delete mode 100644 docker/bonus/auth/jar/readme.txt
delete mode 100644 docker/bonus/gateway/dockerfile
delete mode 100644 docker/bonus/gateway/jar/readme.txt
delete mode 100644 docker/bonus/modules/file/dockerfile
delete mode 100644 docker/bonus/modules/file/jar/readme.txt
delete mode 100644 docker/bonus/modules/gen/dockerfile
delete mode 100644 docker/bonus/modules/gen/jar/readme.txt
delete mode 100644 docker/bonus/modules/job/dockerfile
delete mode 100644 docker/bonus/modules/job/jar/readme.txt
rename docker/bonus/modules/{system => material}/dockerfile (75%)
rename docker/bonus/modules/{system => material}/jar/readme.txt (100%)
delete mode 100644 docker/bonus/visual/monitor/dockerfile
delete mode 100644 docker/bonus/visual/monitor/jar/readme.txt
diff --git a/bin/run-auth.bat b/bin/run-auth.bat
deleted file mode 100644
index 7b1e1276..00000000
--- a/bin/run-auth.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Auth���̡�
-echo.
-
-cd %~dp0
-cd ../bonus-auth/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar bonus-auth.jar
-
-cd bin
-pause
\ No newline at end of file
diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat
deleted file mode 100644
index f4e131c9..00000000
--- a/bin/run-gateway.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Gateway���̡�
-echo.
-
-cd %~dp0
-cd ../bonus-gateway/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar bonus-gateway.jar
-
-cd bin
-pause
\ No newline at end of file
diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat
deleted file mode 100644
index 8f98def6..00000000
--- a/bin/run-modules-file.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-File���̡�
-echo.
-
-cd %~dp0
-cd ../bonus-modules/bonus-file/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar bonus-modules-file.jar
-
-cd bin
-pause
\ No newline at end of file
diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat
deleted file mode 100644
index 9c1b1959..00000000
--- a/bin/run-modules-gen.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-Gen���̡�
-echo.
-
-cd %~dp0
-cd ../bonus-modules/bonus-gen/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar bonus-modules-gen.jar
-
-cd bin
-pause
\ No newline at end of file
diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat
deleted file mode 100644
index 6593efe8..00000000
--- a/bin/run-modules-job.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-Job���̡�
-echo.
-
-cd %~dp0
-cd ../bonus-modules/bonus-job/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar bonus-modules-job.jar
-
-cd bin
-pause
\ No newline at end of file
diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat
deleted file mode 100644
index d55da8a7..00000000
--- a/bin/run-monitor.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Monitor���̡�
-echo.
-
-cd %~dp0
-cd ../bonus-visual/bonus-monitor/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar bonus-visual-monitor.jar
-
-cd bin
-pause
\ No newline at end of file
diff --git a/bonus-modules/bonus-material/pom.xml b/bonus-modules/bonus-material/pom.xml
index b3b22e6b..94b60ad1 100644
--- a/bonus-modules/bonus-material/pom.xml
+++ b/bonus-modules/bonus-material/pom.xml
@@ -9,7 +9,7 @@
4.0.0
- bonus-material-2.0
+ bonus-modules-material
bonus-modules-material仓储模块
diff --git a/docker/bonus/auth/dockerfile b/docker/bonus/auth/dockerfile
deleted file mode 100644
index 15652e0f..00000000
--- a/docker/bonus/auth/dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# 创建 bonus 用户，此段代码未测试
-RUN group add -g 1002 bonus && \
-useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
-# 切换到 bonus 用户
-USER bonus
-# end 创建用户
-
-# 基础镜像
-FROM openjdk:8-jre
-# author
-MAINTAINER bonus
-
-# 挂载目录
-VOLUME /home/bonus
-# 创建目录
-RUN mkdir -p /home/bonus
-# 指定路径
-WORKDIR /home/bonus
-# 复制jar文件到路径
-COPY ./jar/bonus-auth.jar /home/bonus/bonus-auth.jar
-# 启动认证服务
-ENTRYPOINT ["java","-jar","bonus-auth.jar"]
\ No newline at end of file
diff --git a/docker/bonus/auth/jar/readme.txt b/docker/bonus/auth/jar/readme.txt
deleted file mode 100644
index c35ba276..00000000
--- a/docker/bonus/auth/jar/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-֤ĴõjarļdockerӦá
\ No newline at end of file
diff --git a/docker/bonus/gateway/dockerfile b/docker/bonus/gateway/dockerfile
deleted file mode 100644
index 08a8c2aa..00000000
--- a/docker/bonus/gateway/dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# 创建 bonus 用户，此段代码未测试
-RUN group add -g 1002 bonus && \
-useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
-# 切换到 bonus 用户
-USER bonus
-# end 创建用户
-
-# 基础镜像
-FROM openjdk:8-jre
-# author
-MAINTAINER bonus
-
-# 挂载目录
-VOLUME /home/bonus
-# 创建目录
-RUN mkdir -p /home/bonus
-# 指定路径
-WORKDIR /home/bonus
-# 复制jar文件到路径
-COPY ./jar/bonus-gateway.jar /home/bonus/bonus-gateway.jar
-# 启动网关服务
-ENTRYPOINT ["java","-jar","bonus-gateway.jar"]
\ No newline at end of file
diff --git a/docker/bonus/gateway/jar/readme.txt b/docker/bonus/gateway/jar/readme.txt
deleted file mode 100644
index 5dfbec76..00000000
--- a/docker/bonus/gateway/jar/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-ģõjarļdockerӦá
\ No newline at end of file
diff --git a/docker/bonus/modules/file/dockerfile b/docker/bonus/modules/file/dockerfile
deleted file mode 100644
index ddaf0d87..00000000
--- a/docker/bonus/modules/file/dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# 创建 bonus 用户，此段代码未测试
-RUN group add -g 1002 bonus && \
-useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
-# 切换到 bonus 用户
-USER bonus
-# end 创建用户
-
-# 基础镜像
-FROM openjdk:8-jre
-# author
-MAINTAINER bonus
-
-# 挂载目录
-VOLUME /home/bonus
-# 创建目录
-RUN mkdir -p /home/bonus
-# 指定路径
-WORKDIR /home/bonus
-# 复制jar文件到路径
-COPY ./jar/bonus-modules-file.jar /home/bonus/bonus-modules-file.jar
-# 启动文件服务
-ENTRYPOINT ["java","-jar","bonus-modules-file.jar"]
\ No newline at end of file
diff --git a/docker/bonus/modules/file/jar/readme.txt b/docker/bonus/modules/file/jar/readme.txt
deleted file mode 100644
index bf2b2a7f..00000000
--- a/docker/bonus/modules/file/jar/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-ļõjarļdockerӦá
\ No newline at end of file
diff --git a/docker/bonus/modules/gen/dockerfile b/docker/bonus/modules/gen/dockerfile
deleted file mode 100644
index 1cb27a6e..00000000
--- a/docker/bonus/modules/gen/dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# 创建 bonus 用户，此段代码未测试
-RUN group add -g 1002 bonus && \
-useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
-# 切换到 bonus 用户
-USER bonus
-# end 创建用户
-
-# 基础镜像
-FROM openjdk:8-jre
-# author
-MAINTAINER bonus
-
-# 挂载目录
-VOLUME /home/bonus
-# 创建目录
-RUN mkdir -p /home/bonus
-# 指定路径
-WORKDIR /home/bonus
-# 复制jar文件到路径
-COPY ./jar/bonus-modules-gen.jar /home/bonus/bonus-modules-gen.jar
-# 启动代码生成服务
-ENTRYPOINT ["java","-jar","bonus-modules-gen.jar"]
\ No newline at end of file
diff --git a/docker/bonus/modules/gen/jar/readme.txt b/docker/bonus/modules/gen/jar/readme.txt
deleted file mode 100644
index 2f25c0af..00000000
--- a/docker/bonus/modules/gen/jar/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-ŴɴõjarļdockerӦá
\ No newline at end of file
diff --git a/docker/bonus/modules/job/dockerfile b/docker/bonus/modules/job/dockerfile
deleted file mode 100644
index 9180547a..00000000
--- a/docker/bonus/modules/job/dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# 创建 bonus 用户，此段代码未测试
-RUN group add -g 1002 bonus && \
-useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
-# 切换到 bonus 用户
-USER bonus
-# end 创建用户
-
-# 基础镜像
-FROM openjdk:8-jre
-# author
-MAINTAINER bonus
-
-# 挂载目录
-VOLUME /home/bonus
-# 创建目录
-RUN mkdir -p /home/bonus
-# 指定路径
-WORKDIR /home/bonus
-# 复制jar文件到路径
-COPY ./jar/bonus-modules-job.jar /home/bonus/ruoyi-modules-job.jar
-# 启动定时任务服务
-ENTRYPOINT ["java","-jar","bonus-modules-job.jar"]
\ No newline at end of file
diff --git a/docker/bonus/modules/job/jar/readme.txt b/docker/bonus/modules/job/jar/readme.txt
deleted file mode 100644
index 58aea0b1..00000000
--- a/docker/bonus/modules/job/jar/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-ŶʱõjarļdockerӦá
\ No newline at end of file
diff --git a/docker/bonus/modules/system/dockerfile b/docker/bonus/modules/material/dockerfile
similarity index 75%
rename from docker/bonus/modules/system/dockerfile
rename to docker/bonus/modules/material/dockerfile
index 88c19353..cde8b2e8 100644
--- a/docker/bonus/modules/system/dockerfile
+++ b/docker/bonus/modules/material/dockerfile
@@ -17,6 +17,6 @@ RUN mkdir -p /home/bonus
# 指定路径
WORKDIR /home/bonus
# 复制jar文件到路径
-COPY ./jar/bonus-modules-system.jar /home/bonus/bonus-modules-system.jar
+COPY ./jar/bonus-modules-material.jar /home/bonus/bonus-modules-material.jar
# 启动系统服务
-ENTRYPOINT ["java","-jar","bonus-modules-system.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-jar","bonus-modules-material.jar"]
\ No newline at end of file
diff --git a/docker/bonus/modules/system/jar/readme.txt b/docker/bonus/modules/material/jar/readme.txt
similarity index 100%
rename from docker/bonus/modules/system/jar/readme.txt
rename to docker/bonus/modules/material/jar/readme.txt
diff --git a/docker/bonus/visual/monitor/dockerfile b/docker/bonus/visual/monitor/dockerfile
deleted file mode 100644
index cc08dc63..00000000
--- a/docker/bonus/visual/monitor/dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# 创建 bonus 用户，此段代码未测试
-RUN group add -g 1002 bonus && \
-useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
-# 切换到 bonus 用户
-USER bonus
-# end 创建用户
-
-# 基础镜像
-FROM openjdk:8-jre
-# author
-MAINTAINER bonus
-
-# 挂载目录
-VOLUME /home/bonus
-# 创建目录
-RUN mkdir -p /home/bonus
-# 指定路径
-WORKDIR /home/bonus
-# 复制jar文件到路径
-COPY ./jar/bonus-visual-monitor.jar /home/bonus/bonus-visual-monitor.jar
-# 启动系统服务
-ENTRYPOINT ["java","-jar","bonus-visual-monitor.jar"]
\ No newline at end of file
diff --git a/docker/bonus/visual/monitor/jar/readme.txt b/docker/bonus/visual/monitor/jar/readme.txt
deleted file mode 100644
index 62b28410..00000000
--- a/docker/bonus/visual/monitor/jar/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-żĴõjarļdockerӦá
\ No newline at end of file
diff --git a/docker/copy.sh b/docker/copy.sh
index 755b1667..15b8ba2e 100644
--- a/docker/copy.sh
+++ b/docker/copy.sh
@@ -18,24 +18,6 @@ cp -r ../bonus-ui/dist/** ./nginx/html/dist
# copy jar
-echo "begin copy bonus-gateway "
-cp ../bonus-gateway/target/bonus-gateway.jar ./bonus/gateway/jar
-
-echo "begin copy bonus-auth "
-cp ../bonus-auth/target/bonus-auth.jar ./bonus/auth/jar
-
-echo "begin copy bonus-visual "
-cp ../bonus-visual/bonus-monitor/target/bonus-visual-monitor.jar ./bonus/visual/monitor/jar
-
-echo "begin copy bonus-modules-system "
-cp ../bonus-modules/bonus-system/target/bonus-modules-system.jar ./bonus/modules/system/jar
-
-echo "begin copy bonus-modules-file "
-cp ../bonus-modules/bonus-file/target/bonus-modules-file.jar ./bonus/modules/file/jar
-
-echo "begin copy bonus-modules-job "
-cp ../bonus-modules/bonus-job/target/bonus-modules-job.jar ./bonus/modules/job/jar
-
-echo "begin copy bonus-modules-gen "
-cp ../bonus-modules/bonus-gen/target/bonus-modules-gen.jar ./bonus/modules/gen/jar
+echo "begin copy bonus-modules-material "
+cp ../bonus-modules/bonus-material/target/bonus-modules-material.jar ./bonus/modules/material/jar
diff --git a/docker/deploy.sh b/docker/deploy.sh
index 83d9572b..bccb60d1 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -31,7 +31,7 @@ base(){
# 启动程序模块（必须）
modules(){
- docker-compose up -d bonus-nginx bonus-gateway bonus-auth bonus-modules-system
+ docker-compose up -d bonus-nginx bonus-modules-material
}
# 关闭所有环境/模块
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fb47c4a1..5e73329d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -90,7 +90,7 @@ services:
bonus-modules-system:
container_name: bonus-modules-system
build:
- context: ./bonus/modules/system
+ context: bonus/modules/material
dockerfile: dockerfile
ports:
- "9201:9201"