From 264d3e7fa274c4fb0f49de5ff59b9d5951f54cc5 Mon Sep 17 00:00:00 2001
From: Bo <septemyang@163.com>
Date: Tue, 17 Aug 2021 21:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9maven=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BAit=5Fwar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                           | 2 +-
 ruoyi-admin/pom.xml                                  | 3 +++
 ruoyi-admin/src/main/resources/application-druid.yml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9953c42ef..7c7741b4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,4 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
-/ruoyi-admin/src/main/resources/application-druid.yml
+*/application-druid.yml
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index de11488db..d865c3487 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -158,7 +158,10 @@
                 </configuration>
             </plugin> -->
         </plugins>
+        <!--
         <finalName>${project.artifactId}</finalName>
+       -->
+        <finalName>it_war</finalName>
     </build>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 86ea6e820..c4e2b7d3d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.2.18:3306/bps?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.2.18:3306/bps_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: abc.123
             # 从库数据源