From 79c1cc71dfcf2ac2a96433439507e582b7bf23e2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 九月 2025 09:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/application-test.yml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 4228d35..14301b5 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -95,7 +95,7 @@
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://127.0.0.1:3306/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+        url: jdbc:mysql://192.168.110.34:3306/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
         username: root
         password: 123456
       # 从库数据源
@@ -203,4 +203,16 @@
   config:
     accessKeyId: LTAI5t99NH2Wwoq48ho72u8M
     accessKeySecret: wAGHKUEBrrTgDcbfjnBKTEt5858Ru5
-    signName: "海诊通"
\ No newline at end of file
+    signName: "海诊通"
+lakala:
+  MerchantNo: 1
+  TermNo: 1
+  NotifyUrl: 1
+  subAppId: 1
+  appId: 1
+  serialNo: 1
+  priKeyStr: 1
+  lklCerStr: 1
+  lklNotifyCerStr: 1
+  sm4Key: 1
+  serverUrl: 1
\ No newline at end of file

--
Gitblit v1.7.1