Merge remote-tracking branch 'origin/mes_malata_prod' into mes_malata_prod

WebContent/WEB-INF/web.xml

@@ -38,30 +38,30 @@
 	</servlet-mapping>
 
  	<!-- 配置 Druid 监控信息显示页面 -->
-  	<servlet>
-    		<servlet-name>DruidStatView</servlet-name>
-    		<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
-    		<init-param>
-      			<!-- 允许清空统计数据 -->
-      			<param-name>resetEnable</param-name>
-      			<param-value>true</param-value>
-    		</init-param>
-    		<async-supported>true</async-supported>
-    		<!-- <init-param>
-               		用户名
-      			<param-name>loginUsername</param-name>
-      			<param-value>admin</param-value>
-    		</init-param>
-    		<init-param>
-      			密码
-      			<param-name>loginPassword</param-name>
-      			<param-value>select123***</param-value>
-    		</init-param> -->
-  	</servlet>
-  	<servlet-mapping>
-    		<servlet-name>DruidStatView</servlet-name>
-    		<url-pattern>/druid/*</url-pattern>
-  	</servlet-mapping>
+<!--  	<servlet>-->
+<!--    		<servlet-name>DruidStatView</servlet-name>-->
+<!--    		<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>-->
+<!--    		<init-param>-->
+<!--      			&lt;!&ndash; 允许清空统计数据 &ndash;&gt;-->
+<!--      			<param-name>resetEnable</param-name>-->
+<!--      			<param-value>true</param-value>-->
+<!--    		</init-param>-->
+<!--    		<async-supported>true</async-supported>-->
+<!--    		&lt;!&ndash; <init-param>-->
+<!--               		用户名-->
+<!--      			<param-name>loginUsername</param-name>-->
+<!--      			<param-value>admin</param-value>-->
+<!--    		</init-param>-->
+<!--    		<init-param>-->
+<!--      			密码-->
+<!--      			<param-name>loginPassword</param-name>-->
+<!--      			<param-value>select123***</param-value>-->
+<!--    		</init-param> &ndash;&gt;-->
+<!--  	</servlet>-->
+<!--  	<servlet-mapping>-->
+<!--    		<servlet-name>DruidStatView</servlet-name>-->
+<!--    		<url-pattern>/druid/*</url-pattern>-->
+<!--  	</servlet-mapping>-->
 
 	<error-page>
 		<error-code>404</error-code>