donghuang/lemo-crm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile error fixes

Browse Source
This commit is contained in:
Shaun Chyxion 2022-05-29 10:54:53 +08:00
parent 33d668bf7c
commit f580d3b962
11 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/lib/tigon

@ -1 +1 @@
Subproject commit 97b1da4c89ac3e2919a111fef058b8a69de3c27b Subproject commit 5991f36ae60c1f7ed818f36f501c440bef527667

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthFailedLogMapperTest.java
View File

@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Test; import org.junit.Test;
import java.util.Date; import java.util.Date;
import org.junit.Assert; import org.junit.Assert;
@ -34,7 +35,7 @@ public class AuthFailedLogMapperTest extends AbstractTransactionalJUnit4SpringCo
m.setUserAgent("s"); m.setUserAgent("s");
m.setExt("s"); m.setExt("s");
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
AuthFailedLog m1 = mapper.find(id); AuthFailedLog m1 = mapper.find(id);
@ -63,7 +64,7 @@ public class AuthFailedLogMapperTest extends AbstractTransactionalJUnit4SpringCo
Assert.assertEquals("S", m.getUserAgent()); Assert.assertEquals("S", m.getUserAgent());
Assert.assertEquals("S", m.getExt()); Assert.assertEquals("S", m.getExt());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthLogMapperTest.java
View File

@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Test; import org.junit.Test;
import java.util.Date; import java.util.Date;
import org.junit.Assert; import org.junit.Assert;
@ -33,7 +34,7 @@ public class AuthLogMapperTest extends AbstractTransactionalJUnit4SpringContextT
m.setIp("s"); m.setIp("s");
m.setExt("s"); m.setExt("s");
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
AuthLog m1 = mapper.find(id); AuthLog m1 = mapper.find(id);
@ -59,7 +60,7 @@ public class AuthLogMapperTest extends AbstractTransactionalJUnit4SpringContextT
Assert.assertEquals("S", m.getIp()); Assert.assertEquals("S", m.getIp());
Assert.assertEquals("S", m.getExt()); Assert.assertEquals("S", m.getExt());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerApplicationMapperTest.java
View File

@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Test; import org.junit.Test;
import java.util.Date; import java.util.Date;
import org.junit.Assert; import org.junit.Assert;
@ -33,7 +34,7 @@ public class CustomerApplicationMapperTest extends AbstractTransactionalJUnit4Sp
m.setCustomerId("s"); m.setCustomerId("s");
m.setApplicationId("s"); m.setApplicationId("s");
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
CustomerApplication m1 = mapper.find(id); CustomerApplication m1 = mapper.find(id);
@ -53,7 +54,7 @@ public class CustomerApplicationMapperTest extends AbstractTransactionalJUnit4Sp
Assert.assertEquals("S", m.getCustomerId()); Assert.assertEquals("S", m.getCustomerId());
Assert.assertEquals("S", m.getPropertyId()); Assert.assertEquals("S", m.getPropertyId());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerIssueMapperTest.java
View File

@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.CustomerIssue; import com.pudonghot.ambition.crm.model.CustomerIssue;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -34,7 +35,7 @@ public class CustomerIssueMapperTest extends AbstractTransactionalJUnit4SpringCo
m.setCustomerId("s"); m.setCustomerId("s");
m.setIssue("s"); m.setIssue("s");
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
CustomerIssue m1 = mapper.find(id); CustomerIssue m1 = mapper.find(id);
@ -54,7 +55,7 @@ public class CustomerIssueMapperTest extends AbstractTransactionalJUnit4SpringCo
Assert.assertEquals("S", m.getCustomerId()); Assert.assertEquals("S", m.getCustomerId());
Assert.assertEquals("S", m.getIssue()); Assert.assertEquals("S", m.getIssue());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerMapperTest.java
View File

@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.Customer; import com.pudonghot.ambition.crm.model.Customer;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -40,7 +41,7 @@ public class CustomerMapperTest extends AbstractTransactionalJUnit4SpringContext
m.setRegion("s"); m.setRegion("s");
m.setStatus("s"); m.setStatus("s");
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
Customer m1 = mapper.find(id); Customer m1 = mapper.find(id);
@ -78,7 +79,7 @@ public class CustomerMapperTest extends AbstractTransactionalJUnit4SpringContext
Assert.assertEquals("S", m.getRegion()); Assert.assertEquals("S", m.getRegion());
Assert.assertEquals("S", m.getLevel()); Assert.assertEquals("S", m.getLevel());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerPermissionMapperTest.java
View File

@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.CustomerPermission; import com.pudonghot.ambition.crm.model.CustomerPermission;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -34,7 +35,7 @@ public class CustomerPermissionMapperTest extends AbstractTransactionalJUnit4Spr
m.setUserAccount("s"); m.setUserAccount("s");
m.setCustomerId("s"); m.setCustomerId("s");
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
CustomerPermission m1 = mapper.find(id); CustomerPermission m1 = mapper.find(id);
@ -54,7 +55,7 @@ public class CustomerPermissionMapperTest extends AbstractTransactionalJUnit4Spr
Assert.assertEquals("S", m.getUserAccount()); Assert.assertEquals("S", m.getUserAccount());
Assert.assertEquals("S", m.getCustomerId()); Assert.assertEquals("S", m.getCustomerId());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerYearToDateSaleMapperTest.java
View File

@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.CustomerYearToDateSale; import com.pudonghot.ambition.crm.model.CustomerYearToDateSale;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -35,7 +36,7 @@ public class CustomerYearToDateSaleMapperTest extends AbstractTransactionalJUnit
m.setYear("s"); m.setYear("s");
m.setYtdSale(1L); m.setYtdSale(1L);
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
CustomerYearToDateSale m1 = mapper.find(id); CustomerYearToDateSale m1 = mapper.find(id);
@ -58,7 +59,7 @@ public class CustomerYearToDateSaleMapperTest extends AbstractTransactionalJUnit
Assert.assertEquals("S", m.getYear()); Assert.assertEquals("S", m.getYear());
Assert.assertEquals(2L, m.getYtdSale()); Assert.assertEquals(2L, m.getYtdSale());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
View File

@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Test; import org.junit.Test;
import java.util.Date; import java.util.Date;
import org.junit.Assert; import org.junit.Assert;
@ -38,7 +39,7 @@ public class HomePageMapperTest extends AbstractTransactionalJUnit4SpringContext
m.setCreatedBy("donghuang"); m.setCreatedBy("donghuang");
m.setDateCreated(new Date()); m.setDateCreated(new Date());
mapper.insert(m); mapper.insert(m);
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
/* /*
// Your Test Logics // Your Test Logics
HomePage m1 = mapper.find(id); HomePage m1 = mapper.find(id);
@ -58,7 +59,7 @@ public class HomePageMapperTest extends AbstractTransactionalJUnit4SpringContext
Assert.assertEquals("S", m.getPage()); Assert.assertEquals("S", m.getPage());
Assert.assertEquals("S", m.getApplying()); Assert.assertEquals("S", m.getApplying());
// list // list
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete // delete
mapper.delete(id); mapper.delete(id);
m1 = mapper.find(id); m1 = mapper.find(id);

5
server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
View File

@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper; package com.pudonghot.ambition.crm.mapper;
import me.chyxion.tigon.mybatis.Search;
import org.junit.Test; import org.junit.Test;
import org.junit.Assert; import org.junit.Assert;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -26,11 +27,11 @@ public class UserMapperTest extends AbstractTransactionalJUnit4SpringContextTest
@Test @Test
public void mapperTest() { public void mapperTest() {
Assert.assertTrue(mapper.list(null).size() > 0); Assert.assertTrue(mapper.list(new Search()).size() > 0);
} }
@Test @Test
public void testListProducts() { public void testListProducts() {
log.info("local products [{}].", localProductMapper.list(null)); log.info("local products [{}].", localProductMapper.list(new Search()));
} }
} }

6
server/pom.xml
View File

@ -16,11 +16,9 @@
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding> <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tigon.version>0.0.1-SNAPSHOT</tigon.version> <tigon.version>0.0.1-SNAPSHOT</tigon.version>
<!--<jackson.version>2.9.9.20190807</jackson.version>--> <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<!--<spring.version>5.2.5.RELEASE</spring.version>-->
<!--<spring-boot.version>2.2.6.RELEASE</spring-boot.version>-->
<spring-boot.version>2.0.3.RELEASE</spring-boot.version>
<aspectj.version>1.8.10</aspectj.version> <aspectj.version>1.8.10</aspectj.version>
</properties> </properties>