@@ -8,9 +8,9 @@ import java.util.Map; | |||||
import java.util.concurrent.ConcurrentHashMap; | import java.util.concurrent.ConcurrentHashMap; | ||||
import java.util.concurrent.atomic.AtomicBoolean; | import java.util.concurrent.atomic.AtomicBoolean; | ||||
public class SessionManagerImpl implements WxSessionManager, InternalSessionManager { | |||||
public class InMemorySessionManager implements WxSessionManager, InternalSessionManager { | |||||
protected final Logger log = LoggerFactory.getLogger(SessionManagerImpl.class); | |||||
protected final Logger log = LoggerFactory.getLogger(InMemorySessionManager.class); | |||||
protected static final StringManager sm = | protected static final StringManager sm = | ||||
StringManager.getManager(Constants.Package); | StringManager.getManager(Constants.Package); | ||||
@@ -105,6 +105,11 @@ public class SessionManagerImpl implements WxSessionManager, InternalSessionMana | |||||
*/ | */ | ||||
protected int processExpiresFrequency = 6; | protected int processExpiresFrequency = 6; | ||||
/** | |||||
* background processor delay in seconds | |||||
*/ | |||||
protected int backgroundProcessorDelay = 10; | |||||
/** | /** | ||||
* 后台清理线程是否已经开启 | * 后台清理线程是否已经开启 | ||||
*/ | */ | ||||
@@ -204,7 +209,7 @@ public class SessionManagerImpl implements WxSessionManager, InternalSessionMana | |||||
while (true) { | while (true) { | ||||
try { | try { | ||||
// 每秒清理一次 | // 每秒清理一次 | ||||
Thread.sleep(1000l); | |||||
Thread.sleep(backgroundProcessorDelay * 1000l); | |||||
backgroundProcess(); | backgroundProcess(); | ||||
} catch (InterruptedException e) { | } catch (InterruptedException e) { | ||||
log.error("SessionManagerImpl.backgroundProcess error", e); | log.error("SessionManagerImpl.backgroundProcess error", e); | ||||
@@ -225,6 +230,7 @@ public class SessionManagerImpl implements WxSessionManager, InternalSessionMana | |||||
} | } | ||||
} | } | ||||
} | } | ||||
} | } | ||||
/** | /** | ||||
@@ -269,6 +275,34 @@ public class SessionManagerImpl implements WxSessionManager, InternalSessionMana | |||||
} | } | ||||
@Override | |||||
public void setMaxInactiveInterval(int interval) { | |||||
this.maxInactiveInterval = interval; | |||||
} | |||||
/** | |||||
* Set the manager checks frequency. | |||||
* | |||||
* @param processExpiresFrequency the new manager checks frequency | |||||
*/ | |||||
@Override | |||||
public void setProcessExpiresFrequency(int processExpiresFrequency) { | |||||
if (processExpiresFrequency <= 0) { | |||||
return; | |||||
} | |||||
this.processExpiresFrequency = processExpiresFrequency; | |||||
} | |||||
@Override | |||||
public void setBackgroundProcessorDelay(int backgroundProcessorDelay) { | |||||
this.backgroundProcessorDelay = backgroundProcessorDelay; | |||||
} | |||||
/** | /** | ||||
* Return the descriptive short name of this Manager implementation. | * Return the descriptive short name of this Manager implementation. | ||||
*/ | */ |
@@ -10,7 +10,7 @@ public class InternalSessionFacade implements WxSession { | |||||
private WxSession session = null; | private WxSession session = null; | ||||
public InternalSessionFacade(WxSession session) { | public InternalSessionFacade(WxSession session) { | ||||
session = session; | |||||
this.session = session; | |||||
} | } | ||||
@Override | @Override | ||||
@@ -60,4 +60,15 @@ public interface InternalSessionManager { | |||||
*/ | */ | ||||
public void backgroundProcess(); | public void backgroundProcess(); | ||||
/** | |||||
* Set the default maximum inactive interval (in seconds) | |||||
* for Sessions created by this Manager. | |||||
* | |||||
* @param interval The new default value | |||||
*/ | |||||
void setMaxInactiveInterval(int interval); | |||||
void setProcessExpiresFrequency(int processExpiresFrequency); | |||||
void setBackgroundProcessorDelay(int backgroundProcessorDelay); | |||||
} | } |
@@ -308,4 +308,40 @@ public class SessionImpl implements WxSession, InternalSession { | |||||
} | } | ||||
@Override | |||||
public boolean equals(Object o) { | |||||
if (this == o) return true; | |||||
if (!(o instanceof SessionImpl)) return false; | |||||
SessionImpl session = (SessionImpl) o; | |||||
if (creationTime != session.creationTime) return false; | |||||
if (expiring != session.expiring) return false; | |||||
if (isValid != session.isValid) return false; | |||||
if (maxInactiveInterval != session.maxInactiveInterval) return false; | |||||
if (thisAccessedTime != session.thisAccessedTime) return false; | |||||
if (!accessCount.equals(session.accessCount)) return false; | |||||
if (!attributes.equals(session.attributes)) return false; | |||||
if (!facade.equals(session.facade)) return false; | |||||
if (!id.equals(session.id)) return false; | |||||
if (!manager.equals(session.manager)) return false; | |||||
return true; | |||||
} | |||||
@Override | |||||
public int hashCode() { | |||||
int result = attributes.hashCode(); | |||||
result = 31 * result + id.hashCode(); | |||||
result = 31 * result + (isValid ? 1 : 0); | |||||
result = 31 * result + (expiring ? 1 : 0); | |||||
result = 31 * result + manager.hashCode(); | |||||
result = 31 * result + (int) (creationTime ^ (creationTime >>> 32)); | |||||
result = 31 * result + (int) (thisAccessedTime ^ (thisAccessedTime >>> 32)); | |||||
result = 31 * result + maxInactiveInterval; | |||||
result = 31 * result + facade.hashCode(); | |||||
result = 31 * result + accessCount.hashCode(); | |||||
return result; | |||||
} | |||||
} | } |
@@ -0,0 +1,68 @@ | |||||
package me.chanjar.weixin.common.session; | |||||
import org.testng.Assert; | |||||
import org.testng.annotations.DataProvider; | |||||
import org.testng.annotations.Test; | |||||
@Test | |||||
public class TestSession { | |||||
@DataProvider | |||||
public Object[][] getSessionManager() { | |||||
return new Object[][] { | |||||
new Object[] { new InMemorySessionManager() } | |||||
}; | |||||
} | |||||
@Test(dataProvider = "getSessionManager", expectedExceptions = IllegalStateException.class) | |||||
public void testInvalidate(WxSessionManager sessionManager) { | |||||
WxSession session = sessionManager.getSession("abc"); | |||||
session.invalidate(); | |||||
session.getAttributeNames(); | |||||
} | |||||
@Test(dataProvider = "getSessionManager") | |||||
public void testInvalidate2(InternalSessionManager sessionManager) { | |||||
Assert.assertEquals(sessionManager.getActiveSessions(), 0); | |||||
WxSession session = ((WxSessionManager) sessionManager).getSession("abc"); | |||||
Assert.assertEquals(sessionManager.getActiveSessions(), 1); | |||||
session.invalidate(); | |||||
Assert.assertEquals(sessionManager.getActiveSessions(), 0); | |||||
} | |||||
@Test(dataProvider = "getSessionManager") | |||||
public void testGetSession(WxSessionManager sessionManager) { | |||||
WxSession session1 = sessionManager.getSession("abc"); | |||||
WxSession session2 = sessionManager.getSession("abc"); | |||||
Assert.assertTrue(session1.equals(session2)); | |||||
WxSession abc1 = sessionManager.getSession("abc1"); | |||||
Assert.assertFalse(session1.equals(abc1)); | |||||
WxSession abc1b = sessionManager.getSession("abc1", false); | |||||
Assert.assertTrue(abc1.equals(abc1b)); | |||||
WxSession def = sessionManager.getSession("def", false); | |||||
Assert.assertNull(def); | |||||
} | |||||
@Test(dataProvider = "getSessionManager") | |||||
public void testBackgroundProcess(WxSessionManager sessionManager) throws InterruptedException { | |||||
InternalSessionManager ism = (InternalSessionManager) sessionManager; | |||||
ism.setMaxInactiveInterval(1); | |||||
ism.setProcessExpiresFrequency(1); | |||||
ism.setBackgroundProcessorDelay(1); | |||||
Assert.assertEquals(ism.getActiveSessions(), 0); | |||||
InternalSession abc = ism.createSession("abc"); | |||||
abc.endAccess(); | |||||
Thread.sleep(2000l); | |||||
Assert.assertEquals(ism.getActiveSessions(), 0); | |||||
} | |||||
} |
@@ -8,6 +8,7 @@ | |||||
<class name="me.chanjar.weixin.common.bean.WxMenuTest"/> | <class name="me.chanjar.weixin.common.bean.WxMenuTest"/> | ||||
<class name="me.chanjar.weixin.common.util.crypto.WxCryptUtilTest"/> | <class name="me.chanjar.weixin.common.util.crypto.WxCryptUtilTest"/> | ||||
<class name="me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateCheckerTest"/> | <class name="me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateCheckerTest"/> | ||||
<class name="me.chanjar.weixin.common.session.TestSession" /> | |||||
</classes> | </classes> | ||||
</test> | </test> | ||||
</suite> | </suite> |
@@ -1,5 +1,6 @@ | |||||
package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | ||||
import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | ||||
@@ -7,18 +8,21 @@ import java.util.Map; | |||||
/** | /** | ||||
* 处理微信推送消息的处理器接口 | * 处理微信推送消息的处理器接口 | ||||
* @author Daniel Qian | |||||
* | * | ||||
* @author Daniel Qian | |||||
*/ | */ | ||||
public interface WxCpMessageHandler { | public interface WxCpMessageHandler { | ||||
/** | /** | ||||
* | |||||
* @param wxMessage | * @param wxMessage | ||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param wxCpService | * @param wxCpService | ||||
* @param sessionManager | |||||
* @return xml格式的消息,如果在异步规则里处理的话,可以返回null | * @return xml格式的消息,如果在异步规则里处理的话,可以返回null | ||||
*/ | */ | ||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService); | |||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, | |||||
Map<String, Object> context, | |||||
WxCpService wxCpService, | |||||
WxSessionManager sessionManager); | |||||
} | } |
@@ -1,23 +1,29 @@ | |||||
package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | ||||
import java.util.Map; | import java.util.Map; | ||||
/** | /** | ||||
* 微信消息拦截器,可以用来做验证 | * 微信消息拦截器,可以用来做验证 | ||||
* @author Daniel Qian | |||||
* | * | ||||
* @author Daniel Qian | |||||
*/ | */ | ||||
public interface WxCpMessageInterceptor { | public interface WxCpMessageInterceptor { | ||||
/** | /** | ||||
* 拦截微信消息 | * 拦截微信消息 | ||||
* | |||||
* @param wxMessage | * @param wxMessage | ||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param wxCpService | * @param wxCpService | ||||
* @return true代表OK,false代表不OK | |||||
* @param sessionManager | |||||
* @return true代表OK,false代表不OK | |||||
*/ | */ | ||||
public boolean intercept(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService); | |||||
public boolean intercept(WxCpXmlMessage wxMessage, | |||||
Map<String, Object> context, | |||||
WxCpService wxCpService, | |||||
WxSessionManager sessionManager); | |||||
} | } |
@@ -1,16 +1,24 @@ | |||||
package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
import me.chanjar.weixin.common.session.InternalSession; | |||||
import me.chanjar.weixin.common.session.WxSession; | |||||
import me.chanjar.weixin.common.session.InMemorySessionManager; | |||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.common.util.WxMessageDuplicateChecker; | import me.chanjar.weixin.common.util.WxMessageDuplicateChecker; | ||||
import me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker; | import me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker; | ||||
import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | ||||
import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | ||||
import org.slf4j.Logger; | |||||
import org.slf4j.LoggerFactory; | |||||
import java.util.ArrayList; | import java.util.ArrayList; | ||||
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.concurrent.ExecutionException; | |||||
import java.util.concurrent.ExecutorService; | import java.util.concurrent.ExecutorService; | ||||
import java.util.concurrent.Executors; | import java.util.concurrent.Executors; | ||||
import java.util.concurrent.Future; | |||||
import java.util.regex.Pattern; | import java.util.regex.Pattern; | ||||
/** | /** | ||||
@@ -43,6 +51,8 @@ import java.util.regex.Pattern; | |||||
*/ | */ | ||||
public class WxCpMessageRouter { | public class WxCpMessageRouter { | ||||
protected final Logger log = LoggerFactory.getLogger(WxCpMessageRouter.class); | |||||
private static final int DEFAULT_THREAD_POOL_SIZE = 100; | private static final int DEFAULT_THREAD_POOL_SIZE = 100; | ||||
private final List<Rule> rules = new ArrayList<Rule>(); | private final List<Rule> rules = new ArrayList<Rule>(); | ||||
@@ -51,16 +61,22 @@ public class WxCpMessageRouter { | |||||
private ExecutorService executorService; | private ExecutorService executorService; | ||||
private WxMessageDuplicateChecker wxMessageDuplicateChecker; | |||||
private WxMessageDuplicateChecker messageDuplicateChecker; | |||||
private WxSessionManager sessionManager; | |||||
public WxCpMessageRouter(WxCpService wxCpService) { | public WxCpMessageRouter(WxCpService wxCpService) { | ||||
this.wxCpService = wxCpService; | this.wxCpService = wxCpService; | ||||
this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); | this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); | ||||
this.wxMessageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); | |||||
this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); | |||||
this.sessionManager = new InMemorySessionManager(); | |||||
} | } | ||||
/** | /** | ||||
* 设置自定义的ExecutorService | |||||
* <pre> | |||||
* 设置自定义的 {@link ExecutorService} | |||||
* 如果不调用该方法,默认使用 Executors.newFixedThreadPool(100) | |||||
* </pre> | |||||
* @param executorService | * @param executorService | ||||
*/ | */ | ||||
public void setExecutorService(ExecutorService executorService) { | public void setExecutorService(ExecutorService executorService) { | ||||
@@ -68,11 +84,25 @@ public class WxCpMessageRouter { | |||||
} | } | ||||
/** | /** | ||||
* 设置自定义的WxMsgIdDuplicateChecker | |||||
* @param wxMessageDuplicateChecker | |||||
* <pre> | |||||
* 设置自定义的 {@link me.chanjar.weixin.common.util.WxMessageDuplicateChecker} | |||||
* 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker} | |||||
* </pre> | |||||
* @param messageDuplicateChecker | |||||
*/ | */ | ||||
public void setWxMessageDuplicateChecker(WxMessageDuplicateChecker wxMessageDuplicateChecker) { | |||||
this.wxMessageDuplicateChecker = wxMessageDuplicateChecker; | |||||
public void setMessageDuplicateChecker(WxMessageDuplicateChecker messageDuplicateChecker) { | |||||
this.messageDuplicateChecker = messageDuplicateChecker; | |||||
} | |||||
/** | |||||
* <pre> | |||||
* 设置自定义的{@link me.chanjar.weixin.common.session.WxSessionManager} | |||||
* 如果不调用该方法,默认使用 {@linke SessionManagerImpl} | |||||
* </pre> | |||||
* @param sessionManager | |||||
*/ | |||||
public void setSessionManager(WxSessionManager sessionManager) { | |||||
this.sessionManager = sessionManager; | |||||
} | } | ||||
/** | /** | ||||
@@ -80,7 +110,7 @@ public class WxCpMessageRouter { | |||||
* @return | * @return | ||||
*/ | */ | ||||
public Rule rule() { | public Rule rule() { | ||||
return new Rule(this, wxCpService); | |||||
return new Rule(this, wxCpService, sessionManager); | |||||
} | } | ||||
/** | /** | ||||
@@ -88,7 +118,7 @@ public class WxCpMessageRouter { | |||||
* @param wxMessage | * @param wxMessage | ||||
*/ | */ | ||||
public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) { | public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) { | ||||
if (wxMessageDuplicateChecker.isDuplicate(wxMessage.getMsgId())) { | |||||
if (messageDuplicateChecker.isDuplicate(wxMessage.getMsgId())) { | |||||
// 如果是重复消息,那么就不做处理 | // 如果是重复消息,那么就不做处理 | ||||
return null; | return null; | ||||
} | } | ||||
@@ -109,27 +139,66 @@ public class WxCpMessageRouter { | |||||
} | } | ||||
WxCpXmlOutMessage res = null; | WxCpXmlOutMessage res = null; | ||||
final List<Future> futures = new ArrayList<Future>(); | |||||
for (final Rule rule : matchRules) { | for (final Rule rule : matchRules) { | ||||
// 返回最后一个非异步的rule的执行结果 | // 返回最后一个非异步的rule的执行结果 | ||||
if(rule.async) { | if(rule.async) { | ||||
executorService.submit(new Runnable() { | |||||
public void run() { | |||||
rule.service(wxMessage); | |||||
} | |||||
}); | |||||
futures.add( | |||||
executorService.submit(new Runnable() { | |||||
public void run() { | |||||
rule.service(wxMessage); | |||||
} | |||||
}) | |||||
); | |||||
} else { | } else { | ||||
res = rule.service(wxMessage); | res = rule.service(wxMessage); | ||||
} | } | ||||
} | } | ||||
// 告诉session,它已经用不着了 | |||||
if (futures.size() > 0) { | |||||
executorService.submit(new Runnable() { | |||||
@Override | |||||
public void run() { | |||||
for (Future future : futures) { | |||||
try { | |||||
future.get(); | |||||
} catch (InterruptedException e) { | |||||
log.error("Error happened when wait task finish", e); | |||||
} catch (ExecutionException e) { | |||||
log.error("Error happened when wait task finish", e); | |||||
} | |||||
} | |||||
// 在这里session再也不会被使用了 | |||||
sessionEndAccess(wxMessage); | |||||
} | |||||
}); | |||||
} else { | |||||
// 在这里session再也不会被使用了 | |||||
sessionEndAccess(wxMessage); | |||||
} | |||||
return res; | return res; | ||||
} | } | ||||
/** | |||||
* 对session的访问结束 | |||||
* @param wxMessage | |||||
*/ | |||||
protected void sessionEndAccess(WxCpXmlMessage wxMessage) { | |||||
WxSession session = sessionManager.getSession(wxMessage.getFromUserName(), false); | |||||
if (session != null) { | |||||
((InternalSession) session).endAccess(); | |||||
} | |||||
} | |||||
public static class Rule { | public static class Rule { | ||||
private final WxCpMessageRouter routerBuilder; | private final WxCpMessageRouter routerBuilder; | ||||
private final WxCpService wxCpService; | private final WxCpService wxCpService; | ||||
private final WxSessionManager sessionManager; | |||||
private boolean async = true; | private boolean async = true; | ||||
private String fromUser; | private String fromUser; | ||||
@@ -152,9 +221,10 @@ public class WxCpMessageRouter { | |||||
private List<WxCpMessageInterceptor> interceptors = new ArrayList<WxCpMessageInterceptor>(); | private List<WxCpMessageInterceptor> interceptors = new ArrayList<WxCpMessageInterceptor>(); | ||||
protected Rule(WxCpMessageRouter routerBuilder, WxCpService wxCpService) { | |||||
protected Rule(WxCpMessageRouter routerBuilder, WxCpService wxCpService, WxSessionManager sessionManager) { | |||||
this.routerBuilder = routerBuilder; | this.routerBuilder = routerBuilder; | ||||
this.wxCpService = wxCpService; | this.wxCpService = wxCpService; | ||||
this.sessionManager = sessionManager; | |||||
} | } | ||||
/** | /** | ||||
@@ -332,7 +402,7 @@ public class WxCpMessageRouter { | |||||
Map<String, Object> context = new HashMap<String, Object>(); | Map<String, Object> context = new HashMap<String, Object>(); | ||||
// 如果拦截器不通过 | // 如果拦截器不通过 | ||||
for (WxCpMessageInterceptor interceptor : this.interceptors) { | for (WxCpMessageInterceptor interceptor : this.interceptors) { | ||||
if (!interceptor.intercept(wxMessage, context, wxCpService)) { | |||||
if (!interceptor.intercept(wxMessage, context, wxCpService, sessionManager)) { | |||||
return null; | return null; | ||||
} | } | ||||
} | } | ||||
@@ -341,7 +411,7 @@ public class WxCpMessageRouter { | |||||
WxCpXmlOutMessage res = null; | WxCpXmlOutMessage res = null; | ||||
for (WxCpMessageHandler handler : this.handlers) { | for (WxCpMessageHandler handler : this.handlers) { | ||||
// 返回最后handler的结果 | // 返回最后handler的结果 | ||||
res = handler.handle(wxMessage, context, wxCpService); | |||||
res = handler.handle(wxMessage, context, wxCpService, sessionManager); | |||||
} | } | ||||
return res; | return res; | ||||
} | } | ||||
@@ -392,7 +392,7 @@ public interface WxCpService { | |||||
/** | /** | ||||
* <pre> | * <pre> | ||||
* 设置WxSessionManager,只有当需要使用个性化的WxSessionManager的时候才需要调用此方法, | * 设置WxSessionManager,只有当需要使用个性化的WxSessionManager的时候才需要调用此方法, | ||||
* WxCpService默认使用的是{@link me.chanjar.weixin.common.session.SessionManagerImpl} | |||||
* WxCpService默认使用的是{@link me.chanjar.weixin.common.session.InMemorySessionManager} | |||||
* </pre> | * </pre> | ||||
* @param sessionManager | * @param sessionManager | ||||
*/ | */ | ||||
@@ -12,7 +12,7 @@ import me.chanjar.weixin.common.bean.WxMenu; | |||||
import me.chanjar.weixin.common.bean.result.WxError; | import me.chanjar.weixin.common.bean.result.WxError; | ||||
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | ||||
import me.chanjar.weixin.common.exception.WxErrorException; | import me.chanjar.weixin.common.exception.WxErrorException; | ||||
import me.chanjar.weixin.common.session.SessionManagerImpl; | |||||
import me.chanjar.weixin.common.session.InMemorySessionManager; | |||||
import me.chanjar.weixin.common.session.WxSession; | import me.chanjar.weixin.common.session.WxSession; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | import me.chanjar.weixin.common.session.WxSessionManager; | ||||
import me.chanjar.weixin.common.util.StringUtils; | import me.chanjar.weixin.common.util.StringUtils; | ||||
@@ -46,7 +46,6 @@ import java.io.InputStream; | |||||
import java.io.StringReader; | import java.io.StringReader; | ||||
import java.util.List; | import java.util.List; | ||||
import java.util.UUID; | import java.util.UUID; | ||||
import java.util.concurrent.atomic.AtomicBoolean; | |||||
public class WxCpServiceImpl implements WxCpService { | public class WxCpServiceImpl implements WxCpService { | ||||
@@ -67,7 +66,7 @@ public class WxCpServiceImpl implements WxCpService { | |||||
private int maxRetryTimes = 5; | private int maxRetryTimes = 5; | ||||
protected WxSessionManager sessionManager = new SessionManagerImpl(); | |||||
protected WxSessionManager sessionManager = new InMemorySessionManager(); | |||||
public boolean checkSignature(String msgSignature, String timestamp, String nonce, String data) { | public boolean checkSignature(String msgSignature, String timestamp, String nonce, String data) { | ||||
try { | try { | ||||
@@ -1,6 +1,7 @@ | |||||
package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
import me.chanjar.weixin.common.api.WxConsts; | import me.chanjar.weixin.common.api.WxConsts; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | ||||
import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | ||||
import org.testng.Assert; | import org.testng.Assert; | ||||
@@ -67,7 +68,8 @@ public class WxCpMessageRouterTest { | |||||
final WxCpMessageRouter router = new WxCpMessageRouter(null); | final WxCpMessageRouter router = new WxCpMessageRouter(null); | ||||
router.rule().handler(new WxCpMessageHandler() { | router.rule().handler(new WxCpMessageHandler() { | ||||
@Override | @Override | ||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService) { | |||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService, | |||||
WxSessionManager sessionManager) { | |||||
return null; | return null; | ||||
} | } | ||||
}).end(); | }).end(); | ||||
@@ -149,7 +151,8 @@ public class WxCpMessageRouterTest { | |||||
} | } | ||||
@Override | @Override | ||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService) { | |||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService, | |||||
WxSessionManager sessionManager) { | |||||
sb.append(this.echoStr).append(','); | sb.append(this.echoStr).append(','); | ||||
return null; | return null; | ||||
} | } | ||||
@@ -1,5 +1,6 @@ | |||||
package me.chanjar.weixin.cp.demo; | package me.chanjar.weixin.cp.demo; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.cp.api.*; | import me.chanjar.weixin.cp.api.*; | ||||
import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlMessage; | ||||
import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage; | ||||
@@ -46,7 +47,7 @@ public class WxCpDemoServer { | |||||
WxCpMessageHandler handler = new WxCpMessageHandler() { | WxCpMessageHandler handler = new WxCpMessageHandler() { | ||||
@Override | @Override | ||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, | public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, | ||||
WxCpService wxCpService) { | |||||
WxCpService wxCpService, WxSessionManager sessionManager) { | |||||
WxCpXmlOutTextMessage m = WxCpXmlOutMessage | WxCpXmlOutTextMessage m = WxCpXmlOutMessage | ||||
.TEXT() | .TEXT() | ||||
.content("测试加密消息") | .content("测试加密消息") | ||||
@@ -60,7 +61,7 @@ public class WxCpDemoServer { | |||||
WxCpMessageHandler oauth2handler = new WxCpMessageHandler() { | WxCpMessageHandler oauth2handler = new WxCpMessageHandler() { | ||||
@Override | @Override | ||||
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, | public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, | ||||
WxCpService wxCpService) { | |||||
WxCpService wxCpService, WxSessionManager sessionManager) { | |||||
String href = "<a href=\"" + wxCpService.oauth2buildAuthorizationUrl(null) | String href = "<a href=\"" + wxCpService.oauth2buildAuthorizationUrl(null) | ||||
+ "\">测试oauth2</a>"; | + "\">测试oauth2</a>"; | ||||
return WxCpXmlOutMessage | return WxCpXmlOutMessage | ||||
@@ -1,5 +1,6 @@ | |||||
package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | ||||
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; | ||||
@@ -7,18 +8,21 @@ import java.util.Map; | |||||
/** | /** | ||||
* 处理微信推送消息的处理器接口 | * 处理微信推送消息的处理器接口 | ||||
* @author chanjarster | |||||
* | * | ||||
* @author Daniel Qian | |||||
*/ | */ | ||||
public interface WxMpMessageHandler { | public interface WxMpMessageHandler { | ||||
/** | /** | ||||
* | |||||
* @param wxMessage | * @param wxMessage | ||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param wxMpService | * @param wxMpService | ||||
* @param sessionManager | |||||
* @return xml格式的消息,如果在异步规则里处理的话,可以返回null | * @return xml格式的消息,如果在异步规则里处理的话,可以返回null | ||||
*/ | */ | ||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService); | |||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, | |||||
Map<String, Object> context, | |||||
WxMpService wxMpService, | |||||
WxSessionManager sessionManager); | |||||
} | } |
@@ -1,21 +1,29 @@ | |||||
package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | ||||
import java.util.Map; | import java.util.Map; | ||||
/** | /** | ||||
* 微信消息拦截器,可以用来做验证 | * 微信消息拦截器,可以用来做验证 | ||||
* | |||||
* @author Daniel Qian | |||||
*/ | */ | ||||
public interface WxMpMessageInterceptor { | public interface WxMpMessageInterceptor { | ||||
/** | /** | ||||
* 拦截微信消息 | * 拦截微信消息 | ||||
* | |||||
* @param wxMessage | * @param wxMessage | ||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param context 上下文,如果handler或interceptor之间有信息要传递,可以用这个 | |||||
* @param wxMpService | * @param wxMpService | ||||
* @return true代表OK,false代表不OK | |||||
* @param sessionManager | |||||
* @return true代表OK,false代表不OK | |||||
*/ | */ | ||||
public boolean intercept(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService); | |||||
public boolean intercept(WxMpXmlMessage wxMessage, | |||||
Map<String, Object> context, | |||||
WxMpService wxMpService, | |||||
WxSessionManager sessionManager); | |||||
} | } |
@@ -1,7 +1,7 @@ | |||||
package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
import me.chanjar.weixin.common.session.InternalSession; | import me.chanjar.weixin.common.session.InternalSession; | ||||
import me.chanjar.weixin.common.session.SessionManagerImpl; | |||||
import me.chanjar.weixin.common.session.InMemorySessionManager; | |||||
import me.chanjar.weixin.common.session.WxSession; | import me.chanjar.weixin.common.session.WxSession; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | import me.chanjar.weixin.common.session.WxSessionManager; | ||||
import me.chanjar.weixin.common.util.WxMessageDuplicateChecker; | import me.chanjar.weixin.common.util.WxMessageDuplicateChecker; | ||||
@@ -59,15 +59,15 @@ public class WxMpMessageRouter { | |||||
private ExecutorService executorService; | private ExecutorService executorService; | ||||
private WxMessageDuplicateChecker wxMessageDuplicateChecker; | |||||
private WxMessageDuplicateChecker messageDuplicateChecker; | |||||
private WxSessionManager sessionManager; | private WxSessionManager sessionManager; | ||||
public WxMpMessageRouter(WxMpService wxMpService) { | public WxMpMessageRouter(WxMpService wxMpService) { | ||||
this.wxMpService = wxMpService; | this.wxMpService = wxMpService; | ||||
this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); | this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); | ||||
this.wxMessageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); | |||||
this.sessionManager = new SessionManagerImpl(); | |||||
this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); | |||||
this.sessionManager = new InMemorySessionManager(); | |||||
} | } | ||||
/** | /** | ||||
@@ -86,10 +86,10 @@ public class WxMpMessageRouter { | |||||
* 设置自定义的 {@link me.chanjar.weixin.common.util.WxMessageDuplicateChecker} | * 设置自定义的 {@link me.chanjar.weixin.common.util.WxMessageDuplicateChecker} | ||||
* 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker} | * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker} | ||||
* </pre> | * </pre> | ||||
* @param wxMessageDuplicateChecker | |||||
* @param messageDuplicateChecker | |||||
*/ | */ | ||||
public void setWxMessageDuplicateChecker(WxMessageDuplicateChecker wxMessageDuplicateChecker) { | |||||
this.wxMessageDuplicateChecker = wxMessageDuplicateChecker; | |||||
public void setMessageDuplicateChecker(WxMessageDuplicateChecker messageDuplicateChecker) { | |||||
this.messageDuplicateChecker = messageDuplicateChecker; | |||||
} | } | ||||
/** | /** | ||||
@@ -108,7 +108,7 @@ public class WxMpMessageRouter { | |||||
* @return | * @return | ||||
*/ | */ | ||||
public Rule rule() { | public Rule rule() { | ||||
return new Rule(this, wxMpService); | |||||
return new Rule(this, wxMpService, sessionManager); | |||||
} | } | ||||
/** | /** | ||||
@@ -116,7 +116,7 @@ public class WxMpMessageRouter { | |||||
* @param wxMessage | * @param wxMessage | ||||
*/ | */ | ||||
public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) { | public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) { | ||||
if (wxMessageDuplicateChecker.isDuplicate(wxMessage.getMsgId())) { | |||||
if (messageDuplicateChecker.isDuplicate(wxMessage.getMsgId())) { | |||||
// 如果是重复消息,那么就不做处理 | // 如果是重复消息,那么就不做处理 | ||||
return null; | return null; | ||||
} | } | ||||
@@ -195,6 +195,8 @@ public class WxMpMessageRouter { | |||||
private final WxMpService wxMpService; | private final WxMpService wxMpService; | ||||
private final WxSessionManager sessionManager; | |||||
private boolean async = true; | private boolean async = true; | ||||
private String fromUser; | private String fromUser; | ||||
@@ -214,10 +216,11 @@ public class WxMpMessageRouter { | |||||
private List<WxMpMessageHandler> handlers = new ArrayList<WxMpMessageHandler>(); | private List<WxMpMessageHandler> handlers = new ArrayList<WxMpMessageHandler>(); | ||||
private List<WxMpMessageInterceptor> interceptors = new ArrayList<WxMpMessageInterceptor>(); | private List<WxMpMessageInterceptor> interceptors = new ArrayList<WxMpMessageInterceptor>(); | ||||
protected Rule(WxMpMessageRouter routerBuilder, WxMpService wxMpService) { | |||||
protected Rule(WxMpMessageRouter routerBuilder, WxMpService wxMpService, WxSessionManager sessionManager) { | |||||
this.routerBuilder = routerBuilder; | this.routerBuilder = routerBuilder; | ||||
this.wxMpService = wxMpService; | this.wxMpService = wxMpService; | ||||
this.sessionManager = sessionManager; | |||||
} | } | ||||
/** | /** | ||||
@@ -383,7 +386,7 @@ public class WxMpMessageRouter { | |||||
Map<String, Object> context = new HashMap<String, Object>(); | Map<String, Object> context = new HashMap<String, Object>(); | ||||
// 如果拦截器不通过 | // 如果拦截器不通过 | ||||
for (WxMpMessageInterceptor interceptor : this.interceptors) { | for (WxMpMessageInterceptor interceptor : this.interceptors) { | ||||
if (!interceptor.intercept(wxMessage, context, wxMpService)) { | |||||
if (!interceptor.intercept(wxMessage, context, wxMpService, sessionManager)) { | |||||
return null; | return null; | ||||
} | } | ||||
} | } | ||||
@@ -392,7 +395,7 @@ public class WxMpMessageRouter { | |||||
WxMpXmlOutMessage res = null; | WxMpXmlOutMessage res = null; | ||||
for (WxMpMessageHandler handler : this.handlers) { | for (WxMpMessageHandler handler : this.handlers) { | ||||
// 返回最后handler的结果 | // 返回最后handler的结果 | ||||
res = handler.handle(wxMessage, context, wxMpService); | |||||
res = handler.handle(wxMessage, context, wxMpService, sessionManager); | |||||
} | } | ||||
return res; | return res; | ||||
} | } | ||||
@@ -10,8 +10,7 @@ import me.chanjar.weixin.common.bean.WxMenu; | |||||
import me.chanjar.weixin.common.bean.result.WxError; | import me.chanjar.weixin.common.bean.result.WxError; | ||||
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | ||||
import me.chanjar.weixin.common.exception.WxErrorException; | import me.chanjar.weixin.common.exception.WxErrorException; | ||||
import me.chanjar.weixin.common.session.SessionManagerImpl; | |||||
import me.chanjar.weixin.common.session.WxSession; | |||||
import me.chanjar.weixin.common.session.InMemorySessionManager; | |||||
import me.chanjar.weixin.common.session.WxSessionManager; | import me.chanjar.weixin.common.session.WxSessionManager; | ||||
import me.chanjar.weixin.common.util.StringUtils; | import me.chanjar.weixin.common.util.StringUtils; | ||||
import me.chanjar.weixin.common.util.crypto.SHA1; | import me.chanjar.weixin.common.util.crypto.SHA1; | ||||
@@ -69,7 +68,7 @@ public class WxMpServiceImpl implements WxMpService { | |||||
private int maxRetryTimes = 5; | private int maxRetryTimes = 5; | ||||
protected WxSessionManager sessionManager = new SessionManagerImpl(); | |||||
protected WxSessionManager sessionManager = new InMemorySessionManager(); | |||||
public boolean checkSignature(String timestamp, String nonce, String signature) { | public boolean checkSignature(String timestamp, String nonce, String signature) { | ||||
try { | try { | ||||
@@ -1,6 +1,7 @@ | |||||
package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
import me.chanjar.weixin.common.api.WxConsts; | import me.chanjar.weixin.common.api.WxConsts; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | ||||
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; | ||||
import org.testng.Assert; | import org.testng.Assert; | ||||
@@ -67,7 +68,8 @@ public class WxMpMessageRouterTest { | |||||
final WxMpMessageRouter router = new WxMpMessageRouter(null); | final WxMpMessageRouter router = new WxMpMessageRouter(null); | ||||
router.rule().handler(new WxMpMessageHandler() { | router.rule().handler(new WxMpMessageHandler() { | ||||
@Override | @Override | ||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService) { | |||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, | |||||
WxSessionManager sessionManager) { | |||||
return null; | return null; | ||||
} | } | ||||
}).end(); | }).end(); | ||||
@@ -149,7 +151,8 @@ public class WxMpMessageRouterTest { | |||||
} | } | ||||
@Override | @Override | ||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService) { | |||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, | |||||
WxSessionManager sessionManager) { | |||||
sb.append(this.echoStr).append(','); | sb.append(this.echoStr).append(','); | ||||
return null; | return null; | ||||
} | } | ||||
@@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.demo; | |||||
import me.chanjar.weixin.common.api.WxConsts; | import me.chanjar.weixin.common.api.WxConsts; | ||||
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | ||||
import me.chanjar.weixin.common.exception.WxErrorException; | import me.chanjar.weixin.common.exception.WxErrorException; | ||||
import me.chanjar.weixin.common.session.WxSessionManager; | |||||
import me.chanjar.weixin.mp.api.*; | import me.chanjar.weixin.mp.api.*; | ||||
import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlMessage; | ||||
import me.chanjar.weixin.mp.bean.WxMpXmlOutImageMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlOutImageMessage; | ||||
@@ -51,7 +52,7 @@ public class WxMpDemoServer { | |||||
WxMpMessageHandler textHandler = new WxMpMessageHandler() { | WxMpMessageHandler textHandler = new WxMpMessageHandler() { | ||||
@Override | @Override | ||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | ||||
WxMpService wxMpService) { | |||||
WxMpService wxMpService, WxSessionManager sessionManager) { | |||||
WxMpXmlOutTextMessage m | WxMpXmlOutTextMessage m | ||||
= WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName()) | = WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName()) | ||||
.toUser(wxMessage.getFromUserName()).build(); | .toUser(wxMessage.getFromUserName()).build(); | ||||
@@ -62,7 +63,7 @@ public class WxMpDemoServer { | |||||
WxMpMessageHandler imageHandler = new WxMpMessageHandler() { | WxMpMessageHandler imageHandler = new WxMpMessageHandler() { | ||||
@Override | @Override | ||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | ||||
WxMpService wxMpService) { | |||||
WxMpService wxMpService, WxSessionManager sessionManager) { | |||||
try { | try { | ||||
WxMediaUploadResult wxMediaUploadResult = wxMpService | WxMediaUploadResult wxMediaUploadResult = wxMpService | ||||
.mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, ClassLoader.getSystemResourceAsStream("mm.jpeg")); | .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, ClassLoader.getSystemResourceAsStream("mm.jpeg")); | ||||
@@ -86,7 +87,7 @@ public class WxMpDemoServer { | |||||
WxMpMessageHandler oauth2handler = new WxMpMessageHandler() { | WxMpMessageHandler oauth2handler = new WxMpMessageHandler() { | ||||
@Override | @Override | ||||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | ||||
WxMpService wxMpService) { | |||||
WxMpService wxMpService, WxSessionManager sessionManager) { | |||||
String href = "<a href=\"" + wxMpService.oauth2buildAuthorizationUrl(WxConsts.OAUTH2_SCOPE_USER_INFO, null) | String href = "<a href=\"" + wxMpService.oauth2buildAuthorizationUrl(WxConsts.OAUTH2_SCOPE_USER_INFO, null) | ||||
+ "\">测试oauth2</a>"; | + "\">测试oauth2</a>"; | ||||
return WxMpXmlOutMessage | return WxMpXmlOutMessage | ||||