From 5db5b506105aecd6e095e20e0f290c69da9f42d0 Mon Sep 17 00:00:00 2001
From: zhujj <Administrator@G6DKBNY0IH0AICJ>
Date: Mon, 10 Dec 2018 10:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 56968c135..4795f6c0b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,7 +8,7 @@
         <version>3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
     <artifactId>ruoyi-admin</artifactId>
 	
 	<description>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 931a966ce..18e301b28 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://localhost:3306/jeesis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
+                url: jdbc:mysql://localhost:3306/jeesis-exam?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
                 username: root
                 password: root
             # 从库数据源