From 34aee08191a8f90675cbb461b6ad12a22022089f Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Sat, 8 Feb 2025 15:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=8D=95=E7=8B=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dk-auth/Dockerfile | 10 +++++-----
dk-auth/src/main/resources/application.yml | 2 +-
dk-common/common-sse/pom.xml | 2 +-
dk-gateway/Dockerfile | 10 +++++-----
dk-gateway/src/main/resources/application.yml | 4 ++--
dk-modules/gen/Dockerfile | 6 +++---
dk-modules/job/Dockerfile | 8 ++++----
dk-modules/resource/Dockerfile | 10 +++++-----
dk-modules/system/src/main/resources/application.yml | 2 +-
dk-modules/workflow/Dockerfile | 10 +++++-----
dk-modules/workflow/src/main/resources/application.yml | 2 +-
dk-visual/monitor/Dockerfile | 6 +++---
dk-visual/monitor/src/main/resources/application.yml | 2 +-
dk-visual/nacos/Dockerfile | 6 +++---
.../nacos/src/main/resources/application.properties | 4 ++--
dk-visual/seata-server/Dockerfile | 8 ++++----
dk-visual/sentinel-dashboard/Dockerfile | 8 ++++----
.../src/main/resources/application.yml | 2 +-
dk-visual/snailjob-server/Dockerfile | 6 +++---
.../snailjob-server/src/main/resources/application.yml | 2 +-
pom.xml | 8 ++++----
21 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/dk-auth/Dockerfile b/dk-auth/Dockerfile
index 30b7c66..59311cf 100644
--- a/dk-auth/Dockerfile
+++ b/dk-auth/Dockerfile
@@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/auth/logs \
- /ruoyi/auth/temp \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/auth/logs \
+ /dk/auth/temp \
+ /dk/skywalking/agent
-WORKDIR /ruoyi/auth
+WORKDIR /dk/auth
ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
-ADD ./target/ruoyi-auth.jar ./app.jar
+ADD ./target/dk-auth.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-auth \
diff --git a/dk-auth/src/main/resources/application.yml b/dk-auth/src/main/resources/application.yml
index d1886f8..8a8aed8 100644
--- a/dk-auth/src/main/resources/application.yml
+++ b/dk-auth/src/main/resources/application.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: dk-auth
+ name: auth
profiles:
# 环境配置
active: @profiles.active@
diff --git a/dk-common/common-sse/pom.xml b/dk-common/common-sse/pom.xml
index afc8c8e..c94cb8e 100644
--- a/dk-common/common-sse/pom.xml
+++ b/dk-common/common-sse/pom.xml
@@ -12,7 +12,7 @@
common-sse
- ruoyi-common-sse 模块
+ common-sse 模块
diff --git a/dk-gateway/Dockerfile b/dk-gateway/Dockerfile
index 7289856..77a2cfd 100644
--- a/dk-gateway/Dockerfile
+++ b/dk-gateway/Dockerfile
@@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/gateway/logs \
- /ruoyi/gateway/temp \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/gateway/logs \
+ /dk/gateway/temp \
+ /dk/skywalking/agent
-WORKDIR /ruoyi/gateway
+WORKDIR /dk/gateway
ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
-ADD ./target/ruoyi-gateway.jar ./app.jar
+ADD ./target/dk-gateway.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-gateway \
diff --git a/dk-gateway/src/main/resources/application.yml b/dk-gateway/src/main/resources/application.yml
index e4dfd68..9edace0 100644
--- a/dk-gateway/src/main/resources/application.yml
+++ b/dk-gateway/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# Tomcat
server:
- port: 8080
+ port: 11100
servlet:
context-path: /
@@ -8,7 +8,7 @@ server:
spring:
application:
# 应用名称
- name: dk-gateway
+ name: gateway
profiles:
# 环境配置
active: @profiles.active@
diff --git a/dk-modules/gen/Dockerfile b/dk-modules/gen/Dockerfile
index 6afad08..5005af9 100644
--- a/dk-modules/gen/Dockerfile
+++ b/dk-modules/gen/Dockerfile
@@ -5,14 +5,14 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/gen/logs
+RUN mkdir -p /dk/gen/logs
-WORKDIR /ruoyi/gen
+WORKDIR /dk/gen
ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
-ADD ./target/ruoyi-gen.jar ./app.jar
+ADD ./target/dk-gen.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} ${JAVA_OPTS} -jar app.jar
diff --git a/dk-modules/job/Dockerfile b/dk-modules/job/Dockerfile
index cdfe40e..c65298a 100644
--- a/dk-modules/job/Dockerfile
+++ b/dk-modules/job/Dockerfile
@@ -5,9 +5,9 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/job/logs \
- /ruoyi/job/temp \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/job/logs \
+ /dk/job/temp \
+ /dk/skywalking/agent
WORKDIR /ruoyi/job
@@ -15,7 +15,7 @@ ENV SERVER_PORT=9203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
-ADD ./target/ruoyi-job.jar ./app.jar
+ADD ./target/dk-job.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-job \
diff --git a/dk-modules/resource/Dockerfile b/dk-modules/resource/Dockerfile
index 2f3ca58..1b4bb12 100644
--- a/dk-modules/resource/Dockerfile
+++ b/dk-modules/resource/Dockerfile
@@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/resource/logs \
- /ruoyi/resource/temp \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/resource/logs \
+ /dk/resource/temp \
+ /dk/skywalking/agent
-WORKDIR /ruoyi/resource
+WORKDIR /dk/resource
ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
-ADD ./target/ruoyi-resource.jar ./app.jar
+ADD ./target/dk-resource.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-resource \
diff --git a/dk-modules/system/src/main/resources/application.yml b/dk-modules/system/src/main/resources/application.yml
index e070438..866b643 100644
--- a/dk-modules/system/src/main/resources/application.yml
+++ b/dk-modules/system/src/main/resources/application.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: dk-system
+ name: system
profiles:
# 环境配置
active: @profiles.active@
diff --git a/dk-modules/workflow/Dockerfile b/dk-modules/workflow/Dockerfile
index c72c688..696278d 100644
--- a/dk-modules/workflow/Dockerfile
+++ b/dk-modules/workflow/Dockerfile
@@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/workflow/logs \
- /ruoyi/workflow/temp \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/workflow/logs \
+ /dk/workflow/temp \
+ /dk/skywalking/agent
-WORKDIR /ruoyi/workflow
+WORKDIR /dk/workflow
ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}
-ADD ./target/ruoyi-workflow.jar ./app.jar
+ADD ./target/dk-workflow.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-system \
diff --git a/dk-modules/workflow/src/main/resources/application.yml b/dk-modules/workflow/src/main/resources/application.yml
index dc2b2a0..afdc1c2 100644
--- a/dk-modules/workflow/src/main/resources/application.yml
+++ b/dk-modules/workflow/src/main/resources/application.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: dk-workflow
+ name: workflow
profiles:
# 环境配置
active: @profiles.active@
diff --git a/dk-visual/monitor/Dockerfile b/dk-visual/monitor/Dockerfile
index 43a3ce6..4a52c60 100644
--- a/dk-visual/monitor/Dockerfile
+++ b/dk-visual/monitor/Dockerfile
@@ -5,15 +5,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/monitor/logs
+RUN mkdir -p /dk/monitor/logs
-WORKDIR /ruoyi/monitor
+WORKDIR /dk/monitor
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE 9100
-ADD ./target/ruoyi-monitor.jar ./app.jar
+ADD ./target/dk-monitor.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
diff --git a/dk-visual/monitor/src/main/resources/application.yml b/dk-visual/monitor/src/main/resources/application.yml
index e0e843c..061b13c 100644
--- a/dk-visual/monitor/src/main/resources/application.yml
+++ b/dk-visual/monitor/src/main/resources/application.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: dk-monitor
+ name: monitor
profiles:
# 环境配置
active: @profiles.active@
diff --git a/dk-visual/nacos/Dockerfile b/dk-visual/nacos/Dockerfile
index 526e547..94f77e5 100644
--- a/dk-visual/nacos/Dockerfile
+++ b/dk-visual/nacos/Dockerfile
@@ -5,15 +5,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/nacos
+RUN mkdir -p /dk/nacos
-WORKDIR /ruoyi/nacos
+WORKDIR /dk/nacos
EXPOSE 8848
ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
-ADD ./target/ruoyi-nacos.jar ./app.jar
+ADD ./target/dk-nacos.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom ${JAVA_OPTS} -jar app.jar
diff --git a/dk-visual/nacos/src/main/resources/application.properties b/dk-visual/nacos/src/main/resources/application.properties
index 9a38864..3ac148a 100644
--- a/dk-visual/nacos/src/main/resources/application.properties
+++ b/dk-visual/nacos/src/main/resources/application.properties
@@ -84,8 +84,8 @@ nacos.naming.empty-service.clean.period-time-ms=30000
#*************** Metrics Related Configurations ***************#
# 指向 ruoyi-monitor 监控
-spring.boot.admin.client.url=http://127.0.0.1:9100
-spring.boot.admin.client.username=ruoyi
+spring.boot.admin.client.url=http://114.235.183.173:9100
+spring.boot.admin.client.username=admin
spring.boot.admin.client.password=123456
spring.boot.admin.client.instance.service-host-type=IP
spring.boot.admin.client.instance.metadata.username: ${spring.boot.admin.client.username}
diff --git a/dk-visual/seata-server/Dockerfile b/dk-visual/seata-server/Dockerfile
index 46a8c83..7a71000 100644
--- a/dk-visual/seata-server/Dockerfile
+++ b/dk-visual/seata-server/Dockerfile
@@ -5,10 +5,10 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/seata-server/logs \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/seata-server/logs \
+ /dk/skywalking/agent
-WORKDIR /ruoyi/seata-server
+WORKDIR /dk/seata-server
ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" SEATA_IP="" SEATA_PORT=""
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -16,7 +16,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
EXPOSE 7091
EXPOSE 8091
-ADD ./target/ruoyi-seata-server.jar ./app.jar
+ADD ./target/dk-seata-server.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
#-Dskywalking.agent.service_name=ruoyi-seata-server", \
diff --git a/dk-visual/sentinel-dashboard/Dockerfile b/dk-visual/sentinel-dashboard/Dockerfile
index 50e944e..b3e18e1 100644
--- a/dk-visual/sentinel-dashboard/Dockerfile
+++ b/dk-visual/sentinel-dashboard/Dockerfile
@@ -5,16 +5,16 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/sentinel-dashboard/logs \
- /ruoyi/skywalking/agent
+RUN mkdir -p /dk/sentinel-dashboard/logs \
+ /dk/skywalking/agent
-WORKDIR /ruoyi/sentinel-dashboard
+WORKDIR /dk/sentinel-dashboard
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE 8718
-ADD ./target/ruoyi-sentinel-dashboard.jar ./app.jar
+ADD ./target/dk-sentinel-dashboard.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
#-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard \
diff --git a/dk-visual/sentinel-dashboard/src/main/resources/application.yml b/dk-visual/sentinel-dashboard/src/main/resources/application.yml
index c4f54af..55f2332 100644
--- a/dk-visual/sentinel-dashboard/src/main/resources/application.yml
+++ b/dk-visual/sentinel-dashboard/src/main/resources/application.yml
@@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
- name: dk-sentinel-dashboard
+ name: sentinel-dashboard
profiles:
# 环境配置
active: @profiles.active@
diff --git a/dk-visual/snailjob-server/Dockerfile b/dk-visual/snailjob-server/Dockerfile
index a66ca66..1f617db 100644
--- a/dk-visual/snailjob-server/Dockerfile
+++ b/dk-visual/snailjob-server/Dockerfile
@@ -5,16 +5,16 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
-RUN mkdir -p /ruoyi/snailjob/logs
+RUN mkdir -p /dk/snailjob/logs
-WORKDIR /ruoyi/snailjob
+WORKDIR /dk/snailjob
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
EXPOSE 8800
EXPOSE 17888
-ADD ./target/ruoyi-snailjob-server.jar ./app.jar
+ADD ./target/dk-snailjob-server.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
diff --git a/dk-visual/snailjob-server/src/main/resources/application.yml b/dk-visual/snailjob-server/src/main/resources/application.yml
index 41d8ff9..652ee42 100644
--- a/dk-visual/snailjob-server/src/main/resources/application.yml
+++ b/dk-visual/snailjob-server/src/main/resources/application.yml
@@ -5,7 +5,7 @@ server:
spring:
application:
- name: dk-snailjob-server
+ name: snailjob-server
profiles:
active: @profiles.active@
web:
diff --git a/pom.xml b/pom.xml
index aeff2df..9855181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,12 +78,12 @@
dev
- 127.0.0.1:8848
+ 114.235.183.147:8848
DEFAULT_GROUP
DEFAULT_GROUP
nacos
nacos
- 127.0.0.1:4560
+ 114.235.183.147:4560
@@ -94,12 +94,12 @@
prod
prod
- 127.0.0.1:8848
+ 114.235.183.147:8848
DEFAULT_GROUP
DEFAULT_GROUP
nacos
nacos
- 127.0.0.1:4560
+ 114.235.183.147:4560