瀏覽代碼

docker 构建调测

lv.wenbin 1 年之前
父節點
當前提交
b624e17691
共有 35 個文件被更改,包括 227 次插入170 次删除
  1. 2 2
      ems-cloud/README.md
  2. 7 7
      ems-cloud/docker/docker-compose.yml
  3. 0 15
      ems-cloud/docker/ruoyi/auth/dockerfile
  4. 0 1
      ems-cloud/docker/ruoyi/auth/jar/readme.txt
  5. 0 15
      ems-cloud/docker/ruoyi/gateway/dockerfile
  6. 0 1
      ems-cloud/docker/ruoyi/gateway/jar/readme.txt
  7. 0 15
      ems-cloud/docker/ruoyi/modules/file/dockerfile
  8. 0 1
      ems-cloud/docker/ruoyi/modules/file/jar/readme.txt
  9. 0 15
      ems-cloud/docker/ruoyi/modules/gen/dockerfile
  10. 0 1
      ems-cloud/docker/ruoyi/modules/gen/jar/readme.txt
  11. 0 15
      ems-cloud/docker/ruoyi/modules/job/dockerfile
  12. 0 1
      ems-cloud/docker/ruoyi/modules/job/jar/readme.txt
  13. 0 15
      ems-cloud/docker/ruoyi/modules/system/dockerfile
  14. 0 1
      ems-cloud/docker/ruoyi/modules/system/jar/readme.txt
  15. 33 0
      ems-cloud/docker/server/auth/dockerfile
  16. 9 0
      ems-cloud/docker/server/auth/start-ruoyi-auth.sh
  17. 32 0
      ems-cloud/docker/server/ems/dockerfile
  18. 9 0
      ems-cloud/docker/server/ems/start-ems-server.sh
  19. 32 0
      ems-cloud/docker/server/gateway/dockerfile
  20. 9 0
      ems-cloud/docker/server/gateway/start-ruoyi-gateway.sh
  21. 32 0
      ems-cloud/docker/server/system/dockerfile
  22. 9 0
      ems-cloud/docker/server/system/start-ruoyi-system.sh
  23. 7 10
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/EmsApplication.java
  24. 0 0
      ems-cloud/ems-modules/ems-server/src/main/resources/application-local.yml
  25. 8 8
      ems-cloud/ems-modules/ems-server/src/main/resources/bootstrap.yml
  26. 6 9
      ems-cloud/ems-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
  27. 0 0
      ems-cloud/ems-modules/ruoyi-system/src/main/resources/application-local.yml
  28. 6 6
      ems-cloud/ems-modules/ruoyi-system/src/main/resources/bootstrap.yml
  29. 6 9
      ems-cloud/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
  30. 0 0
      ems-cloud/ruoyi-auth/src/main/resources/application-local.yml
  31. 7 7
      ems-cloud/ruoyi-auth/src/main/resources/bootstrap.yml
  32. 6 9
      ems-cloud/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
  33. 0 0
      ems-cloud/ruoyi-gateway/src/main/resources/application-local.yml
  34. 7 7
      ems-cloud/ruoyi-gateway/src/main/resources/bootstrap.yml
  35. 0 0
      ems-cloud/sql/ems_sys.sql

+ 2 - 2
ems-cloud/README.md

@@ -19,9 +19,9 @@
 com.ruoyi     
 ├── nrg-modules         // 能源业务模块
 │       └── ruoyi-system                              // 系统模块 [9201]
-│       └── nrg-server                                // 能源管理服务 [9211]
+│       └── ems-server                                // 能源管理服务 [9202]
 ├── ruoyi-ui              // 前端框架 [80]
-├── ruoyi-gateway         // 网关模块 [8080]
+├── ruoyi-gateway         // 网关模块 [9100]
 ├── ruoyi-auth            // 认证中心 [9200]
 ├── ruoyi-api             // 接口模块
 │       └── ruoyi-api-system                          // 系统接口

+ 7 - 7
ems-cloud/docker/docker-compose.yml

@@ -68,7 +68,7 @@ services:
   ruoyi-gateway:
     container_name: ruoyi-gateway
     build:
-      context: ./ruoyi/gateway
+      context: server/gateway
       dockerfile: dockerfile
     ports:
       - "8080:8080"
@@ -79,7 +79,7 @@ services:
   ruoyi-auth:
     container_name: ruoyi-auth
     build:
-      context: ./ruoyi/auth
+      context: server/auth
       dockerfile: dockerfile
     ports:
       - "9200:9200"
@@ -90,7 +90,7 @@ services:
   ruoyi-modules-system:
     container_name: ruoyi-modules-system
     build:
-      context: ./ruoyi/modules/system
+      context: server/system
       dockerfile: dockerfile
     ports:
       - "9201:9201"
@@ -103,7 +103,7 @@ services:
   ruoyi-modules-gen:
     container_name: ruoyi-modules-gen
     build:
-      context: ./ruoyi/modules/gen
+      context: server/gen
       dockerfile: dockerfile
     ports:
       - "9202:9202"
@@ -114,7 +114,7 @@ services:
   ruoyi-modules-job:
     container_name: ruoyi-modules-job
     build:
-      context: ./ruoyi/modules/job
+      context: server/job
       dockerfile: dockerfile
     ports:
       - "9203:9203"
@@ -125,7 +125,7 @@ services:
   ruoyi-modules-file:
     container_name: ruoyi-modules-file
     build:
-      context: ./ruoyi/modules/file
+      context: server/file
       dockerfile: dockerfile
     ports:
       - "9300:9300"
@@ -134,7 +134,7 @@ services:
   ruoyi-visual-monitor:
     container_name: ruoyi-visual-monitor
     build:
-      context: ./ruoyi/visual/monitor
+      context: server/visual/monitor
       dockerfile: dockerfile
     ports:
       - "9100:9100"

+ 0 - 15
ems-cloud/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"]

+ 0 - 1
ems-cloud/docker/ruoyi/auth/jar/readme.txt

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

+ 0 - 15
ems-cloud/docker/ruoyi/gateway/dockerfile

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

+ 0 - 1
ems-cloud/docker/ruoyi/gateway/jar/readme.txt

@@ -1 +0,0 @@
-存放网关模块打包好的jar文件,用于docker启动应用。

+ 0 - 15
ems-cloud/docker/ruoyi/modules/file/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-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar
-# 启动文件服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"]

+ 0 - 1
ems-cloud/docker/ruoyi/modules/file/jar/readme.txt

@@ -1 +0,0 @@
-存放文件服务打包好的jar文件,用于docker启动应用。

+ 0 - 15
ems-cloud/docker/ruoyi/modules/gen/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-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
-# 启动代码生成服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"]

+ 0 - 1
ems-cloud/docker/ruoyi/modules/gen/jar/readme.txt

@@ -1 +0,0 @@
-存放代码生成打包好的jar文件,用于docker启动应用。

+ 0 - 15
ems-cloud/docker/ruoyi/modules/job/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-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar
-# 启动定时任务服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"]

+ 0 - 1
ems-cloud/docker/ruoyi/modules/job/jar/readme.txt

@@ -1 +0,0 @@
-存放定时任务打包好的jar文件,用于docker启动应用。

+ 0 - 15
ems-cloud/docker/ruoyi/modules/system/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-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
-# 启动系统服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"]

+ 0 - 1
ems-cloud/docker/ruoyi/modules/system/jar/readme.txt

@@ -1 +0,0 @@
-存放系统模块打包好的jar文件,用于docker启动应用。

+ 33 - 0
ems-cloud/docker/server/auth/dockerfile

@@ -0,0 +1,33 @@
+########################################################
+#   docker build -t ruoyi-auth:3.6.4 .
+########################################################
+
+# 基础镜像
+FROM  k8s.xt.wenhq.top:8082/docker_r/javarun:1.2
+# author
+MAINTAINER hs_lvwenbin@163.com
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar
+
+# 声明端口
+EXPOSE 9200
+
+# 环境变量
+ENV APPLICATION_NAME=ruoyi-auth
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动认证服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ruoyi-auth.jar \
+  --spring.application.name=$APPLICATION_NAME \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER

+ 9 - 0
ems-cloud/docker/server/auth/start-ruoyi-auth.sh

@@ -0,0 +1,9 @@
+# /bin/bash
+docker run -itd --name ems-auth --hostname ems-auth --privileged=true \
+  -p 0.0.0.0:9200:9200 \
+  -e JAVA_OPTS='-Duser.timezone=Asia/Shanghai' \
+  -e APPLICATION_NAME='ems-auth' \
+  -e GRPC_PORT_OFFSET='1' \
+  -e SPRING_PROFILES_ACTIVE=dev \
+  -e NACOS_SERVER='172.192.10.105:30003' \
+  ruoyi-auth:3.6.4

+ 32 - 0
ems-cloud/docker/server/ems/dockerfile

@@ -0,0 +1,32 @@
+########################################################
+#   docker build -t ems-server:1.0 .
+########################################################
+
+# 基础镜像
+FROM  k8s.xt.wenhq.top:8082/docker_r/javarun:1.2
+# author
+MAINTAINER hs_lvwenbin@163.com
+
+# 挂载目录
+VOLUME /home/ems
+# 创建目录
+RUN mkdir -p /home/ems
+# 指定路径
+WORKDIR /home/ems
+# 复制jar文件到路径
+COPY ems-server.jar /home/ems/ems-server.jar
+
+# 声明端口
+EXPOSE 9202
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动网关服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ems-server.jar \
+  --spring.application.name=$APPLICATION_NAME \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER

+ 9 - 0
ems-cloud/docker/server/ems/start-ems-server.sh

@@ -0,0 +1,9 @@
+# /bin/bash
+docker run -itd --name ems-server --hostname ems-server --privileged=true \
+  -p 0.0.0.0:9202:9202 \
+  -e JAVA_OPTS='-Duser.timezone=Asia/Shanghai' \
+  -e APPLICATION_NAME='ems-server' \
+  -e GRPC_PORT_OFFSET='1' \
+  -e SPRING_PROFILES_ACTIVE=local \
+  -e NACOS_SERVER='172.192.10.105:30003' \
+  ems-server:1.0

+ 32 - 0
ems-cloud/docker/server/gateway/dockerfile

@@ -0,0 +1,32 @@
+########################################################
+#   docker build -t ruoyi-gateway:3.6.4 .
+########################################################
+
+# 基础镜像
+FROM  k8s.xt.wenhq.top:8082/docker_r/javarun:1.2
+# author
+MAINTAINER hs_lvwenbin@163.com
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
+
+# 声明端口
+EXPOSE 9100
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动网关服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ruoyi-gateway.jar \
+  --spring.application.name=$APPLICATION_NAME \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER

+ 9 - 0
ems-cloud/docker/server/gateway/start-ruoyi-gateway.sh

@@ -0,0 +1,9 @@
+# /bin/bash
+docker run -itd --name ems-gateway --hostname ems-gateway --privileged=true \
+  -p 0.0.0.0:9100:9100 \
+  -e JAVA_OPTS='-Duser.timezone=Asia/Shanghai' \
+  -e APPLICATION_NAME='ems-gateway' \
+  -e GRPC_PORT_OFFSET='1' \
+  -e SPRING_PROFILES_ACTIVE=locale \
+  -e NACOS_SERVER='172.192.10.105:30003' \
+  ruoyi-gateway:3.6.4

+ 32 - 0
ems-cloud/docker/server/system/dockerfile

@@ -0,0 +1,32 @@
+########################################################
+#   docker build -t ruoyi-system:3.6.4 .
+########################################################
+
+# 基础镜像
+FROM  k8s.xt.wenhq.top:8082/docker_r/javarun:1.2
+# author
+MAINTAINER hs_lvwenbin@163.com
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ruoyi-system.jar /home/ruoyi/ruoyi-system.jar
+
+# 声明端口
+EXPOSE 9201
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动网关服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ruoyi-system.jar \
+  --spring.application.name=$APPLICATION_NAME \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER

+ 9 - 0
ems-cloud/docker/server/system/start-ruoyi-system.sh

@@ -0,0 +1,9 @@
+# /bin/bash
+docker run -itd --name ems-system --hostname ems-system --privileged=true \
+  -p 0.0.0.0:9201:9201 \
+  -e JAVA_OPTS='-Duser.timezone=Asia/Shanghai' \
+  -e APPLICATION_NAME='ems-system' \
+  -e GRPC_PORT_OFFSET='1' \
+  -e SPRING_PROFILES_ACTIVE=local \
+  -e NACOS_SERVER='172.192.10.105:30003' \
+  ruoyi-system:3.6.4

+ 7 - 10
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/EmsApplication.java

@@ -21,15 +21,12 @@ public class EmsApplication
     {
         //System.setProperty(GrpcConstants.NACOS_SERVER_GRPC_PORT_OFFSET_KEY,"1");
         SpringApplication.run(EmsApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  能源管理启动成功   ლ(´ڡ`ლ)゙  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        System.out.println("(♥◠‿◠)ノ゙  能源管理服务启动成功   ლ(´ڡ`ლ)゙  \n" +
+            "  _    _                   _          \n" +
+            " | |  | |                 | |         \n" +
+            " | |__| |_   _  __ _   ___| |__   ___ \n" +
+            " |  __  | | | |/ _` | / __| '_ \\ / _ \\\n" +
+            " | |  | | |_| | (_| | \\__ \\ | | |  __/\n" +
+            " |_|  |_|\\__,_|\\__,_| |___/_| |_|\\___|\n");
     }
 }

+ 0 - 0
ems-cloud/ems-modules/ems-server/src/main/resources/application-dev.yml → ems-cloud/ems-modules/ems-server/src/main/resources/application-local.yml


+ 8 - 8
ems-cloud/ems-modules/ems-server/src/main/resources/bootstrap.yml

@@ -1,26 +1,26 @@
 # Tomcat
 server:
-  port: 9211
+  port: 9202
   servlet:
-    context-path: /nrg
+    context-path: /ems
 # Spring
 spring:
   application:
     # 应用名称
-    name: nrg-server
+    name: ${APPLICATION_NAME:ems-server}
   profiles:
     # 环境配置
-    active: dev
+    active: ${APPLICATION_NAME:local}
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
         # 配置文件格式
         file-extension: yml
         # 共享配置

+ 6 - 9
ems-cloud/ems-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java

@@ -22,14 +22,11 @@ public class RuoYiSystemApplication
         //System.setProperty(GrpcConstants.NACOS_SERVER_GRPC_PORT_OFFSET_KEY,"1");
         SpringApplication.run(RuoYiSystemApplication.class, args);
         System.out.println("(♥◠‿◠)ノ゙  系统模块启动成功   ლ(´ڡ`ლ)゙  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+            "  _    _                   _          \n" +
+            " | |  | |                 | |         \n" +
+            " | |__| |_   _  __ _   ___| |__   ___ \n" +
+            " |  __  | | | |/ _` | / __| '_ \\ / _ \\\n" +
+            " | |  | | |_| | (_| | \\__ \\ | | |  __/\n" +
+            " |_|  |_|\\__,_|\\__,_| |___/_| |_|\\___|\n");
     }
 }

+ 0 - 0
ems-cloud/ems-modules/ruoyi-system/src/main/resources/application-dev.yml → ems-cloud/ems-modules/ruoyi-system/src/main/resources/application-local.yml


+ 6 - 6
ems-cloud/ems-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -5,20 +5,20 @@ server:
 spring:
   application:
     # 应用名称
-    name: ruoyi-system
+    name: ${APPLICATION_NAME:ruoyi-system}
   profiles:
     # 环境配置
-    active: dev
+    active: ${SPRING_PROFILES_ACTIVE:local}
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
         # 配置文件格式
         file-extension: yml
         # 共享配置

+ 6 - 9
ems-cloud/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -18,14 +18,11 @@ public class RuoYiAuthApplication
     {
         SpringApplication.run(RuoYiAuthApplication.class, args);
         System.out.println("(♥◠‿◠)ノ゙  认证授权中心启动成功   ლ(´ڡ`ლ)゙  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+                "  _    _                   _          \n" +
+                " | |  | |                 | |         \n" +
+                " | |__| |_   _  __ _   ___| |__   ___ \n" +
+                " |  __  | | | |/ _` | / __| '_ \\ / _ \\\n" +
+                " | |  | | |_| | (_| | \\__ \\ | | |  __/\n" +
+                " |_|  |_|\\__,_|\\__,_| |___/_| |_|\\___|\n");
     }
 }

+ 0 - 0
ems-cloud/ruoyi-auth/src/main/resources/application-dev.yml → ems-cloud/ruoyi-auth/src/main/resources/application-local.yml


+ 7 - 7
ems-cloud/ruoyi-auth/src/main/resources/bootstrap.yml

@@ -6,22 +6,22 @@ server:
 spring: 
   application:
     # 应用名称
-    name: ruoyi-auth
+    name: ${APPLICATION_NAME:ruoyi-auth}
   profiles:
     # 环境配置
-    active: dev
+    active: ${SPRING_PROFILES_ACTIVE:local}
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - ems-application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

+ 6 - 9
ems-cloud/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java

@@ -16,14 +16,11 @@ public class RuoYiGatewayApplication
     {
         SpringApplication.run(RuoYiGatewayApplication.class, args);
         System.out.println("(♥◠‿◠)ノ゙  若依网关启动成功   ლ(´ڡ`ლ)゙  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+            "  _    _                   _          \n" +
+            " | |  | |                 | |         \n" +
+            " | |__| |_   _  __ _   ___| |__   ___ \n" +
+            " |  __  | | | |/ _` | / __| '_ \\ / _ \\\n" +
+            " | |  | | |_| | (_| | \\__ \\ | | |  __/\n" +
+            " |_|  |_|\\__,_|\\__,_| |___/_| |_|\\___|\n");
     }
 }

+ 0 - 0
ems-cloud/ruoyi-gateway/src/main/resources/application-dev.yml → ems-cloud/ruoyi-gateway/src/main/resources/application-local.yml


+ 7 - 7
ems-cloud/ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -1,25 +1,25 @@
 # Tomcat
 server:
-  port: 8080
+  port: 9100
 
 # Spring
 spring: 
   application:
     # 应用名称
-    name: ruoyi-gateway
+    name: ${APPLICATION_NAME:ruoyi-gateway}
   profiles:
     # 环境配置
-    active: dev
+    active: ${SPRING_PROFILES_ACTIVE:local}
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
       config:
         # 配置中心地址
-        server-addr: 172.192.10.105:30003
-        group: nrg
+        server-addr: ${NACOS_SERVER:172.192.10.105:30003}
+        group: ems
         # 配置文件格式
         file-extension: yml
         # 共享配置

+ 0 - 0
ems-cloud/sql/ems_db.sql → ems-cloud/sql/ems_sys.sql