niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理xml消息中后缀为$n的节点在签名时可能错误的问题

Browse Source
This commit is contained in:
jinyu
2015-06-13 21:34:33 +08:00
parent 2275ddd97a
commit 5e1ff55326
12 changed files with 237 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/MapUtil.java
+27 -14
View File
@@ -7,9 +7,9 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.alibaba.fastjson.JSONObject;
import com.foxinmy.weixin4j.model.Consts;
import com.foxinmy.weixin4j.xml.ListsuffixResultSerializer;
/**
* 签名工具类
@@ -23,15 +23,19 @@ import com.foxinmy.weixin4j.model.Consts;
public class MapUtil {
/**
* 连接字符串
* @param object 对象
* @param encoder 是否编码
* @param lowerCase 是否转换小写
* @param extra 附加对象
*
* @param object
* 对象
* @param encoder
* 是否编码
* @param lowerCase
* 是否转换小写
* @param extra
* 附加对象
* @return
*/
public static String toJoinString(Object object, boolean encoder,
boolean lowerCase, Map<String, String> extra) {
String text = JSON.toJSONString(object);
Map<String, String> map = new TreeMap<String, String>(
new Comparator<String>() {
@Override
@@ -39,10 +43,15 @@ public class MapUtil {
return o1.compareTo(o2);
}
});
map.putAll(JSON.parseObject(text,
new TypeReference<Map<String, String>>() {
}));
JSONObject obj = null;
if (object instanceof String) {
obj = JSONObject.parseObject(object.toString());
} else {
obj = ListsuffixResultSerializer.serializeToJSON(object);
}
for (String key : obj.keySet()) {
map.put(key, obj.getString(key));
}
if (extra != null && !extra.isEmpty()) {
map.putAll(extra);
}
@@ -51,9 +60,13 @@ public class MapUtil {
/**
* 连接字符串
* @param map 对象
* @param encoder 是否编码
* @param lowerCase 是否转换小写
*
* @param map
* 对象
* @param encoder
* 是否编码
* @param lowerCase
* 是否转换小写
* @return
*/
public static String toJoinString(Map<String, String> map, boolean encoder,
weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ReflectionUtil.java
+2 -4
View File
@@ -201,11 +201,9 @@ public class ReflectionUtil {
return field.getType().getSimpleName();
}
@SuppressWarnings("unused")
private static Field getAccessibleField(final Object object,
public static Field getAccessibleField(final Object object,
final String fieldName) {
for (Class<?> superClass = object.getClass(); superClass != Object.class; superClass = superClass
.getSuperclass()) {
for (Class<?> superClass = object.getClass(); superClass != Object.class;) {
try {
Field field = superClass.getDeclaredField(fieldName);
field.setAccessible(true);
weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResult.java
+12
View File
@@ -0,0 +1,12 @@
package com.foxinmy.weixin4j.xml;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface ListsuffixResult {
}
weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultSerializer.java
+142
View File
@@ -0,0 +1,142 @@
package com.foxinmy.weixin4j.xml;
import java.io.IOException;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.alibaba.fastjson.serializer.NameFilter;
import com.alibaba.fastjson.serializer.PropertyFilter;
import com.foxinmy.weixin4j.model.Consts;
import com.foxinmy.weixin4j.util.ReflectionUtil;
/**
* 对 后缀为_$n 的 xml节点序列化
*
* @className ListsuffixResultSerializer
* @author jy
* @date 2015年3月24日
* @since JDK 1.7
* @see
*/
public class ListsuffixResultSerializer {
private static final String LISTSUFFIX_RESULT_NAME = "$listsuffix_result$";
/**
* 序列化为json
*
* @param object
* @return json
*/
public static JSONObject serializeToJSON(Object object) {
final JSONObject listsuffix = new JSONObject();
String preJson = JSON.toJSONString(object, new PropertyFilter() {
@Override
public boolean apply(Object source, String name, Object value) {
if (name.equalsIgnoreCase(LISTSUFFIX_RESULT_NAME)) {
listsuffix.put(LISTSUFFIX_RESULT_NAME, JSON.toJSON(value));
return false;
}
Field field = ReflectionUtil.getAccessibleField(source, name);
if (field != null
&& field.getAnnotation(ListsuffixResult.class) != null) {
listsuffix.put(LISTSUFFIX_RESULT_NAME, JSON.toJSON(value));
return false;
}
return true;
}
});
JSONObject result = JSON.parseObject(preJson);
try {
Map<String, String> listMap = listsuffixConvertMap(listsuffix
.getJSONArray(LISTSUFFIX_RESULT_NAME));
result.putAll(listMap);
} catch (JSONException e) {
;//
}
return result;
}
/**
* list对象转换为map的$n形式
*
* @param listsuffix
* @return
*/
public static Map<String, String> listsuffixConvertMap(List<?> listsuffix) {
Map<String, String> listMap = new HashMap<String, String>();
if (listsuffix != null && !listsuffix.isEmpty()) {
for (int i = 0; i < listsuffix.size(); i++) {
listMap.putAll(JSON.parseObject(JSON.toJSONString(
listsuffix.get(i), new ListsuffixEndNameFilter(i)),
new TypeReference<Map<String, String>>() {
}));
}
}
return listMap;
}
private static class ListsuffixEndNameFilter implements NameFilter {
private final int index;
public ListsuffixEndNameFilter(int index) {
this.index = index;
}
@Override
public String process(Object object, String name, Object value) {
return String.format("%s_%d", name, index);
}
}
/**
* 序列化为xml
*
* @param object
* @return xml
*/
public static String serializeToXML(Object object) {
JSONObject obj = serializeToJSON(object);
StringWriter sw = new StringWriter();
XMLStreamWriter xw = null;
try {
xw = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
xw.writeStartDocument(Consts.UTF_8.name(), "1.0");
xw.writeStartElement("xml");
for (String key : obj.keySet()) {
xw.writeStartElement(key);
xw.writeCData(obj.getString(key));
xw.writeEndElement();
}
xw.writeEndElement();
xw.writeEndDocument();
} catch (XMLStreamException e) {
e.printStackTrace();
} finally {
if (xw != null) {
try {
xw.close();
} catch (XMLStreamException e) {
;
}
}
try {
sw.close();
} catch (IOException e) {
;
}
}
return sw.getBuffer().toString();
}
}