Merge branch '5.6'

sagframe · Jul 4, 2024 · 2af9001 · 2af9001
2 parents 66c0b41 + d890ef5
commit 2af9001
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ https://github.com/sagframe/sqltoy-online-doc/blob/master/docs/sqltoy/search.md
 * 提供了大量辅助功能:数据脱敏、格式化、条件参数预处理等
 
 ### 支持多种数据库
-* 常规的mysql、oracle、db2、postgresql、 sqlserver、dm、kingbase、sqlite、h2、 oceanBase、polardb、gaussdb、tidb、oscar(神通)、瀚高
+* 常规的mysql、oracle、db2、postgresql、 sqlserver、dm、kingbase、sqlite、h2、 oceanBase、polardb、gaussdb、tidb、oscar(神通)、瀚高、mogdb
 * 支持分布式olap数据库: clickhouse、StarRocks、greenplum、impala(kudu)
 * 支持elasticsearch、mongodb
 * 所有基于sql和jdbc 各类数据库查询

diff --git a/trunk/sqltoy-orm-core/pom.xml b/trunk/sqltoy-orm-core/pom.xml
@@ -14,15 +14,14 @@
 		<ehcache.version>3.10.8</ehcache.version>
 		<httpclient.version>4.5.14</httpclient.version>
 		<httpclient-core.version>4.4.16</httpclient-core.version>
-		<elastic-rest-client.version>8.14.1</elastic-rest-client.version>
+		<elastic-rest-client.version>8.14.2</elastic-rest-client.version>
 		<fastjson.version>2.0.51</fastjson.version>
 		<mongo.version>3.12.14</mongo.version>
 		<junit-jupiter.version>5.10.3</junit-jupiter.version>
 		<junit-platform.version>1.10.3</junit-platform.version>
 		<slf4j.version>2.0.13</slf4j.version>
 		<h2.version>2.2.224</h2.version>
 		<lombok.version>1.18.34</lombok.version>
-		<taos-jdbcdriver.version>3.2.11</taos-jdbcdriver.version>
 		<druid.version>1.2.23</druid.version>
 		<transmittable-thread-local>2.14.5</transmittable-thread-local>
 	</properties>
@@ -192,13 +191,6 @@
 			<scope>test</scope>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.taosdata.jdbc</groupId>
-			<artifactId>taos-jdbcdriver</artifactId>
-			<version>${taos-jdbcdriver.version}</version>
-			<scope>test</scope>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/SqlToyConstantsTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/SqlToyConstantsTest.java
@@ -1,6 +1,5 @@
 package org.sagacity.sqltoy;
 
-import java.awt.List;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -11,6 +10,7 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,8 +28,7 @@
 import org.sagacity.sqltoy.utils.MapperUtils;
 import org.sagacity.sqltoy.utils.StringUtil;
 
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
+import com.alibaba.fastjson2.JSON;
 
 public class SqlToyConstantsTest {
 	@Test
@@ -133,6 +132,42 @@ public void testBeanInfo2() throws IllegalAccessException, IllegalArgumentExcept
 	}
 
 	public static void main(String[] args) {
+		List<C1> c1List = new ArrayList();
+		c1List.add(new C1() {
+			{
+				setIntNum(3001);
+				setIntegerNum(3002);
+				setStr("i am c1 string. 。。。。");
+				setDecimal(BigDecimal.ONE);
+				setShortNum(Short.valueOf("399"));
+				setShortTNum(Short.valueOf("398"));
+				setDate(new Date());
+			}
+		});
+		c1List.add(new C1() {
+			{
+				setIntNum(3003);
+				setIntegerNum(3004);
+				setStr("i am c2 string. 。。。。");
+				setDecimal(BigDecimal.ONE);
+				setShortNum(Short.valueOf("389"));
+				setShortTNum(Short.valueOf("388"));
+				setDate(new Date());
+			}
+		});
+
+		c1List.add(new C1() {
+			{
+				setIntNum(3005);
+				setIntegerNum(3006);
+				setStr("i am c3 string. 。。。。");
+				setDecimal(BigDecimal.ONE);
+				setShortNum(Short.valueOf("379"));
+				setShortTNum(Short.valueOf("378"));
+				setDate(new Date());
+			}
+		});
+
 		A1 aa = new A1() {
 			{
 				setIntNum(1001);
@@ -153,37 +188,7 @@ public static void main(String[] args) {
 						setDate(new Date());
 					}
 				});
-				setC(Lists.newArrayList(new C1() {
-					{
-						setIntNum(3001);
-						setIntegerNum(3002);
-						setStr("i am c1 string. 。。。。");
-						setDecimal(BigDecimal.ONE);
-						setShortNum(Short.valueOf("399"));
-						setShortTNum(Short.valueOf("398"));
-						setDate(new Date());
-					}
-				}, new C1() {
-					{
-						setIntNum(3003);
-						setIntegerNum(3004);
-						setStr("i am c2 string. 。。。。");
-						setDecimal(BigDecimal.ONE);
-						setShortNum(Short.valueOf("389"));
-						setShortTNum(Short.valueOf("388"));
-						setDate(new Date());
-					}
-				}, new C1() {
-					{
-						setIntNum(3005);
-						setIntegerNum(3006);
-						setStr("i am c3 string. 。。。。");
-						setDecimal(BigDecimal.ONE);
-						setShortNum(Short.valueOf("379"));
-						setShortTNum(Short.valueOf("378"));
-						setDate(new Date());
-					}
-				}));
+				setC(c1List);
 			}
 		};
 

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/config/SqlConfigParseUtilsTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/config/SqlConfigParseUtilsTest.java
@@ -24,7 +24,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 public class SqlConfigParseUtilsTest {
 	private static DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/config/SqlXMLConfigParseTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/config/SqlXMLConfigParseTest.java
@@ -7,7 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 public class SqlXMLConfigParseTest {
 	/**

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/ChainRelativeTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/ChainRelativeTest.java
@@ -13,7 +13,7 @@
 import org.sagacity.sqltoy.plugins.calculator.RowsChainRelative;
 import org.sagacity.sqltoy.utils.CollectionUtil;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * 测试环比计算的正确性

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/GroupSummaryTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/GroupSummaryTest.java
@@ -13,7 +13,7 @@
 import org.sagacity.sqltoy.utils.NumberUtil;
 import org.sagacity.sqltoy.utils.StringUtil;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 public class GroupSummaryTest {
 	@Test

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/SqlLoopTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/SqlLoopTest.java
@@ -10,7 +10,7 @@
 import org.sagacity.sqltoy.model.IgnoreKeyCaseMap;
 import org.sagacity.sqltoy.plugins.id.macro.impl.SqlLoop;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 public class SqlLoopTest {
 	@Test

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/TreeTableSortTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/TreeTableSortTest.java
@@ -13,7 +13,7 @@
 import org.sagacity.sqltoy.plugins.calculator.TreeDataSort;
 import org.sagacity.sqltoy.utils.CollectionUtil;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * @author zhongxuchen

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/UnPivotListTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/plugins/UnPivotListTest.java
@@ -12,7 +12,7 @@
 import org.sagacity.sqltoy.plugins.calculator.UnpivotList;
 import org.sagacity.sqltoy.utils.CollectionUtil;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * @author zhongxuchen

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/BeanUtilTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/BeanUtilTest.java
@@ -30,7 +30,7 @@
 import org.sagacity.sqltoy.model.SaveMode;
 import org.sagacity.sqltoy.model.SecureType;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 public class BeanUtilTest {
 

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/CollectionUtilTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/CollectionUtilTest.java
@@ -16,7 +16,7 @@
 import org.sagacity.sqltoy.model.OverTimeSql;
 import org.sagacity.sqltoy.model.PriorityLimitSizeQueue;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * @project sagacity-sqltoy

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/MapperUtilsTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/MapperUtilsTest.java
@@ -6,19 +6,16 @@
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.HashMap;
 
 import org.junit.jupiter.api.Test;
 import org.sagacity.sqltoy.SqlToyContext;
 import org.sagacity.sqltoy.demo.domain.StaffInfo;
 import org.sagacity.sqltoy.demo.vo.LoginLogVO;
 import org.sagacity.sqltoy.demo.vo.StaffInfoVO;
 import org.sagacity.sqltoy.demo.vo.SysLoginLog;
-import org.sagacity.sqltoy.model.MapKit;
 import org.sagacity.sqltoy.model.PropsMapperConfig;
 
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Maps;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * @project sagacity-sqltoy

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/SqlUtilTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/SqlUtilTest.java
@@ -9,7 +9,7 @@
 import org.sagacity.sqltoy.config.model.EntityMeta;
 import org.sagacity.sqltoy.config.model.FieldMeta;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 public class SqlUtilTest {
 

diff --git a/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/StringUtilsTest.java b/trunk/sqltoy-orm-core/src/test/java/org/sagacity/sqltoy/utils/StringUtilsTest.java
@@ -16,7 +16,7 @@
 import org.sagacity.sqltoy.config.model.SqlToyConfig;
 import org.sagacity.sqltoy.utils.DataSourceUtils.DBType;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * @author zhongxuchen