From 78d47cf36372d433ad282b441bc5a3900a2e74a9 Mon Sep 17 00:00:00 2001
From: guotao <499836921@qq.com>
Date: Mon, 12 Jan 2026 19:18:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-local.yml | 14 --------------
 src/main/resources/application.yml       | 12 ++++++------
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 src/main/resources/application-local.yml

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
deleted file mode 100644
index 074d7f7..0000000
--- a/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.20:3306/findme-merchant?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    username: root
-    password: 123456
-  data:
-    redis:
-      host: 192.168.1.20
-      port: 6379
-      password: 123456
-      database: 0
-      timeout: 3s
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6242563..83feb8c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: default,local
+    active: default
   application:
     name: findme-backend-merchant
   main:
@@ -21,14 +21,14 @@ spring:
         format_sql: true
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${MYSQL_HOST:192.168.1.20}:${MYSQL_PORT:3306}/findme-merchant?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://${MYSQL_HOST:8.137.94.92}:${MYSQL_PORT:23306}/findme-merchant?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     username: ${MYSQL_USER:root}
-    password: ${MYSQL_PASS:123456}
+    password: ${MYSQL_PASS:pW2CwlHte3%^#y8Z}
   data:
     redis:
-      host: ${REDIS_HOST:192.168.1.20}
-      port: ${REDIS_PORT:6379}
-      password: ${REDIS_PASS:123456}
+      host: ${REDIS_HOST:8.137.94.92}
+      port: ${REDIS_PORT:26379}
+      password: ${REDIS_PASS:9Hii(AaVzTNY<%e}
       database: 0
       timeout: 3s