shuzheng 9 лет назад
Родитель
Сommit
cccdac47b5
2 измененных файлов с 24 добавлено и 12 удалено
  1. 19 7
      common/pom.xml
  2. 5 5
      common/src/main/resources/applicationContext-ehcache.xml

+ 19 - 7
common/pom.xml

@@ -12,12 +12,19 @@
 
 
     <properties>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
         <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
-        <spring.version>4.1.7.RELEASE</spring.version>
-        <mybatis.version>3.2.7</mybatis.version>
-        <mybatis-spring.version>1.2.3</mybatis-spring.version>
+
+        <spring.version>4.3.3.RELEASE</spring.version>
+        <spring-security.version>4.1.3.RELEASE</spring-security.version>
+
+        <mybatis.version>3.4.1</mybatis.version>
+        <mybatis-spring.version>1.3.0</mybatis-spring.version>
+        <mybatis-generator.version>1.3.5</mybatis-generator.version>
+        <mybatis-ehcache.version>1.0.0</mybatis-ehcache.version>
+        <ehcache.version>2.10.0</ehcache.version>
     </properties>
     </properties>
 
 
     <dependencies>
     <dependencies>
@@ -52,12 +59,12 @@
         <dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
             <artifactId>spring-security-web</artifactId>
-            <version>4.1.3.RELEASE</version>
+            <version>${spring-security.version}</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
             <artifactId>spring-security-config</artifactId>
-            <version>4.1.3.RELEASE</version>
+            <version>${spring-security.version}</version>
         </dependency>
         </dependency>
         <!-- mybatis -->
         <!-- mybatis -->
         <dependency>
         <dependency>
@@ -73,13 +80,18 @@
         <dependency>
         <dependency>
             <groupId>org.mybatis.generator</groupId>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>
             <artifactId>mybatis-generator-core</artifactId>
-            <version>1.3.5</version>
+            <version>${mybatis-generator.version}</version>
         </dependency>
         </dependency>
         <!-- 缓存 -->
         <!-- 缓存 -->
         <dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <artifactId>ehcache</artifactId>
-            <version>2.10.0</version>
+            <version>${ehcache.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-ehcache</artifactId>
+            <version>${mybatis-ehcache.version}</version>
         </dependency>
         </dependency>
         <!-- 数据库 -->
         <!-- 数据库 -->
         <dependency>
         <dependency>

+ 5 - 5
common/src/main/resources/applicationContext-ehcache.xml

@@ -11,14 +11,14 @@
 	<!-- 支持缓存注解 -->
 	<!-- 支持缓存注解 -->
 	<cache:annotation-driven cache-manager="cacheManager" />
 	<cache:annotation-driven cache-manager="cacheManager" />
 
 
-	<!-- cache管理器配置 -->
-	<bean id="cacheManagerFactory" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-		<property name="configLocation"  value="classpath:ehcache.xml"/>
-	</bean>
-
 	<!-- 默认是cacheManager -->
 	<!-- 默认是cacheManager -->
 	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
 	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
 		<property name="cacheManager"  ref="cacheManagerFactory"/>
 		<property name="cacheManager"  ref="cacheManagerFactory"/>
 	</bean>
 	</bean>
 
 
+	<!-- cache管理器配置 -->
+	<bean id="cacheManagerFactory" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+		<property name="configLocation"  value="classpath:ehcache.xml"/>
+	</bean>
+
 </beans>
 </beans>