From e201b58b3b03a0b12052240848190b975631b9b2 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Thu, 22 Aug 2024 10:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                            |  1 +
 .../src/main/resources/application-druid.yml   | 18 +++++++++---------
 .../resources/mapper/TBaseProviderMapper.xml   |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index d3b06be..1261739 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/bin/package.bat" charset="GBK" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/wms-admin/src/main/java" charset="UTF-8" />
diff --git a/wms-admin/src/main/resources/application-druid.yml b/wms-admin/src/main/resources/application-druid.yml
index 005eb15..d0e9baf 100644
--- a/wms-admin/src/main/resources/application-druid.yml
+++ b/wms-admin/src/main/resources/application-druid.yml
@@ -5,16 +5,16 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-#            master:
-#                url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-##                password: ntscc@2018
-#                password: root
-
             master:
-                url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: developer
-                password: developer
+                url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: ntscc@2018
+ #               password: root
+
+#            master:
+#                url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: developer
+#                password: developer
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml b/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml
index d4cce0b..849904e 100644
--- a/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml
+++ b/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml
@@ -2,5 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
 <mapper namespace="com.ruoyi.business.mapper.TBaseProviderMapper">
 </mapper>
\ No newline at end of file