From 03b5b8a480fb201e288486299eb385a00d2aac66 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 09:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2
---
src/main/resources/application.yml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 684c1e5..925f638 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
+ #jdbc-url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
+ jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
username: sa
password: sa@123
mvc:
@@ -31,10 +31,11 @@
# jdbc-url: jdbc:mysql://127.0.0.1:3306/wmsdata
# username: root
# password: root
+ #driver-class-name: com.mysql.cj.jdbc.Driver
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
- username: liku
- password: 123456
+ jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms_middle
+ username: sa
+ password: sa@123
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
--
Gitblit v1.9.1