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

#73

Browse Source
This commit is contained in:
jinyu 2016-06-08 15:23:36 +08:00
parent f24c594def
commit 57daea99a8
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weixin4j-base/src/main/java/com/foxinmy/weixin4j/cache/RedisCacheStorager.java vendored
View File

@ -81,9 +81,11 @@ public class RedisCacheStorager<T extends Cacheable> implements
jedis = jedisPool.getResource(); jedis = jedisPool.getResource();
byte[] key = cacheKey.getBytes(Consts.UTF_8); byte[] key = cacheKey.getBytes(Consts.UTF_8);
byte[] value = SerializationUtils.serialize(cache); byte[] value = SerializationUtils.serialize(cache);
jedis.set(key, value);
if (cache.getExpires() > 0) { if (cache.getExpires() > 0) {
jedis.expire(key, (int) (cache.getExpires() - CUTMS) / 1000); jedis.setex(key, (int) (cache.getExpires() - CUTMS) / 1000,
value);
} else {
jedis.set(key, value);
} }
jedis.sadd(ALLKEY, cacheKey); jedis.sadd(ALLKEY, cacheKey);
} finally { } finally {

6
weixin4j-base/src/main/java/com/foxinmy/weixin4j/cache/RedisClusterCacheStorager.java vendored
View File

@ -68,9 +68,11 @@ public class RedisClusterCacheStorager<T extends Cacheable> implements
public void caching(String cacheKey, T cache) { public void caching(String cacheKey, T cache) {
byte[] key = cacheKey.getBytes(Consts.UTF_8); byte[] key = cacheKey.getBytes(Consts.UTF_8);
byte[] value = SerializationUtils.serialize(cache); byte[] value = SerializationUtils.serialize(cache);
jedisCluster.set(key, value);
if (cache.getExpires() > 0) { if (cache.getExpires() > 0) {
jedisCluster.expire(key, (int) (cache.getExpires() - CUTMS) / 1000); jedisCluster.setex(key, (int) (cache.getExpires() - CUTMS) / 1000,
value);
} else {
jedisCluster.set(key, value);
} }
jedisCluster.sadd(ALLKEY, cacheKey); jedisCluster.sadd(ALLKEY, cacheKey);
} }

16
weixin4j-server/src/main/java/com/foxinmy/weixin4j/xml/MessageTransferHandler.java
View File

@ -49,18 +49,19 @@ public class MessageTransferHandler extends DefaultHandler {
@Override @Override
public void endElement(String uri, String localName, String qName) public void endElement(String uri, String localName, String qName)
throws SAXException { throws SAXException {
nodeNames.add(localName.toLowerCase()); nodeNames.add(localName);
if (localName.equalsIgnoreCase("fromUserName")) { localName = localName.toLowerCase();
if (localName.equals("fromusername")) {
fromUserName = content; fromUserName = content;
} else if (localName.equalsIgnoreCase("toUserName")) { } else if (localName.equals("tousername")) {
toUserName = content; toUserName = content;
} else if (localName.equalsIgnoreCase("msgType")) { } else if (localName.equals("msgtype")) {
msgType = content.toLowerCase(); msgType = content.toLowerCase();
} else if (localName.equalsIgnoreCase("event")) { } else if (localName.equals("event")) {
eventType = content.toLowerCase(); eventType = content.toLowerCase();
} else if (localName.startsWith("agent") // 应用信息 } else if (localName.startsWith("agent") // 应用信息
|| localName.startsWith("suite") // 套件信息 || localName.startsWith("suite") // 套件信息
|| localName.equalsIgnoreCase("batchJob")) { // 批量任务 || localName.equals("batchjob")) { // 批量任务
isQY = true; isQY = true;
} }
} }
@ -75,7 +76,8 @@ public class MessageTransferHandler extends DefaultHandler {
if (isQY) { if (isQY) {
return AccountType.QY; return AccountType.QY;
} }
if (ServerToolkits.isBlank(msgType) && ServerToolkits.isBlank(eventType)) { if (ServerToolkits.isBlank(msgType)
&& ServerToolkits.isBlank(eventType)) {
return null; return null;
} }
return AccountType.MP; return AccountType.MP;

4
weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java
View File

@ -51,8 +51,8 @@ public class MessageServerStartup {
new WeixinServerBootstrap(token).addHandler(DebugMessageHandler.global) new WeixinServerBootstrap(token).addHandler(DebugMessageHandler.global)
.startup(); .startup();
// 密文模式 // 密文模式
new WeixinServerBootstrap(weixinId, token, aesKey).addHandler( // new WeixinServerBootstrap(weixinId, token, aesKey).addHandler(
DebugMessageHandler.global).startup(); // DebugMessageHandler.global).startup();
} }
/** /**