diff --git a/bin/clean.bat b/bin/clean.bat
index 2b3a6133..5c2a3b2b 100644
--- a/bin/clean.bat
+++ b/bin/clean.bat
@@ -1,14 +1,12 @@
 @echo off
 echo.
-echo [信息] 清理生成路径。
-echo.
-pause
+echo [��Ϣ] ��������·����
 echo.
 
+%~d0
 cd %~dp0
-cd..
 
+cd ..
 call mvn clean
 
-cd bin
 pause
\ No newline at end of file
diff --git a/bin/package.bat b/bin/package.bat
index c69c16e3..c693ec06 100644
--- a/bin/package.bat
+++ b/bin/package.bat
@@ -1,13 +1,12 @@
 @echo off
 echo.
-echo [信息] 打包工程，生成jar包文件。
-echo.
-pause
+echo [��Ϣ] ���Web���̣�����war/jar���ļ���
 echo.
 
+%~d0
 cd %~dp0
-cd..
 
+cd ..
 call mvn clean package -Dmaven.test.skip=true
 
 pause
\ No newline at end of file
diff --git a/bin/run.bat b/bin/run.bat
index de257c8f..90073a82 100644
--- a/bin/run.bat
+++ b/bin/run.bat
@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 运行Web工程。
+echo [��Ϣ] ����Web���̡�
 echo.
 
 cd %~dp0
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 9d76b8e4..4fd84125 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,7 +8,7 @@
         <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
     <artifactId>ruoyi-admin</artifactId>
 	
 	<description>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
index 3ed8e2d2..3e4a97ef 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
@@ -63,6 +63,7 @@ public class DruidConfig
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Bean
+    @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
     public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
     {
         // 获取web监控页面的参数
@@ -74,6 +75,10 @@ public class DruidConfig
         // 创建filter进行过滤
         Filter filter = new Filter()
         {
+            @Override
+            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
+            {
+            }
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
                     throws IOException, ServletException
@@ -88,6 +93,10 @@ public class DruidConfig
                 text = text.replaceAll("powered.*?shrek.wang</a>", "");
                 response.getWriter().write(text);
             }
+            @Override
+            public void destroy()
+            {
+            }
         };
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();
         registrationBean.setFilter(filter);