Merge branch 'master' of http://git.semsx.com/zhangxiaoyu/spring_demo

 Conflicts:

	spring_aop/src/main/java/com/transaction_anno/service/impl/AccountServiceImpl.java

	spring_aop/src/main/java/com/transaction_anno/service/impl/AccountTxServiceImpl.java

mybatis_train/pom.xml

@@ -57,6 +57,11 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <version>2.11.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.2.0</version>
+        </dependency>
     </dependencies>
 
 </project>

mybatis_train/src/main/resources/mybatisConfig.xml

@@ -14,6 +14,9 @@
         <typeAlias type="com.pojo.entity.AccountEntity" alias="account"></typeAlias>
         <typeAlias type="com.pojo.entity.UserEntity" alias="user"></typeAlias>
     </typeAliases>
+    <plugins>
+        <plugin interceptor="com.github.pagehelper.PageInterceptor"></plugin>
+    </plugins>
     <!--    核心配置信息-->
     <environments default="xmq_config">
         <!--        数据库相关配置-->

mybatis_train/src/test/java/TestMybatisPage.java

@@ -0,0 +1,34 @@
+import com.github.pagehelper.PageHelper;
+import com.mapper.AccountMapper;
+import com.mapper.DepartmentMapper;
+import com.pojo.entity.AccountRealEntity;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+public class TestMybatisPage {
+    SqlSession sqlSession;
+    AccountMapper accountMapper;
+    @Before
+    public void before() throws IOException {
+        InputStream resourceAsStream = Resources.getResourceAsStream("mybatisConfig.xml");
+        SqlSessionFactory build = new SqlSessionFactoryBuilder().build(resourceAsStream);
+        sqlSession = build.openSession(true);
+        accountMapper = sqlSession.getMapper(AccountMapper.class);
+    }
+
+    @Test
+    public void page1() {
+        // 查询分页功能 在查询列表之前先开启分页
+        PageHelper.startPage(2,2);
+        List<AccountRealEntity> byDepId = accountMapper.findByDepId(1);
+        byDepId.forEach(System.out::println);
+    }
+}

spring_aop/src/main/java/com/TestTx.java

@@ -17,6 +17,10 @@ public class TestTx {
     AccountTxService accountTxService;
     @Test
     public void transformAnno() {
-        accountTxService.transformTx();
+        try {
+            accountTxService.transformTx();
+        }catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
     }
 }

spring_aop/src/main/java/com/transaction_anno/service/impl/AccountServiceImpl.java

@@ -21,11 +21,14 @@ public class AccountServiceImpl implements AccountService {
         int i = accountDao.saveAccount(accountEntity);
     }
 //    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
-    @Transactional(propagation = Propagation.REQUIRED)
+    @Transactional
     @Override
     public int reduceAccount(AccountEntity toEntity) {
         int in = accountDao.incomeAccount(toEntity, "to");
-        System.out.println(1/0);
+/*        try {
+        }catch (Exception e) {
+            System.out.println(e.getMessage());
+        }*/
         return in;
     }
 }

spring_aop/src/main/java/com/transaction_anno/service/impl/AccountTwoServiceImpl.java

@@ -15,5 +15,6 @@ public class AccountTwoServiceImpl implements AccountTwoService {
     @Transactional(rollbackFor = Exception.class)
     public void addAccountBalance(AccountEntity addEntity) {
         int in = accountDao.incomeAccount(addEntity, "in");
+        throw new RuntimeException("runtimeERROR");
     }
 }

spring_aop/src/main/java/com/transaction_anno/service/impl/AccountTxServiceImpl.java

@@ -16,8 +16,8 @@ public class AccountTxServiceImpl implements AccountTxService {
     @Autowired
     AccountTwoService accountTwoService;
 
-    @Transactional(propagation = Propagation.REQUIRED)
-//    @Transactional
+//    @Transactional(propagation = Propagation.REQUIRED)
+    @Transactional
     @Override
     public void transformTx() {
         // 转账操作