Skip to content

Commit

Permalink
4.4.8
Browse files Browse the repository at this point in the history 
1.修正：Integer、Long、Float、Double、Boolean、Enum 按数字类型返回，生成的Json不带双引号
  • Loading branch information
@HY-ZhengWei
HY-ZhengWei committed Feb 5, 2024
1 parent 3073b01 commit 41aebad
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 82 deletions.
Binary file modified hy.common.xjava-sources.jar
View file
Binary file not shown.
Binary file modified hy.common.xjava.jar
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>cn.openapis</groupId>
<artifactId>hy.common.xjava</artifactId>
<version>4.4.7</version>
<version>4.4.8</version>
<packaging>jar</packaging>

<name>cn.openapis.hy.common.xjava</name>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>cn.openapis</groupId>
<artifactId>hy.common.base</artifactId>
<version>1.0.178</version>
<version>1.0.181</version>
<scope>provided</scope>
</dependency>

Expand All @@ -75,7 +75,7 @@
<dependency>
<groupId>cn.openapis</groupId>
<artifactId>hy.common.tpool</artifactId>
<version>1.3.5</version>
<version>1.3.6</version>
<scope>provided</scope>
</dependency>

Expand Down
61 changes: 31 additions & 30 deletions src/main/java/org/hy/common/xml/XJSONToJson.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -226,9 +227,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,boolean i_JavaData)
public static Boolean toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,boolean i_JavaData)
{
return String.valueOf(i_JavaData);
return i_JavaData;
}


Expand All @@ -245,9 +246,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Boolean i_JavaData)
public static Boolean toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Boolean i_JavaData)
{
return i_JavaData.toString();
return i_JavaData;
}


Expand All @@ -264,9 +265,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Enum<?> i_JavaData)
public static Integer toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Enum<?> i_JavaData)
{
return i_JavaData.toString();
return i_JavaData.ordinal();
}


Expand Down Expand Up @@ -359,9 +360,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,short i_JavaData)
public static Short toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,short i_JavaData)
{
return String.valueOf(i_JavaData);
return i_JavaData;
}


Expand All @@ -378,9 +379,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Short i_JavaData)
public static Short toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Short i_JavaData)
{
return i_JavaData.toString();
return i_JavaData;
}


Expand All @@ -397,9 +398,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,int i_JavaData)
public static Integer toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,int i_JavaData)
{
return String.valueOf(i_JavaData);
return i_JavaData;
}


Expand All @@ -416,9 +417,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Integer i_JavaData)
public static Integer toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Integer i_JavaData)
{
return i_JavaData.toString();
return i_JavaData;
}


Expand All @@ -435,9 +436,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,long i_JavaData)
public static Long toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,long i_JavaData)
{
return String.valueOf(i_JavaData);
return i_JavaData;
}


Expand All @@ -454,9 +455,9 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Long i_JavaData)
public static Long toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Long i_JavaData)
{
return i_JavaData.toString();
return i_JavaData;
}


Expand All @@ -473,15 +474,15 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,double i_JavaData)
public static Double toJson(XJSON i_XJson ,Map<Object ,Integer> 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;
}
}

Expand All @@ -499,15 +500,15 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Double i_JavaData)
public static Double toJson(XJSON i_XJson ,Map<Object ,Integer> 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;
}
}

Expand All @@ -525,15 +526,15 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,float i_JavaData)
public static Double toJson(XJSON i_XJson ,Map<Object ,Integer> 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);
}
}

Expand All @@ -551,15 +552,15 @@ public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects
* @param i_JavaData 待转的对象
* @return
*/
public static String toJson(XJSON i_XJson ,Map<Object ,Integer> i_ParserObjects ,Float i_JavaData)
public static Double toJson(XJSON i_XJson ,Map<Object ,Integer> 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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Manifest-Version: 4.4.7
Manifest-Version: 4.4.8
Created-By: [email protected] 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
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=4.4.7
version=4.4.8
groupId=org
artifactId=hy.common.xjava
6 changes: 3 additions & 3 deletions src/main/resources/META-INF/maven/cn.openapis/hy.common.xjava/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org</groupId>
<artifactId>hy.common.xjava</artifactId>
<version>4.4.7</version>
<version>4.4.8</version>
<packaging>jar</packaging>

<name>cn.openapis.hy.common.xjava</name>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>cn.openapis</groupId>
<artifactId>hy.common.base</artifactId>
<version>1.0.178</version>
<version>1.0.181</version>
<scope>provided</scope>
</dependency>

Expand All @@ -75,7 +75,7 @@
<dependency>
<groupId>cn.openapis</groupId>
<artifactId>hy.common.tpool</artifactId>
<version>1.3.5</version>
<version>1.3.6</version>
<scope>provided</scope>
</dependency>

Expand Down
26 changes: 26 additions & 0 deletions src/test/java/org/hy/common/xml/junit/JU_XHttp_Get.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<String ,Object> v_UrlParams = new HashMap<String ,Object>();

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()
{
Expand Down
Loading

0 comments on commit 41aebad

Please sign in to comment.