From 11b2f2b374c716c01c074cc242250e8f23da09a9 Mon Sep 17 00:00:00 2001 From: chengn Date: Fri, 9 Jan 2015 10:00:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4accessToken=E4=B8=AD?= =?UTF-8?q?=E6=8E=A7=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?accessToken=E4=BB=A3=E7=90=86=EF=BC=8C=E8=8E=B7=E5=8F=96accessT?= =?UTF-8?q?oken=E9=83=BD=E9=80=9A=E8=BF=87accessTokenProxy=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=EF=BC=8C=E5=B1=8F=E8=94=BDaccessToken=E7=9A=84?= =?UTF-8?q?=E4=B8=AD=E6=8E=A7=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/org/sword/wechat4j/token/AccessToken.java | 2 +- .../wechat4j/token/AccessTokenListener.java | 20 ++++++---- .../wechat4j/token/AccessTokenProxy.java | 31 ++++++++++++++++ .../wechat4j/token/AccessTokenServer.java | 37 ++++++++++++++++--- .../wechat4j/token/AccessTokenTimer.java | 16 ++++---- .../wechat4j/token/DbAccessTokenServer.java | 2 +- .../wechat4j/token/IAccessTokenServer.java | 19 ++++++++++ .../wechat4j/token/MemAccessTokenServer.java | 2 +- 8 files changed, 105 insertions(+), 24 deletions(-) create mode 100644 src/org/sword/wechat4j/token/AccessTokenProxy.java create mode 100644 src/org/sword/wechat4j/token/IAccessTokenServer.java diff --git a/src/org/sword/wechat4j/token/AccessToken.java b/src/org/sword/wechat4j/token/AccessToken.java index 87982fe..ffbc87f 100644 --- a/src/org/sword/wechat4j/token/AccessToken.java +++ b/src/org/sword/wechat4j/token/AccessToken.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject; /** - * Access token处理 + * Access token实体模型 * @author ChengNing * @date 2014年12月12日 */ diff --git a/src/org/sword/wechat4j/token/AccessTokenListener.java b/src/org/sword/wechat4j/token/AccessTokenListener.java index be8d406..740e32d 100644 --- a/src/org/sword/wechat4j/token/AccessTokenListener.java +++ b/src/org/sword/wechat4j/token/AccessTokenListener.java @@ -17,20 +17,17 @@ * @date 2015年1月8日 */ public class AccessTokenListener implements ServletContextListener{ - - private static Logger log = Logger.getLogger(AccessTokenListener.class); + private static Logger log = Logger.getLogger(AccessTokenListener.class); + private Timer timer = null; - //accessToken有效期7200秒,提前200秒请求新的token - private static final long accessTokenExpire = 7000; @Override public void contextInitialized(ServletContextEvent arg0) { log.info("accessToken监听器启动.........."); timer = new Timer(true); - AccessTokenTimer accessTokenTimer = new AccessTokenTimer(); - timer.schedule(accessTokenTimer, accessTokenExpire * 1000); - log.info("accessToken定时器注册成功，执行间隔为" + accessTokenExpire); + //注册定时任务 + registeAccessTokenTimer(); } @Override @@ -38,4 +35,13 @@ public void contextDestroyed(ServletContextEvent arg0) { timer.cancel(); } + /** + * 注册accessToken定时器 + */ + private void registeAccessTokenTimer(){ + AccessTokenTimer accessTokenTimer = new AccessTokenTimer(); + timer.schedule(accessTokenTimer, AccessTokenTimer.DELAY,AccessTokenTimer.PERIOD); + log.info("accessToken定时器注册成功，执行间隔为" + AccessTokenTimer.PERIOD); + } + } diff --git a/src/org/sword/wechat4j/token/AccessTokenProxy.java b/src/org/sword/wechat4j/token/AccessTokenProxy.java new file mode 100644 index 0000000..3621cf3 --- /dev/null +++ b/src/org/sword/wechat4j/token/AccessTokenProxy.java @@ -0,0 +1,31 @@ +/** + * + */ +package org.sword.wechat4j.token; + + +/** + * AccessToken代理 + * 所有获取accessToken的地方都通过此代理获得 + * 获得方法String token = AccessTokenProxy.token() + * @author ChengNing + * @date 2015年1月9日 + */ +public class AccessTokenProxy { + + /** + * 通过代理得到accessToken的串 + * @return + */ + public static String token(){ + AccessTokenServer accessTokenServer = new AccessTokenServer(); + if(accessTokenServer.isCustomer()) + return accessTokenServer.customerServer().getAccessToken(); + + return accessTokenServer.defaultServer().getAccessToken(); + } + + + + +} diff --git a/src/org/sword/wechat4j/token/AccessTokenServer.java b/src/org/sword/wechat4j/token/AccessTokenServer.java index 4b37f75..e2c1c66 100644 --- a/src/org/sword/wechat4j/token/AccessTokenServer.java +++ b/src/org/sword/wechat4j/token/AccessTokenServer.java @@ -3,17 +3,44 @@ */ package org.sword.wechat4j.token; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.sword.wechat4j.common.Config; /** - * + * accessToken中控服务器 * @author ChengNing - * @date 2015年1月7日 + * @date 2015年1月9日 */ -public interface AccessTokenServer { +public class AccessTokenServer { + + private static Logger logger = Logger.getLogger(AccessTokenServer.class); + + public IAccessTokenServer defaultServer(){ + return MemAccessTokenServer.instance(); + } + + public IAccessTokenServer customerServer(){ + String className = Config.instance().getAccessTokenServer(); + IAccessTokenServer customerServer = null; + try { + Class clazz = Class.forName(className); + customerServer = (IAccessTokenServer)clazz.newInstance(); + } catch (Exception e) { + logger.error("系统找不到" + className); + logger.error("自定义accesstoken server实例化失败，" + e.getMessage()); + e.printStackTrace(); + } + return customerServer; + } /** - * + * 如果配置文件中配置了AccessTokenServer，那么使用客户自定义server * @return */ - public String getAccessToken(); + public boolean isCustomer(){ + if(StringUtils.isBlank(Config.instance().getAccessTokenServer())) + return false; + return true; + } } diff --git a/src/org/sword/wechat4j/token/AccessTokenTimer.java b/src/org/sword/wechat4j/token/AccessTokenTimer.java index cbedb42..2bedbdb 100644 --- a/src/org/sword/wechat4j/token/AccessTokenTimer.java +++ b/src/org/sword/wechat4j/token/AccessTokenTimer.java @@ -16,6 +16,10 @@ public class AccessTokenTimer extends TimerTask{ private static Logger logger = Logger.getLogger(AccessTokenTimer.class); + + //accessToken有效期7200秒,提前200秒请求新的token + public static final long PERIOD = 7000 * 1000; + public static final long DELAY = 0; //此任务的延迟时间为0，即立即执行 @Override public void run() { @@ -24,15 +28,9 @@ public void run() { AccessToken accessToken = new AccessToken(); //获取成功之后持久化accessToken if(accessToken.request()){ - String className = Config.instance().getToken(); - try { - Class clazz = Class.forName(className); - DbAccessTokenServer accessTokenServer = (DbAccessTokenServer)clazz.newInstance(); - accessTokenServer.save(); - } catch (Exception e) { - logger.error("accessToken初始化失败，" + e.getMessage()); - e.printStackTrace(); - } + AccessTokenServer accessTokenServer = new AccessTokenServer(); + DbAccessTokenServer customerServer = (DbAccessTokenServer)accessTokenServer.customerServer(); + customerServer.save(); } } diff --git a/src/org/sword/wechat4j/token/DbAccessTokenServer.java b/src/org/sword/wechat4j/token/DbAccessTokenServer.java index 345ccb3..9472787 100644 --- a/src/org/sword/wechat4j/token/DbAccessTokenServer.java +++ b/src/org/sword/wechat4j/token/DbAccessTokenServer.java @@ -9,7 +9,7 @@ * @author ChengNing * @date 2015年1月8日 */ -public abstract class DbAccessTokenServer implements AccessTokenServer{ +public abstract class DbAccessTokenServer implements IAccessTokenServer{ @Override public String getAccessToken() { diff --git a/src/org/sword/wechat4j/token/IAccessTokenServer.java b/src/org/sword/wechat4j/token/IAccessTokenServer.java new file mode 100644 index 0000000..63dc142 --- /dev/null +++ b/src/org/sword/wechat4j/token/IAccessTokenServer.java @@ -0,0 +1,19 @@ +/** + * + */ +package org.sword.wechat4j.token; + + +/** + * + * @author ChengNing + * @date 2015年1月7日 + */ +public interface IAccessTokenServer { + + /** + * + * @return + */ + public String getAccessToken(); +} diff --git a/src/org/sword/wechat4j/token/MemAccessTokenServer.java b/src/org/sword/wechat4j/token/MemAccessTokenServer.java index 3879a48..44b0271 100644 --- a/src/org/sword/wechat4j/token/MemAccessTokenServer.java +++ b/src/org/sword/wechat4j/token/MemAccessTokenServer.java @@ -14,7 +14,7 @@ * @author ChengNing * @date 2015年1月8日 */ -public class MemAccessTokenServer implements AccessTokenServer{ +public class MemAccessTokenServer implements IAccessTokenServer{ private static MemAccessTokenServer tokenServer = new MemAccessTokenServer(); From 981aca45fb4cc34a46672b7830c0a6191e0067de Mon Sep 17 00:00:00 2001 From: chengn Date: Fri, 9 Jan 2015 10:07:28 +0800 Subject: [PATCH 2/2] add LICENSE --- META-INF/LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 META-INF/LICENSE diff --git a/META-INF/LICENSE b/META-INF/LICENSE new file mode 100644 index 0000000..e06d208 --- /dev/null +++ b/META-INF/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +