Merge remote-tracking branch 'origin/release' into release

docker/copy.sh

@@ -19,23 +19,23 @@ cp -r ../ruoyi-ui/dist/** ./nginx/html/dist
 
 # copy jar
 echo "begin copy ruoyi-gateway "
-cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar
+cp ../base-components/gateway/target/gateway.jar ./ruoyi/gateway/jar
 
-echo "begin copy ruoyi-auth "
-cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar
+echo "begin copy ruoyi-monitor "
+cp ../base-components/service-monitor/target/monitor.jar  ./ruoyi/visual/monitor/jar
 
-echo "begin copy ruoyi-visual "
-cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar  ./ruoyi/visual/monitor/jar
+echo "begin copy ruoyi-auth "
+cp ../base-modules/service-auth/target/service-auth.jar ./ruoyi/auth/jar
 
 echo "begin copy ruoyi-modules-system "
-cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar
+cp ../base-modules/service-system/target/service-system.jar ./ruoyi/modules/system/jar
 
 echo "begin copy ruoyi-modules-file "
-cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar
+cp ../base-modules/service-file/target/service-file.jar ./ruoyi/modules/file/jar
 
 echo "begin copy ruoyi-modules-job "
-cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar
+cp ../base-modules/service-job/target/service-job.jar ./ruoyi/modules/job/jar
 
 echo "begin copy ruoyi-modules-gen "
-cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar
+cp ../base-modules/service-gen/target/service-gen.jar ./ruoyi/modules/gen/jar
 

docker/docker-compose.yml

@@ -36,7 +36,7 @@ services:
           '--lower-case-table-names=1'
         ]
     environment:
-      MYSQL_DATABASE: 'ry-cloud'
+      MYSQL_DATABASE: 'usky-cloud'
       MYSQL_ROOT_PASSWORD: password
   ruoyi-redis:
     container_name: ruoyi-redis

docker/ruoyi/modules/system/dockerfile

@@ -10,6 +10,6 @@ RUN mkdir -p /home/ruoyi
 # 指定路径
 WORKDIR /home/ruoyi
 # 复制jar文件到路径
-COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
+COPY ./jar/service-system.jar /home/ruoyi/service-system.jar
 # 启动系统服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"]
+ENTRYPOINT ["java","-jar","service-system.jar"]