Skip to content

Commit 1806172

Browse files
committed
update
1 parent 7f5db4a commit 1806172

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed

src/main/resources/spring/spring-context.xml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
4-
xmlns:context="http://www.springframework.org/schema/context"
5-
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:mvc="http://www.springframework.org/schema/mvc"
6-
xmlns:tx="http://www.springframework.org/schema/tx"
7-
xsi:schemaLocation="http://www.springframework.org/schema/beans
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:context="http://www.springframework.org/schema/context"
5+
xmlns:aop="http://www.springframework.org/schema/aop"
6+
xsi:schemaLocation="http://www.springframework.org/schema/beans
87
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
98
http://www.springframework.org/schema/context
109
http://www.springframework.org/schema/context/spring-context-4.0.xsd
11-
http://www.springframework.org/schema/mvc
12-
http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
13-
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
14-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
10+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
1511

1612
<context:component-scan base-package="cn.com.ttblog.ssmbootstrap_table">
1713
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
@@ -25,7 +21,6 @@
2521
<value>classpath*:app.properties</value>
2622
<value>classpath*:jdbc.properties</value>
2723
<value>classpath*:jmx.properties</value>
28-
<value>classpath*:swagger.properties</value>
2924
</list>
3025
</property>
3126
</bean>
@@ -39,7 +34,7 @@
3934

4035
<!-- 加载资源文件 -->
4136
<import resource="spring-mybatis.xml" />
42-
<import resource="spring-jmx.xml" />
37+
<!--<import resource="spring-jmx.xml" />-->
4338
<import resource="classpath*:cxf/cxf.xml" />
4439
<import resource="spring-ehcache.xml"/>
4540
<import resource="spring-websocket.xml"/>
@@ -71,4 +66,4 @@
7166
<property name="name" value="production-user" />
7267
</bean>
7368
</beans>
74-
</beans>
69+
</beans>

src/main/resources/spring/spring-jmx.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
4-
xmlns:context="http://www.springframework.org/schema/context"
5-
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:mvc="http://www.springframework.org/schema/mvc"
6-
xmlns:tx="http://www.springframework.org/schema/tx"
7-
xsi:schemaLocation="http://www.springframework.org/schema/beans
8-
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
9-
http://www.springframework.org/schema/context
10-
http://www.springframework.org/schema/context/spring-context-3.2.xsd
11-
http://www.springframework.org/schema/mvc
12-
http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
13-
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
14-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans
5+
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
156
<bean
167
class="org.springframework.jmx.export.annotation.AnnotationMBeanExporter" />
178
<bean name="beanMonitor" class="cn.com.ttblog.ssmbootstrap_table.mbean.BeanMonitor"></bean>

0 commit comments

Comments
 (0)