diff --git a/server/lib/tigon b/server/lib/tigon index 5991f36..cf48c88 160000 --- a/server/lib/tigon +++ b/server/lib/tigon @@ -1 +1 @@ -Subproject commit 5991f36ae60c1f7ed818f36f501c440bef527667 +Subproject commit cf48c8867c81a24459ddcfffbd1ec4029b4fc95e diff --git a/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ExportTaskMapper.java b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ExportTaskMapper.java new file mode 100644 index 0000000..6ad5b5d --- /dev/null +++ b/server/mapper/src/main/java/com/pudonghot/ambition/crm/mapper/ExportTaskMapper.java @@ -0,0 +1,11 @@ +package com.pudonghot.ambition.crm.mapper; + +import me.chyxion.tigon.mybatis.BaseMapper; +import com.pudonghot.ambition.crm.model.ExportTask; + +/** + * @author Donghuang + * @date May 29, 2022 14:44:46 + */ +public interface ExportTaskMapper extends BaseMapper { +} diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/ExportTaskMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/ExportTaskMapperTest.java new file mode 100644 index 0000000..da7f939 --- /dev/null +++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/ExportTaskMapperTest.java @@ -0,0 +1,25 @@ +package com.pudonghot.ambition.crm.mapper; + +import org.junit.Test; +import org.junit.runner.RunWith; +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; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; + +/** + * @author Donghuang + * @date May 29, 2022 14:44:58 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration("classpath*:spring/spring-*.xml") +public class ExportTaskMapperTest extends AbstractTransactionalJUnit4SpringContextTests { + @Autowired + private ExportTaskMapper mapper; + + @Test + public void mapperTest() { + mapper.list(new Search()).size(); + } +} diff --git a/server/mapper/src/test/resources/spring/config.properties b/server/mapper/src/test/resources/spring/config.properties index 19f709b..d7874b4 100644 --- a/server/mapper/src/test/resources/spring/config.properties +++ b/server/mapper/src/test/resources/spring/config.properties @@ -1,6 +1,6 @@ # MySQL -datasource.host=127.0.0.1 -datasource.port=63306 -datasource.database-name=ambition_crm_test +datasource.host=172.16.4.6 +datasource.port=3306 +datasource.database-name=ambition-crm datasource.username=root -datasource.password=696@2^~)oZ@^#*Q +datasource.password=MySQL2b||!2b diff --git a/server/model/src/main/java/com/pudonghot/ambition/crm/model/CustomerProperty.java b/server/model/src/main/java/com/pudonghot/ambition/crm/model/CustomerProperty.java index ca715fc..ea6030d 100644 --- a/server/model/src/main/java/com/pudonghot/ambition/crm/model/CustomerProperty.java +++ b/server/model/src/main/java/com/pudonghot/ambition/crm/model/CustomerProperty.java @@ -26,6 +26,8 @@ public class CustomerProperty extends M3 { */ // public static final String TYPE_STATUS = "STATUS"; public enum Type { + @Deprecated + APPLICATION, STATUS } diff --git a/server/pom.xml b/server/pom.xml index 3bf8c06..5b4cd51 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -119,7 +119,7 @@ mysql mysql-connector-java - 6.0.6 + 8.0.29