MOKASZ\lw12420 5 роки тому
батько
коміт
8364546d51
25 змінених файлів з 121 додано та 122 видалено
  1. 2 2
      docker/deploy.sh
  2. 48 48
      docker/docker-compose.yml
  3. 1 1
      docker/mysql/dockerfile
  4. 1 1
      docker/nacos/conf/application.properties
  5. 1 1
      docker/nacos/dockerfile
  6. 2 2
      docker/nginx/conf/nginx.conf
  7. 5 5
      docker/nginx/dockerfile
  8. 5 5
      docker/redis/dockerfile
  9. 6 6
      docker/ruoyi/auth/dockerfile
  10. 6 6
      docker/ruoyi/gateway/dockerfile
  11. 6 6
      docker/ruoyi/modules/file/dockerfile
  12. 6 6
      docker/ruoyi/modules/gen/dockerfile
  13. 6 6
      docker/ruoyi/modules/job/dockerfile
  14. 6 6
      docker/ruoyi/modules/system/dockerfile
  15. 6 6
      docker/ruoyi/visual/monitor/dockerfile
  16. 1 1
      launch-modules/launch-file/src/main/java/com/launch/file/FileApplication.java
  17. 1 1
      launch-modules/launch-file/src/main/java/com/launch/file/config/MinioConfig.java
  18. 1 1
      launch-modules/launch-file/src/main/java/com/launch/file/config/ResourcesConfig.java
  19. 2 2
      launch-modules/launch-file/src/main/java/com/launch/file/controller/SysFileController.java
  20. 1 1
      launch-modules/launch-file/src/main/java/com/launch/file/service/FastDfsSysFileServiceImpl.java
  21. 1 1
      launch-modules/launch-file/src/main/java/com/launch/file/service/ISysFileService.java
  22. 2 2
      launch-modules/launch-file/src/main/java/com/launch/file/service/LocalSysFileServiceImpl.java
  23. 3 4
      launch-modules/launch-file/src/main/java/com/launch/file/service/MinioSysFileServiceImpl.java
  24. 1 1
      launch-modules/launch-file/src/main/java/com/launch/file/utils/FileUploadUtils.java
  25. 1 1
      launch-modules/launch-file/src/main/resources/logback.xml

+ 2 - 2
docker/deploy.sh

@@ -26,12 +26,12 @@ port(){
 
 # 启动基础环境(必须)
 base(){
-	docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos ruoyi-nginx
+	docker-compose up -d launch-mysql launch-redis launch-nacos launch-nginx
 }
 
 # 启动程序模块(必须)
 modules(){
-	docker-compose up -d ruoyi-gateway ruoyi-auth ruoyi-modules-system
+	docker-compose up -d launch-gateway launch-auth launch-modules-system
 }
 
 # 关闭所有环境/模块

+ 48 - 48
docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version : '3.8'
 services:
-  ruoyi-nacos:
-    container_name: ruoyi-nacos
+  launch-nacos:
+    container_name: launch-nacos
     image: nacos/nacos-server
     build:
       context: ./nacos
@@ -15,9 +15,9 @@ services:
       - "9848:9848"
       - "9849:9849"
     depends_on:
-      - ruoyi-mysql
-  ruoyi-mysql:
-    container_name: ruoyi-mysql
+      - launch-mysql
+  launch-mysql:
+    container_name: launch-mysql
     image: mysql:5.7
     build:
       context: ./mysql
@@ -38,103 +38,103 @@ services:
     environment:
       MYSQL_DATABASE: 'ry-cloud'
       MYSQL_ROOT_PASSWORD: password
-  ruoyi-redis:
-    container_name: ruoyi-redis
+  launch-redis:
+    container_name: launch-redis
     image: redis
     build:
       context: ./redis
     ports:
       - "6379:6379"
     volumes:
-      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
+      - ./redis/conf/redis.conf:/home/launch/redis/redis.conf
       - ./redis/data:/data
-    command: redis-server /home/ruoyi/redis/redis.conf
-  ruoyi-nginx:
-    container_name: ruoyi-nginx
+    command: redis-server /home/launch/redis/redis.conf
+  launch-nginx:
+    container_name: launch-nginx
     image: nginx
     build:
       context: ./nginx
     ports:
       - "80:80"
     volumes:
-      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
+      - ./nginx/html/dist:/home/launch/projects/launch-ui
       - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/logs:/var/log/nginx
       - ./nginx/conf.d:/etc/nginx/conf.d
     depends_on:
-      - ruoyi-gateway
+      - launch-gateway
     links:
-      - ruoyi-gateway
-  ruoyi-gateway:
-    container_name: ruoyi-gateway
+      - launch-gateway
+  launch-gateway:
+    container_name: launch-gateway
     build:
-      context: ./ruoyi/gateway
+      context: ./launch/gateway
       dockerfile: dockerfile
     ports:
       - "8080:8080"
     depends_on:
-      - ruoyi-redis
+      - launch-redis
     links:
-      - ruoyi-redis
-  ruoyi-auth:
-    container_name: ruoyi-auth
+      - launch-redis
+  launch-auth:
+    container_name: launch-auth
     build:
-      context: ./ruoyi/auth
+      context: ./launch/auth
       dockerfile: dockerfile
     ports:
       - "9200:9200"
     depends_on:
-      - ruoyi-redis
+      - launch-redis
     links:
-      - ruoyi-redis
-  ruoyi-modules-system:
-    container_name: ruoyi-modules-system
+      - launch-redis
+  launch-modules-system:
+    container_name: launch-modules-system
     build:
-      context: ./ruoyi/modules/system
+      context: ./launch/modules/system
       dockerfile: dockerfile
     ports:
       - "9201:9201"
     depends_on:
-      - ruoyi-redis
-      - ruoyi-mysql
+      - launch-redis
+      - launch-mysql
     links:
-      - ruoyi-redis
-      - ruoyi-mysql
-  ruoyi-modules-gen:
-    container_name: ruoyi-modules-gen
+      - launch-redis
+      - launch-mysql
+  launch-modules-gen:
+    container_name: launch-modules-gen
     build:
-      context: ./ruoyi/modules/gen
+      context: ./launch/modules/gen
       dockerfile: dockerfile
     ports:
       - "9202:9202"
     depends_on:
-      - ruoyi-mysql
+      - launch-mysql
     links:
-      - ruoyi-mysql
-  ruoyi-modules-job:
-    container_name: ruoyi-modules-job
+      - launch-mysql
+  launch-modules-job:
+    container_name: launch-modules-job
     build:
-      context: ./ruoyi/modules/job
+      context: ./launch/modules/job
       dockerfile: dockerfile
     ports:
       - "9203:9203"
     depends_on:
-      - ruoyi-mysql
+      - launch-mysql
     links:
-      - ruoyi-mysql
-  ruoyi-modules-file:
-    container_name: ruoyi-modules-file
+      - launch-mysql
+  launch-modules-file:
+    container_name: launch-modules-file
     build:
-      context: ./ruoyi/modules/file
+      context: ./launch/modules/file
       dockerfile: dockerfile
     ports:
       - "9300:9300"
     volumes:
-    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
-  ruoyi-visual-monitor:
-    container_name: ruoyi-visual-monitor
+    - ./launch/uploadPath:/home/launch/uploadPath
+  launch-visual-monitor:
+    container_name: launch-visual-monitor
     build:
-      context: ./ruoyi/visual/monitor
+      context: ./launch/visual/monitor
       dockerfile: dockerfile
     ports:
       - "9100:9100"

+ 1 - 1
docker/mysql/dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM mysql:5.7
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 执行sql脚本
 ADD ./db/*.sql /docker-entrypoint-initdb.d/

+ 1 - 1
docker/nacos/conf/application.properties

@@ -1,6 +1,6 @@
 spring.datasource.platform=mysql
 db.num=1
-db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+db.url.0=jdbc:mysql://launch-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
 db.user=root
 db.password=password
 

+ 1 - 1
docker/nacos/dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM nacos/nacos-server
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 复制conf文件到路径
 COPY ./conf/application.properties /home/nacos/conf/application.properties

+ 2 - 2
docker/nginx/conf/nginx.conf

@@ -15,7 +15,7 @@ http {
         server_name  localhost;
 
 		location / {
-            root   /home/ruoyi/projects/ruoyi-ui;
+            root   /home/launch/projects/launch-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://launch-gateway:8080/;
 		}
 
         error_page   500 502 503 504  /50x.html;

+ 5 - 5
docker/nginx/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM nginx
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi/projects/ruoyi-ui
+VOLUME /home/launch/projects/launch-ui
 # 创建目录
-RUN mkdir -p /home/ruoyi/projects/ruoyi-ui
+RUN mkdir -p /home/launch/projects/launch-ui
 # 指定路径
-WORKDIR /home/ruoyi/projects/ruoyi-ui
+WORKDIR /home/launch/projects/launch-ui
 # 复制conf文件到路径
 COPY ./conf/nginx.conf /etc/nginx/nginx.conf
 # 复制html文件到路径
-COPY ./html/dist /home/ruoyi/projects/ruoyi-ui
+COPY ./html/dist /home/launch/projects/launch-ui

+ 5 - 5
docker/redis/dockerfile

@@ -1,13 +1,13 @@
 # 基础镜像
 FROM redis
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi/redis
+VOLUME /home/launch/redis
 # 创建目录
-RUN mkdir -p /home/ruoyi/redis
+RUN mkdir -p /home/launch/redis
 # 指定路径
-WORKDIR /home/ruoyi/redis
+WORKDIR /home/launch/redis
 # 复制conf文件到路径
-COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf
+COPY ./conf/redis.conf /home/launch/redis/redis.conf

+ 6 - 6
docker/ruoyi/auth/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar
+COPY ./jar/launch-auth.jar /home/launch/launch-auth.jar
 # 启动认证服务
-ENTRYPOINT ["java","-jar","ruoyi-auth.jar"]
+ENTRYPOINT ["java","-jar","launch-auth.jar"]

+ 6 - 6
docker/ruoyi/gateway/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
+COPY ./jar/launch-gateway.jar /home/launch/launch-gateway.jar
 # 启动网关服务
-ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"]
+ENTRYPOINT ["java","-jar","launch-gateway.jar"]

+ 6 - 6
docker/ruoyi/modules/file/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar
+COPY ./jar/launch-modules-file.jar /home/launch/launch-modules-file.jar
 # 启动文件服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"]
+ENTRYPOINT ["java","-jar","launch-modules-file.jar"]

+ 6 - 6
docker/ruoyi/modules/gen/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
+COPY ./jar/launch-modules-gen.jar /home/launch/launch-modules-gen.jar
 # 启动代码生成服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"]
+ENTRYPOINT ["java","-jar","home-modules-gen.jar"]

+ 6 - 6
docker/ruoyi/modules/job/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar
+COPY ./jar/launch-modules-job.jar /home/launch/launch-modules-job.jar
 # 启动定时任务服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"]
+ENTRYPOINT ["java","-jar","home-modules-job.jar"]

+ 6 - 6
docker/ruoyi/modules/system/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
+COPY ./jar/launch-modules-system.jar /home/launch/launch-modules-system.jar
 # 启动系统服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"]
+ENTRYPOINT ["java","-jar","launch-modules-system.jar"]

+ 6 - 6
docker/ruoyi/visual/monitor/dockerfile

@@ -1,15 +1,15 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+MAINTAINER launch
 
 # 挂载目录
-VOLUME /home/ruoyi
+VOLUME /home/launch
 # 创建目录
-RUN mkdir -p /home/ruoyi
+RUN mkdir -p /home/launch
 # 指定路径
-WORKDIR /home/ruoyi
+WORKDIR /home/launch
 # 复制jar文件到路径
-COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar
+COPY ./jar/launch-visual-monitor.jar /home/launch/launch-visual-monitor.jar
 # 启动系统服务
-ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"]
+ENTRYPOINT ["java","-jar","launch-visual-monitor.jar"]

+ 1 - 1
launch-modules/launch-file/src/main/java/com/ruoyi/file/FileApplication.java → launch-modules/launch-file/src/main/java/com/launch/file/FileApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file;
+package com.launch.file;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

+ 1 - 1
launch-modules/launch-file/src/main/java/com/ruoyi/file/config/MinioConfig.java → launch-modules/launch-file/src/main/java/com/launch/file/config/MinioConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.config;
+package com.launch.file.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

+ 1 - 1
launch-modules/launch-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java → launch-modules/launch-file/src/main/java/com/launch/file/config/ResourcesConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.config;
+package com.launch.file.config;
 
 import java.io.File;
 import org.springframework.beans.factory.annotation.Value;

+ 2 - 2
launch-modules/launch-file/src/main/java/com/ruoyi/file/controller/SysFileController.java → launch-modules/launch-file/src/main/java/com/launch/file/controller/SysFileController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.controller;
+package com.launch.file.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.launch.common.core.domain.R;
 import com.launch.common.core.utils.file.FileUtils;
-import com.ruoyi.file.service.ISysFileService;
+import com.launch.file.service.ISysFileService;
 import com.launch.system.api.domain.SysFile;
 
 /**

+ 1 - 1
launch-modules/launch-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java → launch-modules/launch-file/src/main/java/com/launch/file/service/FastDfsSysFileServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.service;
+package com.launch.file.service;
 
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
launch-modules/launch-file/src/main/java/com/ruoyi/file/service/ISysFileService.java → launch-modules/launch-file/src/main/java/com/launch/file/service/ISysFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.service;
+package com.launch.file.service;
 
 import org.springframework.web.multipart.MultipartFile;
 

+ 2 - 2
launch-modules/launch-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java → launch-modules/launch-file/src/main/java/com/launch/file/service/LocalSysFileServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.file.service;
+package com.launch.file.service;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.file.utils.FileUploadUtils;
+import com.launch.file.utils.FileUploadUtils;
 
 /**
  * 本地文件存储

+ 3 - 4
launch-modules/launch-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java → launch-modules/launch-file/src/main/java/com/launch/file/service/MinioSysFileServiceImpl.java

@@ -1,11 +1,10 @@
-package com.ruoyi.file.service;
+package com.launch.file.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.file.config.MinioConfig;
-import com.ruoyi.file.utils.FileUploadUtils;
+import com.launch.file.config.MinioConfig;
+import com.launch.file.utils.FileUploadUtils;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
 

+ 1 - 1
launch-modules/launch-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java → launch-modules/launch-file/src/main/java/com/launch/file/utils/FileUploadUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.utils;
+package com.launch.file.utils;
 
 import java.io.File;
 import java.io.IOException;

+ 1 - 1
launch-modules/launch-file/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/ruoyi-file" />
+	<property name="log.path" value="logs/launch-file" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />