use tigon-mybatis-0.0.2

README.md

@@ -132,182 +132,3 @@ public Map<String, Object> errorCaused() {
     "message": "Oops, some error caused"
 }
 ```
-
-#### MyBatis
-
-`MyBatis`做了启动期增强，实例`Mapper`继承了`BaseMapper`之后，会继承获得相关的增删改查等方法，如下例：
-
-##### Model
-
-```java
-import lombok.Getter;
-import lombok.Setter;
-import java.util.Date;
-import com.wacai.tigon.model.M0;
-import com.wacai.tigon.mybatis.Table;
-import com.wacai.tigon.mybatis.NotUpdate;
-import lombok.experimental.FieldNameConstants;
-
-@Getter
-@Setter
-@Table("yo_customer")
-@FieldNameConstants(prefix = "")
-public class Customer extends M0<Integer> {
-    private String name;
-    private String account;
-    private String password;
-    private String note;
-    @NotUpdate
-    protected Date createdTime;
-    protected Date updatedTime;
-    @NotUpdate
-    protected String createdBy;
-    protected String updatedBy;
-    protected boolean active;
-}
-```
-
-##### Mapper
-
-```java
-import com.wacai.tigon.mybatis.BaseMapper;
-
-public interface CustomerMapper extends BaseMapper<Integer, Customer> {
-}
-```
-
-##### Mapper.xml
-```xml
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wacai.loan.yo.mapper.CustomerMapper">
-</mapper>
-```
-
-##### Usage
-
-```java
-@Autowired
-private CustomerMapper customerMapper;
-```
-
-I. 插入
-
-```java
-final Customer customer = new Customer();
-customer.setName("Uncle Donghuang");
-customer.setAccount("donghuang");
-customer.setPassword("qR$#FzM!z9W*");
-customer.setCreatedBy("SYS");
-customer.setCreatedTime(new Date());
-customer.setActive(true);
-customerMapper.insert(customer);
-```
-
-II. 查询
-
-Find by ID
-
-```java
-final Integer id = 1154;
-final Customer customer = customerMapper.find(id);
-```
-
-Find by `Search`
-
-```java
-final Customer customer = customerMapper.find(
-    new Search(Customer.ACCOUNT, "donghuang")
-            .eq(Customer.ACTIVE, true));
-```
-
-List by `Search`
-
-```java
-final List<Customer> customers = customerMapper.list(
-    new Search(Customer.ACTIVE, true)
-            .between(Customer.ID, 1, 1154)
-            .asc(Customer.ACCOUNT)
-            .limit(42));
-```
-
-`Search` API
-
-- `and` And another `Search`
-- `asc` Order ASC
-- `between` Between two values
-- `contains` Value contains string
-- `desc` Order DSC
-- `endsWith` Value ends with string
-- `eq` Eqauls
-- `gt` Greater than
-- `gte` Eqauls or greater than
-- `in` In values
-- `isNull` Value is null
-- `like` Value like
-- `limit` Return rows limit
-- `lt` Less than
-- `lte` Eqauls or less than
-- `ne` Not equals
-- `notIn` Not in values
-- `notNull` Value is not null
-- `offset` Return rows offset
-- `or` Or another `Search`
-- `orderBy` Order by
-- `startsWith` Value starts with string
-
-III. 更新
-
-Update model
-
-```java
-Customer customer = customerMapper.find(
-    new Search(Customer.ACCOUNT, "donghuang")
-            .eq(Customer.ACTIVE, true));
-
-customer.setPassword("g!5KpWdXEB!^");
-customer.setUpdatedBy("SYS");
-customer.setUpdatedTime(new Date());
-customerMapper.update(customer);
-```
-
-Update with map
-
-```java
-final Map<String, Object> update = new HashMap<>(4);
-update.put(Customer.PASSWORD, "g!5KpWdXEB!^");
-update.put(Customer.UPDATED_BY, "SYS");
-update.put(Customer.UPDATED_TIME, new Date());
-
-customerMapper.update(update, 1154);
-// OR
-// customerMapper.update(update, new Search(Customer.ID, 1154));
-```
-
-Set null
-
-```java
-// Update note to null of customer 1154
-customerMapper.setNull(Customer.NOTE, 1154);
-// Update note to null of customer 1154
-customerMapper.setNull(Customer.NOTE, new Search(Customer.ID, 1154));
-// Update note to null of all
-customerMapper.setNull(Customer.NOTE, new Search());
-
-```
-
-IV. 删除
-
-Delete by ID
-
-```java
-customerMapper.delete(1154);
-```
-
-Delete by `Search`
-
-```java
-customerMapper.delete(new Search(Customer.ID, 1154));
-```
-

campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.util.TimeUtils;
 import com.wacai.tigon.sequence.IdSequence;
 import org.apache.commons.lang3.StringUtils;

campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java

@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
 import com.pudonghot.yo.util.LogMDC;
 import lombok.RequiredArgsConstructor;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.util.TimeUtils;
 import com.pudonghot.yo.mapper.CampaignMapper;
 import org.springframework.stereotype.Service;

campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java

@@ -4,7 +4,7 @@ import lombok.val;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.sequence.IdSequence;
 import com.pudonghot.yo.campaign.YoCampaign;
 import com.pudonghot.yo.model.domain.Campaign;

campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java

@@ -4,7 +4,7 @@ import lombok.val;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.campaign.YoCampaign;
 import com.pudonghot.yo.model.domain.Campaign;
 import org.springframework.boot.test.context.SpringBootTest;

cms/src/main/java/com/pudonghot/yo/cms/auth/SessionAbility.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.cms.auth;
 
 import java.util.Set;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.util.Assert;
 import io.buji.pac4j.subject.Pac4jPrincipal;

cms/src/main/java/com/pudonghot/yo/cms/controller/AgentController.java

@@ -5,7 +5,7 @@ import com.pudonghot.yo.cms.form.create.CreateFormAgent;
 import com.pudonghot.yo.cms.form.update.UpdateFormAgent;
 import com.pudonghot.yo.cms.service.AgentGroupService;
 import com.wacai.tigon.form.FormList;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import com.pudonghot.yo.model.domain.Queue;
 import com.pudonghot.yo.model.domain.Agent;

cms/src/main/java/com/pudonghot/yo/cms/controller/AgentGroupController.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.cms.controller;
 
 import com.wacai.tigon.form.FormList;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.web.controller.ArgQuery;
 import com.wacai.tigon.web.annotation.ListApi;
 import com.pudonghot.yo.cms.auth.SessionAbility;

cms/src/main/java/com/pudonghot/yo/cms/controller/AuthController.java

@@ -4,7 +4,7 @@ import java.util.Map;
 import java.util.HashMap;
 
 import com.pudonghot.yo.cms.auth.SessionAbility;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import javax.validation.constraints.NotBlank;
 import org.springframework.stereotype.Controller;

cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java

@@ -4,7 +4,7 @@ import lombok.val;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import java.util.function.BiFunction;
 import com.wacai.tigon.model.ViewModel;
 import org.apache.commons.lang3.StringUtils;

cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.ArrayList;
 import javax.validation.Valid;
 import com.wacai.tigon.form.FormList;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import com.pudonghot.yo.model.domain.Campaign;
 import com.wacai.tigon.web.annotation.ListApi;

cms/src/main/java/com/pudonghot/yo/cms/controller/CampaignController.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller;
 
 import java.util.Arrays;
 import com.wacai.tigon.form.FormList;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import org.springframework.util.Assert;
 import com.pudonghot.yo.model.DailyTime;

cms/src/main/java/com/pudonghot/yo/cms/controller/TenantQueryHook.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller;
 
 import com.pudonghot.yo.cms.auth.SessionAbility;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import com.wacai.tigon.web.controller.ArgQuery;
 import com.pudonghot.yo.model.domain.Agent;

cms/src/main/java/com/pudonghot/yo/cms/controller/TrunkController.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.controller;
 import com.pudonghot.yo.cms.service.*;
 import com.wacai.tigon.form.FormList;
 import com.wacai.tigon.model.ViewModel;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.domain.Agent;
 import com.pudonghot.yo.model.domain.Queue;
 import com.pudonghot.yo.model.domain.Trunk;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentGroupServiceImpl.java

@@ -7,7 +7,7 @@ import com.pudonghot.yo.cms.form.create.CreateFormAgentGroup;
 import com.pudonghot.yo.cms.service.AgentGroupService;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.StringUtils;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentServiceImpl.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.impl;
 import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import org.springframework.util.Assert;
 import org.apache.commons.lang3.tuple.Pair;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/AreaCodeServiceImpl.java

@@ -9,7 +9,7 @@ import com.pudonghot.yo.cms.form.update.UpdateFormAreaCode;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.LineIterator;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthPermissionServiceImpl.java

@@ -7,7 +7,7 @@ import com.pudonghot.yo.cms.form.SessionForm;
 import com.pudonghot.yo.cms.form.create.CreateFormAuthPermission;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import com.wacai.tigon.model.ViewModel;
 import org.apache.commons.lang3.tuple.Pair;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthRoleServiceImpl.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.pudonghot.yo.cms.form.create.CreateFormAuthRole;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import org.springframework.stereotype.Service;
 import com.pudonghot.yo.mapper.AuthRoleMapper;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthUserServiceImpl.java

@@ -6,7 +6,7 @@ import com.pudonghot.yo.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
 import com.pudonghot.yo.model.domain.*;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import com.wacai.tigon.model.ViewModel;
 import org.apache.commons.lang3.tuple.Pair;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/CampaignServiceImpl.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.impl;
 import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.wacai.tigon.model.ViewModel;
 import com.wacai.tigon.sequence.IdSequence;
 import org.apache.commons.lang3.tuple.Pair;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/SequenceServiceImpl.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.cms.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.Assert;
 import org.springframework.stereotype.Service;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/SoundServiceImpl.java

@@ -5,7 +5,7 @@ import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
 import java.util.function.Consumer;
 import org.apache.shiro.util.Assert;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import com.pudonghot.yo.mapper.SoundMapper;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/TaggableServiceImpl.java

@@ -2,9 +2,11 @@ package com.pudonghot.yo.cms.service.impl;
 
 import java.util.*;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.*;
+import me.chyxion.tigon.mybatis.*;
 import java.util.stream.Collectors;
 import com.wacai.tigon.model.ViewModel;
+import me.chyxion.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import com.pudonghot.yo.cms.util.SetUtils;
 import com.wacai.tigon.form.FormCreateApi;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/TenantServiceImpl.java

@@ -6,7 +6,7 @@ import com.pudonghot.yo.cms.form.create.CreateFormTenant;
 import com.pudonghot.yo.redis.RedisClientApi;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import com.wacai.tigon.sequence.IdSequence;
 import org.apache.commons.lang3.StringUtils;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkAttrServiceImpl.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.impl;
 
 import com.pudonghot.yo.cms.form.create.CreateFormTrunkAttr;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import org.springframework.stereotype.Service;
 import com.pudonghot.yo.model.domain.TrunkAttr;

cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkServiceImpl.java

@@ -5,7 +5,7 @@ import com.pudonghot.yo.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
 import java.util.function.BiConsumer;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.domain.*;
 import com.wacai.tigon.model.ViewModel;
 import org.springframework.util.Assert;

cms/src/test/java/com/pudonghot/yo/cms/service/CallingListServiceTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import lombok.extern.slf4j.Slf4j;
 import com.pudonghot.yo.cms.YoCMS;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.DailyTime;
 import com.pudonghot.yo.model.domain.Campaign;
 import org.springframework.boot.test.context.SpringBootTest;

fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java

@@ -4,7 +4,7 @@ import java.util.*;
 import javax.sql.DataSource;
 import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.apache.commons.lang3.StringUtils;
 import com.pudonghot.yo.model.domain.Gateway;
 import com.alibaba.druid.pool.DruidDataSource;

fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.fsagent.controller;
 import java.util.Map;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.domain.Agent;
 import com.pudonghot.yo.model.domain.Tenant;
 import org.apache.commons.lang3.StringUtils;

fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.controller;
 
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.fsagent.service.*;
 import com.pudonghot.yo.model.domain.Agent;
 import com.pudonghot.yo.model.domain.Trunk;

fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.controller;
 
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.domain.Agent;
 import com.pudonghot.yo.model.domain.Tenant;
 import com.pudonghot.yo.model.domain.AgentGroup;

fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.service.dubbo.impl;
 
 import com.pudonghot.yo.mapper.*;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.domain.*;
 import org.springframework.util.Assert;
 import org.apache.commons.lang3.tuple.Pair;

fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.fsagent.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.mapper.AgentMapper;
 import com.pudonghot.yo.model.domain.Agent;
 import org.apache.commons.lang3.StringUtils;

fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Collections;
 import lombok.extern.slf4j.Slf4j;
 import java.util.stream.Collectors;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import com.pudonghot.yo.model.domain.Tenant;
 import com.pudonghot.yo.mapper.TenantMapper;
 import com.pudonghot.yo.mapper.IvrMenuMapper;

fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.service.impl;
 
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.util.Assert;
 import com.pudonghot.yo.mapper.TrunkMapper;
 import com.pudonghot.yo.model.domain.Trunk;

lib/fs-mapper/pom.xml

@@ -22,7 +22,7 @@
             <artifactId>yo-fs-model</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.wacai.tigon</groupId>
+            <groupId>me.chyxion.tigon</groupId>
             <artifactId>tigon-mybatis</artifactId>
         </dependency>
         <dependency>

lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/ChannelMapper.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.fs.mapper;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
-import com.wacai.tigon.mybatis.BaseQueryMapper;
+import me.chyxion.tigon.mybatis.BaseQueryMapper;
 import com.pudonghot.yo.fs.model.domain.Channel;
 
 /**

lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/CompleteMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.fs.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.fs.model.domain.Complete;
 
 /**

lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/InterfaceMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.fs.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.fs.model.domain.Interface;
 
 /**

lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/RegistrationMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.fs.mapper;
 
-import com.wacai.tigon.mybatis.BaseQueryMapper;
+import me.chyxion.tigon.mybatis.BaseQueryMapper;
 import com.pudonghot.yo.fs.model.domain.Registration;
 
 /**

lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.fs.mapper;
 
-import com.wacai.tigon.mybatis.BaseQueryMapper;
+import me.chyxion.tigon.mybatis.BaseQueryMapper;
 import com.pudonghot.yo.fs.model.domain.SipRegistration;
 
 /**

lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml

@@ -23,7 +23,7 @@
 
     <!-- MyBatis SqlSessionFactory -->
     <bean id="yoFsSqlSessionFactory"
-        class="com.wacai.tigon.mybatis.TigonSqlSessionFactoryBean"
+        class="org.mybatis.spring.SqlSessionFactoryBean"
         p:dataSource-ref="yoFsDataSource">
         <property name="mapperLocations">
             <array>

lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/ChannelMapperTest.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.fs.mapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/CompleteMapperTest.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.fs.mapper;
 
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;

lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/InterfaceMapperTest.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.fs.mapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/RegistrationMapperTest.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.fs.mapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import lombok.extern.slf4j.Slf4j;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

lib/fs-mapper/src/test/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=yo-fs-mapper
 
 # Datasource
-yo.fs.datasource.url=jdbc:mysql://172.18.4.35/freeswitch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+yo.fs.datasource.url=jdbc:mysql://localhost:3310/freeswitch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 yo.fs.datasource.username=freeswitch
 yo.fs.datasource.password=RR!h5IpirsnJ

lib/fs-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:application.properties" />
+    <bean class="me.chyxion.tigon.mybatis.TigonMyBatisConfiguration" />
 </beans>

lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Channel.java

@@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import com.wacai.tigon.mybatis.Table;
+import me.chyxion.tigon.mybatis.Table;
-import com.wacai.tigon.mybatis.NoPrimaryKey;
+import me.chyxion.tigon.mybatis.NoPrimaryKey;
 import lombok.experimental.FieldNameConstants;
 
 /**

lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Complete.java

@@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import com.wacai.tigon.mybatis.Table;
+import me.chyxion.tigon.mybatis.Table;
-import com.wacai.tigon.mybatis.NoPrimaryKey;
+import me.chyxion.tigon.mybatis.NoPrimaryKey;
 import lombok.experimental.FieldNameConstants;
 
 /**

lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Interface.java

@@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import com.wacai.tigon.mybatis.Table;
+import me.chyxion.tigon.mybatis.Table;
-import com.wacai.tigon.mybatis.NoPrimaryKey;
+import me.chyxion.tigon.mybatis.NoPrimaryKey;
 import lombok.experimental.FieldNameConstants;
 
 /**

lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Registration.java

@@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain;
 
 import lombok.Setter;
 import lombok.Getter;
-import com.wacai.tigon.mybatis.Table;
+import me.chyxion.tigon.mybatis.Table;
-import com.wacai.tigon.mybatis.NoPrimaryKey;
+import me.chyxion.tigon.mybatis.NoPrimaryKey;
 import lombok.experimental.FieldNameConstants;
 
 /**

lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/SipRegistration.java

@@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain;
 
 import lombok.Getter;
 import lombok.Setter;
-import com.wacai.tigon.mybatis.Table;
+import me.chyxion.tigon.mybatis.Table;
-import com.wacai.tigon.mybatis.NoPrimaryKey;
+import me.chyxion.tigon.mybatis.NoPrimaryKey;
 import lombok.experimental.FieldNameConstants;
 
 /**

lib/mapper/pom.xml

@@ -22,7 +22,7 @@
             <artifactId>yo-model</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.wacai.tigon</groupId>
+            <groupId>me.chyxion.tigon</groupId>
             <artifactId>tigon-mybatis</artifactId>
         </dependency>
         <dependency>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupMapper.java

@@ -1,11 +1,14 @@
 package com.pudonghot.yo.mapper;
 
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.AgentGroup;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Nov 16, 2019 12:27:23
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface AgentGroupMapper extends BaseMapper<Integer, AgentGroup> {
 }

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupTrunkStrategyMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.AgentGroupTrunkStrategy;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentMapper.java

@@ -1,14 +1,17 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.Agent;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Nov 15, 2019 17:14:22
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface AgentMapper extends BaseMapper<Integer, Agent> {
 
     /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentStatusMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.AgentStatus;
 

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AreaCodeMapper.java

@@ -1,12 +1,14 @@
 package com.pudonghot.yo.mapper;
 
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.AreaCode;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Nov 15, 2019 17:53:54
  */
-public interface AreaCodeMapper
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
-    extends BaseMapper<Integer, AreaCode> {
+public interface AreaCodeMapper extends BaseMapper<Integer, AreaCode> {
 }

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionMapper.java

@@ -1,15 +1,17 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
-
+import me.chyxion.tigon.mybatis.BaseMapper;
-import com.pudonghot.yo.model.domain.AuthPermission;
-import com.wacai.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import com.pudonghot.yo.model.domain.AuthPermission;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Nov 30, 2019 18:02:30
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface AuthPermissionMapper extends BaseMapper<Integer, AuthPermission> {
 
     /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionRoleMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.AuthPermissionRole;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthRoleMapper.java

@@ -1,11 +1,14 @@
 package com.pudonghot.yo.mapper;
 
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.AuthRole;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Nov 30, 2019 17:59:55
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface AuthRoleMapper extends BaseMapper<Integer, AuthRole> {
 }

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserMapper.java

@@ -1,11 +1,14 @@
 package com.pudonghot.yo.mapper;
 
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.AuthUser;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Nov 30, 2019 17:57:38
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface AuthUserMapper extends BaseMapper<Integer, AuthUser> {
 }

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserRoleMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.AuthUserRole;
-import com.wacai.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserTenantMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.AuthUserTenant;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.CallDetailRecord;
 import com.pudonghot.yo.model.dbobject.CallDetailReport;

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallRecordingMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.CallRecording;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallSatisfactionMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.CallSatisfaction;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListHistoricalMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.CallingListHistorical;
 import com.pudonghot.yo.model.dbobject.CallingListHistoricalSummary;

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListMapper.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.mapper;
 import java.util.List;
 
 import com.pudonghot.yo.model.DailyTime;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.CallingList;
 import com.pudonghot.yo.model.dbobject.CallingListSummary;

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.CallingListPrepared;
 import com.pudonghot.yo.model.dbobject.CallingListPreparedSummary;

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignMapper.java

@@ -1,11 +1,14 @@
 package com.pudonghot.yo.mapper;
 
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.Campaign;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Jan 02, 2020 16:29:04
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface CampaignMapper extends BaseMapper<Integer, Campaign> {
 }

lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignTrunkStrategyMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.CampaignTrunkStrategy;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/GatewayMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.Gateway;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrEntryMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.IvrEntry;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrMenuMapper.java

@@ -1,7 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.pudonghot.yo.model.domain.Tag;
+import me.chyxion.tigon.mybatis.BaseMapper;
-import com.wacai.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.IvrMenu;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/ObjectTagMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.ObjectTag;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneBlacklistMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.PhoneBlacklist;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneGreylistMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.PhoneGreylist;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneWhitelistMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.PhoneWhitelist;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueAgentMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.QueueAgent;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueMapper.java

@@ -3,7 +3,7 @@ package com.pudonghot.yo.mapper;
 import java.util.List;
 
 import com.pudonghot.yo.model.domain.Queue;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/SequenceMapper.java

@@ -1,8 +1,8 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.Sequence;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;

lib/mapper/src/main/java/com/pudonghot/yo/mapper/SoundMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.Sound;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TagMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.Tag;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TelecomVendorMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.TelecomVendor;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TenantMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.Tenant;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkAttrMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.TrunkAttr;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkMapper.java

@@ -1,14 +1,17 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.Trunk;
+import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
+import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider;
 
 /**
  * @author Donghuang <br>
  * Oct 28, 2019 14:13:28
  */
+@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class)
 public interface TrunkMapper extends BaseMapper<Integer, Trunk> {
 
     /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkProhibitedAreaCodeMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.TrunkProhibitedAreaCode;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import java.util.List;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import com.pudonghot.yo.model.domain.TrunkStrategy;
 

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyTrunkMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.TrunkStrategyTrunk;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkTrunkAttrMapper.java

@@ -1,7 +1,7 @@
 package com.pudonghot.yo.mapper;
 
 import com.pudonghot.yo.model.domain.TrunkTrunkAttr;
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 
 /**
  * @author Donghuang <br>

lib/mapper/src/main/java/com/pudonghot/yo/mapper/WorkRecordMapper.java

@@ -1,6 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.wacai.tigon.mybatis.BaseMapper;
+import me.chyxion.tigon.mybatis.BaseMapper;
 import com.pudonghot.yo.model.domain.WorkRecord;
 
 /**

lib/mapper/src/main/java/com/pudonghot/yo/mapper/xmlcontentprovider/TableVarXmlContentProvider.java

@@ -0,0 +1,28 @@
+package com.pudonghot.yo.mapper.xmlcontentprovider;
+
+import lombok.val;
+import org.w3c.dom.Element;
+import org.w3c.dom.Document;
+import lombok.extern.slf4j.Slf4j;
+import me.chyxion.tigon.mybatis.xmlgen.XmlGenArg;
+import me.chyxion.tigon.mybatis.xmlgen.contentprovider.XmlContentProvider;
+
+/**
+ * @author Donghuang <br>
+ * Jan 09, 2020 18:01:55
+ */
+@Slf4j
+public class TableVarXmlContentProvider extends XmlContentProvider {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Content content(final XmlGenArg arg) {
+        val doc = arg.getDocument();
+        val bindEl = doc.createElement("bind");
+        bindEl.setAttribute("name", "__table__");
+        bindEl.setAttribute("value", "'" + arg.getTable() + "'");
+        return new Content(bindEl);
+    }
+}

lib/mapper/src/main/resources/spring/spring-yo-mapper.xml

@@ -24,7 +24,7 @@
 
     <!-- MyBatis SqlSessionFactory -->
     <bean id="yoSqlSessionFactory"
-        class="com.wacai.tigon.mybatis.TigonSqlSessionFactoryBean"
+        class="org.mybatis.spring.SqlSessionFactoryBean"
         depends-on="redisCacheConfig"
         p:dataSource-ref="yoDataSource">
         <property name="mapperLocations">

lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentStatusMapperTest.java

@@ -1,7 +1,6 @@
 package com.pudonghot.yo.mapper;
 
-import com.pudonghot.yo.model.domain.AgentStatus;
+import me.chyxion.tigon.mybatis.Search;
-import com.wacai.tigon.mybatis.Search;
 import lombok.val;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,8 +9,6 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.List;
-
 /**
  * @author Donghuang <br>
  * Oct 26, 2019 15:31:51

lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java

@@ -3,10 +3,9 @@ package com.pudonghot.yo.mapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pudonghot.yo.model.domain.CallDetailRecord;
 import com.pudonghot.yo.model.request.ReqCallDetailRecordAccountReport;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import lombok.val;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;

lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallSatisfactionMapperTest.java

@@ -2,7 +2,7 @@ package com.pudonghot.yo.mapper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import com.wacai.tigon.mybatis.Search;
+import me.chyxion.tigon.mybatis.Search;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;