修改 docker相关配置

base-components/gateway/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ server:
 spring: 
   application:
     # 应用名称
-    name: ruoyi-gateway
+    name: gateway
   profiles:
     # 环境配置
     active: dev
@@ -17,10 +17,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.16.120.165:8848
+        server-addr: usky-cloud-nacos:8848
       config:
         # 配置中心地址
-        server-addr: 172.16.120.165:8848
+        server-addr: usky-cloud-nacos:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

base-modules/service-system/pom.xml

@@ -5,10 +5,9 @@
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>service-system</artifactId>
-
     <packaging>pom</packaging>
     <version>0.0.1</version>
 

docker/copy.sh

@@ -24,11 +24,9 @@ cp ../base-components/gateway/target/gateway.jar ./ruoyi/gateway/jar
 echo "begin copy ruoyi-monitor "
 cp ../base-components/monitor/target/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 ../base-modules/service-system/target/service-system.jar ./ruoyi/modules/system/jar
+cp ../base-modules/service-system/service-system-biz/target/service-system-biz.jar ./ruoyi/modules/system/jar
 
 echo "begin copy ruoyi-modules-file "
 cp ../base-modules/service-file/target/service-file.jar ./ruoyi/modules/file/jar

docker/deploy.sh

@@ -31,7 +31,7 @@ base(){
 
 # 启动程序模块（必须）
 modules(){
-	docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system
+	docker-compose up -d ruoyi-nginx ruoyi-gateway  ruoyi-modules-system
 }
 
 # 关闭所有环境/模块

docker/docker-compose.yml

@@ -14,8 +14,8 @@ services:
       - "8848:8848"
       - "9848:9848"
       - "9849:9849"
-    #depends_on:
-    #  - ruoyi-mysql
+    depends_on:
+      - ruoyi-mysql
   ruoyi-mysql:
     container_name: ruoyi-mysql
     image: mysql:5.7
@@ -76,17 +76,17 @@ services:
       - ruoyi-redis
     links:
       - ruoyi-redis
-  ruoyi-auth:
-    container_name: ruoyi-auth
-    build:
-      context: ./ruoyi/auth
-      dockerfile: dockerfile
-    ports:
-      - "9200:9200"
-    depends_on:
-      - ruoyi-redis
-    links:
-      - ruoyi-redis
+#  ruoyi-auth:
+#    container_name: ruoyi-auth
+#    build:
+#      context: ./ruoyi/auth
+#      dockerfile: dockerfile
+#    ports:
+#      - "9200:9200"
+#    depends_on:
+#      - ruoyi-redis
+#    links:
+#      - ruoyi-redis
   ruoyi-modules-system:
     container_name: ruoyi-modules-system
     build:

docker/nacos/conf/application.properties

@@ -1,8 +1,8 @@
 spring.datasource.platform=mysql
 db.num=1
-db.url.0=jdbc:mysql://usky-cloud-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
-db.user=usky
-db.password=Yt#75Usky
+db.url.0=jdbc:mysql://101.133.214.75:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+db.user= usky 
+db.password= Yt#75Usky 
 
 nacos.naming.empty-service.auto-clean=true
 nacos.naming.empty-service.clean.initial-delay-ms=50000

docker/ruoyi/auth/dockerfile

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

docker/ruoyi/auth/jar/readme.txt

@@ -1 +0,0 @@
-存放认证中心打包好的jar文件，用于docker启动应用。

docker/ruoyi/gateway/dockerfile

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

docker/ruoyi/modules/system/dockerfile

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