shuzheng пре 9 година
родитељ
комит
d69274d8b7

+ 1 - 3
cms/cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java

@@ -1,7 +1,7 @@
 package com.zheng.cms.service;
 
 import com.zheng.cms.model.User;
-import com.zheng.cms.service.UserService;
+import com.zheng.cms.model.UserVO;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,8 +9,6 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.TransactionConfiguration;
 
-import com.zheng.cms.model.UserVO;
-
 /**
  * 测试service
  * @author shuzheng

+ 12 - 8
common/pom.xml

@@ -61,6 +61,16 @@
             <artifactId>pagehelper</artifactId>
             <version>4.1.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-ehcache</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>3.1.3</version>
+        </dependency>
         <!-- 数据库 -->
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -81,18 +91,12 @@
         <!-- 日志 -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>1.7.12</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <artifactId>slf4j-log4j12</artifactId>
             <version>1.7.12</version>
         </dependency>
         <!-- 上传 -->