Ver código fonte

配置修改

chenxiaoxiang 9 meses atrás
pai
commit
a67e9d9d11

+ 1 - 1
docker/ruoyi/auth/dockerfile

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar
13
 COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar
14
 # 启动认证服务
14
 # 启动认证服务
15
-ENTRYPOINT ["java","-jar","ruoyi-auth.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-auth.jar"]

+ 1 - 1
docker/ruoyi/gateway/dockerfile

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
13
 COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
14
 # 启动网关服务
14
 # 启动网关服务
15
-ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-gateway.jar"]

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

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar
13
 COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar
14
 # 启动文件服务
14
 # 启动文件服务
15
-ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-modules-file.jar"]

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

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
13
 COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
14
 # 启动代码生成服务
14
 # 启动代码生成服务
15
-ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-modules-gen.jar"]

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

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar
13
 COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar
14
 # 启动定时任务服务
14
 # 启动定时任务服务
15
-ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-modules-job.jar"]

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

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
13
 COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
14
 # 启动系统服务
14
 # 启动系统服务
15
-ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-modules-system.jar"]

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

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
12
 # 复制jar文件到路径
12
 # 复制jar文件到路径
13
 COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar
13
 COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar
14
 # 启动系统服务
14
 # 启动系统服务
15
-ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"]
15
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-visual-monitor.jar"]

+ 1 - 1
ruoyi-auth/src/main/resources/bootstrap.yml

@@ -9,5 +9,5 @@ spring:
9
     name: ruoyi-auth
9
     name: ruoyi-auth
10
   profiles:
10
   profiles:
11
     # 环境配置
11
     # 环境配置
12
-    active: dev
12
+    active: local
13
 
13
 

+ 1 - 1
ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
9
     name: ruoyi-file
9
     name: ruoyi-file
10
   profiles:
10
   profiles:
11
     # 环境配置
11
     # 环境配置
12
-    active: dev
12
+    active: local
13
   cloud:
13
   cloud:
14
     nacos:
14
     nacos:
15
       discovery:
15
       discovery:

+ 2 - 2
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-local.yml

@@ -7,7 +7,7 @@ spring:
7
         server-addr: 192.168.3.222:8848
7
         server-addr: 192.168.3.222:8848
8
         username: nacos
8
         username: nacos
9
         password: nacos
9
         password: nacos
10
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
10
+        namespace: local
11
       config:
11
       config:
12
         # 配置中心地址
12
         # 配置中心地址
13
         username: nacos
13
         username: nacos
@@ -18,5 +18,5 @@ spring:
18
         # 共享配置
18
         # 共享配置
19
         shared-configs:
19
         shared-configs:
20
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
20
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
21
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
21
+        namespace: local
22
 
22
 

+ 1 - 1
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@ spring:
9
     name: ruoyi-gen
9
     name: ruoyi-gen
10
   profiles:
10
   profiles:
11
     # 环境配置
11
     # 环境配置
12
-    active: dev
12
+    active: local

+ 1 - 1
ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
9
     name: ruoyi-job
9
     name: ruoyi-job
10
   profiles:
10
   profiles:
11
     # 环境配置
11
     # 环境配置
12
-    active: dev
12
+    active: local
13
   cloud:
13
   cloud:
14
     nacos:
14
     nacos:
15
       discovery:
15
       discovery:

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@ spring:
9
     name: ruoyi-system
9
     name: ruoyi-system
10
   profiles:
10
   profiles:
11
     # 环境配置
11
     # 环境配置
12
-    active: dev
12
+    active: local

+ 1 - 1
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -9,5 +9,5 @@ spring:
9
     name: ruoyi-monitor
9
     name: ruoyi-monitor
10
   profiles:
10
   profiles:
11
     # 环境配置
11
     # 环境配置
12
-    active: dev
12
+    active: local
13
 
13