diff --git a/hy.common.xjava-sources.jar b/hy.common.xjava-sources.jar index 5e7d4b5..efe6b7e 100644 Binary files a/hy.common.xjava-sources.jar and b/hy.common.xjava-sources.jar differ diff --git a/hy.common.xjava.jar b/hy.common.xjava.jar index 057b018..5bbbf85 100644 Binary files a/hy.common.xjava.jar and b/hy.common.xjava.jar differ diff --git a/pom.xml b/pom.xml index 47721ce..4b080a4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.openapis hy.common.xjava - 4.4.7 + 4.4.8 jar cn.openapis.hy.common.xjava @@ -54,7 +54,7 @@ cn.openapis hy.common.base - 1.0.178 + 1.0.181 provided @@ -75,7 +75,7 @@ cn.openapis hy.common.tpool - 1.3.5 + 1.3.6 provided diff --git a/src/main/java/org/hy/common/xml/XJSONToJson.java b/src/main/java/org/hy/common/xml/XJSONToJson.java index 27b9bf6..e51da96 100644 --- a/src/main/java/org/hy/common/xml/XJSONToJson.java +++ b/src/main/java/org/hy/common/xml/XJSONToJson.java @@ -39,6 +39,7 @@ * @author ZhengWei(HY) * @version V1.0 2021-12-09 * V2.0 2022-06-22 添加:支持特殊类型ExpireMap的转Json + * V3.0 2024-02-05 修正:Integer、Long、Float、Double、Boolean、Enum 按数字类型返回,生成的Json不带双引号 */ public class XJSONToJson { @@ -226,9 +227,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,boolean i_JavaData) + public static Boolean toJson(XJSON i_XJson ,Map i_ParserObjects ,boolean i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -245,9 +246,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Boolean i_JavaData) + public static Boolean toJson(XJSON i_XJson ,Map i_ParserObjects ,Boolean i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -264,9 +265,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Enum i_JavaData) + public static Integer toJson(XJSON i_XJson ,Map i_ParserObjects ,Enum i_JavaData) { - return i_JavaData.toString(); + return i_JavaData.ordinal(); } @@ -359,9 +360,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,short i_JavaData) + public static Short toJson(XJSON i_XJson ,Map i_ParserObjects ,short i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -378,9 +379,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Short i_JavaData) + public static Short toJson(XJSON i_XJson ,Map i_ParserObjects ,Short i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -397,9 +398,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,int i_JavaData) + public static Integer toJson(XJSON i_XJson ,Map i_ParserObjects ,int i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -416,9 +417,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Integer i_JavaData) + public static Integer toJson(XJSON i_XJson ,Map i_ParserObjects ,Integer i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -435,9 +436,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,long i_JavaData) + public static Long toJson(XJSON i_XJson ,Map i_ParserObjects ,long i_JavaData) { - return String.valueOf(i_JavaData); + return i_JavaData; } @@ -454,9 +455,9 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Long i_JavaData) + public static Long toJson(XJSON i_XJson ,Map i_ParserObjects ,Long i_JavaData) { - return i_JavaData.toString(); + return i_JavaData; } @@ -473,15 +474,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,double i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,double i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return ((Double)i_JavaData).toString(); + return i_JavaData; } } @@ -499,15 +500,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Double i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,Double i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return i_JavaData.toString(); + return i_JavaData; } } @@ -525,15 +526,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,float i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,float i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return ((Float)i_JavaData).toString(); + return Double.valueOf(i_JavaData); } } @@ -551,15 +552,15 @@ public static String toJson(XJSON i_XJson ,Map i_ParserObjects * @param i_JavaData 待转的对象 * @return */ - public static String toJson(XJSON i_XJson ,Map i_ParserObjects ,Float i_JavaData) + public static Double toJson(XJSON i_XJson ,Map i_ParserObjects ,Float i_JavaData) { if ( i_XJson.getDigit() != null ) { - return String.valueOf(Help.round(i_JavaData ,i_XJson.getDigit())); + return Help.round(i_JavaData ,i_XJson.getDigit()); } else { - return i_JavaData.toString(); + return Double.valueOf(i_JavaData); } } diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index 41c0c16..47305a8 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ -Manifest-Version: 4.4.7 +Manifest-Version: 4.4.8 Created-By: HY.ZhengWei@qq.com 2011 -Specification-Version: 4.4.7 2024-01-10 +Specification-Version: 4.4.8 2024-02-05 SourceCode: https://github.com/HY-ZhengWei/XJava SourceCodeChina: https://gitee.com/HY-ZhengWei/XJava Build-JDK: 11 diff --git a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties index 7d7b4c1..b082346 100644 --- a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties +++ b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties @@ -1,3 +1,3 @@ -version=4.4.7 +version=4.4.8 groupId=org artifactId=hy.common.xjava diff --git a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml index b3850dc..a0dc4e2 100644 --- a/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml +++ b/src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml @@ -6,7 +6,7 @@ org hy.common.xjava - 4.4.7 + 4.4.8 jar cn.openapis.hy.common.xjava @@ -54,7 +54,7 @@ cn.openapis hy.common.base - 1.0.178 + 1.0.181 provided @@ -75,7 +75,7 @@ cn.openapis hy.common.tpool - 1.3.5 + 1.3.6 provided diff --git a/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java b/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java index 7a33d09..fbac05f 100644 --- a/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java +++ b/src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java @@ -1,5 +1,8 @@ package org.hy.common.xml.junit; +import java.util.HashMap; +import java.util.Map; + import org.hy.common.StringHelp; import org.hy.common.xml.XHttp; import org.junit.Test; @@ -11,6 +14,29 @@ public class JU_XHttp_Get { + @Test + public void test_requestGet02() + { + XHttp v_XHttp = new XHttp(); + + v_XHttp.setProtocol("http"); + v_XHttp.setIp("10.1.50.93"); + v_XHttp.setPort(8080); + v_XHttp.setUrl("/mes/outHelpLeaveAndReturnConfirm/returnListMsg.do"); + v_XHttp.setCharset("UTF-8"); + v_XHttp.setRequestType(1); + v_XHttp.setContentType("application/json"); + + Map v_UrlParams = new HashMap(); + + System.out.println(v_XHttp.request(v_UrlParams ,"{\"token\": \":token\", \"timestamp\": \":timestamp\", \"sign\": \":sign\"}")); + + + System.out.println(XHttp.requestGet("http://10.1.50.93:8080/mes/outHelpLeaveAndReturnConfirm/returnListMsg.do?")); + } + + + @Test public void test_requestGet() { diff --git a/src/test/java/org/hy/common/xml/junit/template/db.xml b/src/test/java/org/hy/common/xml/junit/template/db.xml index 163e927..1c233d7 100644 --- a/src/test/java/org/hy/common/xml/junit/template/db.xml +++ b/src/test/java/org/hy/common/xml/junit/template/db.xml @@ -2,19 +2,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - org.hy.common.xml.junit.template.TableInfo - setter(colValue) - nameDB - - - - - + FROM sys.tables A + ,sys.columns B + ,sys.systypes C + WHERE A.object_id = B.object_id + AND B.user_type_id = C.xusertype + ORDER BY A.name ,B.column_id + ]]> + + + + org.hy.common.xml.junit.template.TableInfo + setter(colValue) + nameDB + + + + + \ No newline at end of file