From 33d668bf7c0fd560a0164442f0cd78eea9ba4d91 Mon Sep 17 00:00:00 2001
From: Shaun Chyxion <chyxion@163.com>
Date: Sun, 29 May 2022 10:22:12 +0800
Subject: [PATCH] update tigon mybatis

---
 server/lib/tigon                                      |  2 +-
 server/mapper/pom.xml                                 |  5 +++++
 .../src/main/resources/spring/spring-ambition-db.xml  |  5 +++--
 .../ambition/crm/mapper/HomePageMapperTest.java       |  5 +++++
 .../pudonghot/ambition/crm/mapper/UserMapperTest.java | 11 ++++-------
 .../mapper/src/test/resources/spring/spring-test.xml  |  1 +
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/server/lib/tigon b/server/lib/tigon
index 40acef8..97b1da4 160000
--- a/server/lib/tigon
+++ b/server/lib/tigon
@@ -1 +1 @@
-Subproject commit 40acef80b8af560cbf19a0a841748c0d63406dde
+Subproject commit 97b1da4c89ac3e2919a111fef058b8a69de3c27b
diff --git a/server/mapper/pom.xml b/server/mapper/pom.xml
index 76256e7..2180893 100644
--- a/server/mapper/pom.xml
+++ b/server/mapper/pom.xml
@@ -50,6 +50,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/server/mapper/src/main/resources/spring/spring-ambition-db.xml b/server/mapper/src/main/resources/spring/spring-ambition-db.xml
index ca89d95..ea72415 100644
--- a/server/mapper/src/main/resources/spring/spring-ambition-db.xml
+++ b/server/mapper/src/main/resources/spring/spring-ambition-db.xml
@@ -11,6 +11,8 @@
         http://www.springframework.org/schema/tx 
         http://www.springframework.org/schema/tx/spring-tx.xsd">
     <aop:aspectj-autoproxy proxy-target-class="true" />
+    <tx:annotation-driven />
+
     <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource"
         init-method="init" 
         destroy-method="close" 
@@ -25,10 +27,9 @@
         class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
         <property name="dataSource" ref="dataSource" />
     </bean>
-    <tx:annotation-driven transaction-manager="transactionManager" />
     <!-- MyBatis SqlSessionFactory -->
     <bean id="sqlSessionFactory"
-        class="me.chyxion.tigon.mybatis.TigonSqlSessionFactoryBean"
+        class="org.mybatis.spring.SqlSessionFactoryBean"
         p:dataSource-ref="dataSource"
         p:typeAliasesPackage="com.pudonghot.ambition.crm.model"
         p:configLocation="classpath:mybatis/mybatis-config.xml"
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
index 8e3f4be..2b1babe 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
@@ -29,9 +29,14 @@ public class HomePageMapperTest extends AbstractTransactionalJUnit4SpringContext
 		HomePage m = new HomePage();
         String id = "id";
         m.setId(id);
+		m.setName(id);
+		m.setApplying(true);
+		m.setContent("content");
 		m.setDateCreated(new Date());
 		m.setContent("s");
 		m.setApplying(true);
+		m.setCreatedBy("donghuang");
+		m.setDateCreated(new Date());
 		mapper.insert(m);
 		Assert.assertTrue(mapper.list(null).size() > 0);
         /* 
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
index da94494..423b91f 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
@@ -1,16 +1,13 @@
 package com.pudonghot.ambition.crm.mapper;
 
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Assert;
 import org.junit.Test;
-import java.util.Date;
+import org.junit.Assert;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import com.pudonghot.ambition.crm.mapper.UserMapper;
-import com.pudonghot.ambition.crm.model.User;
+import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 
 /**
  * @version 0.0.1
diff --git a/server/mapper/src/test/resources/spring/spring-test.xml b/server/mapper/src/test/resources/spring/spring-test.xml
index ba58daa..995203b 100644
--- a/server/mapper/src/test/resources/spring/spring-test.xml
+++ b/server/mapper/src/test/resources/spring/spring-test.xml
@@ -7,4 +7,5 @@
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context.xsd">
     <context:property-placeholder location="classpath:spring/config.properties" />
+    <bean class="me.chyxion.tigon.mybatis.TigonMyBatisConfiguration" />
 </beans>