From 5f653cd83425db29ccf514e9fd966a90c7eeab32 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 13:47:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-cloud/iailab-xxl-job/src/main/resources/application.yaml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/iailab-cloud/iailab-xxl-job/src/main/resources/application.yaml b/iailab-cloud/iailab-xxl-job/src/main/resources/application.yaml
index 115d06d..7fa0abd 100644
--- a/iailab-cloud/iailab-xxl-job/src/main/resources/application.yaml
+++ b/iailab-cloud/iailab-xxl-job/src/main/resources/application.yaml
@@ -5,7 +5,7 @@
 
 logging:
   file:
-    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
+    name: @log.path@/logs/${spring.application.name}.log # 日志文件名,全路径
 
 spring:
   application:
@@ -13,7 +13,23 @@
   profiles:
     # 环境配置
 #    active: @profiles.active@
-    active: local
+    active: @profiles.active@
+
+  cloud:
+    nacos:
+      server-addr: @nacos.server@ # Nacos 服务器地址
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery: # 【配置中心】配置项
+        namespace: @profiles.active@  # 命名空间。这里使用 dev 开发环境
+        group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
+        metadata:
+          version: @nacos.metadata.version@ # 服务实例的版本号,可用于灰度发布
+          management.context-path: ${server.servlet.context-path}/actuator
+      config: # 【注册中心】配置项
+        namespace: @profiles.active@ # 命名空间。这里使用 dev 开发环境
+        group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
+
     # Spring Boot Admin 配置项
     boot:
       admin:
@@ -36,7 +52,7 @@
       number_format: 0.
       new_builtin_class_resolver: safer
   datasource:
-    url: jdbc:mysql://172.16.8.100:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver

--
Gitblit v1.9.3