From 83c68f7fede780ad8a4741ebcc9474338dc0d08b Mon Sep 17 00:00:00 2001
From: Sola <loli@sola.love>
Date: Sun, 27 Mar 2016 16:23:48 +0800
Subject: [PATCH] refactors

---
 src/main/java/love/sola/netsupport/auth/OAuth2.java       | 8 ++++----
 .../java/love/sola/netsupport/auth/OAuth2Handler.java     | 2 +-
 .../sola/netsupport/wechat/handler/ProfileHandler.java    | 2 +-
 .../netsupport/wechat/handler/admin/LoginHandler.java     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2.java b/src/main/java/love/sola/netsupport/auth/OAuth2.java
index 7008a1d..d0b39c0 100644
--- a/src/main/java/love/sola/netsupport/auth/OAuth2.java
+++ b/src/main/java/love/sola/netsupport/auth/OAuth2.java
@@ -39,7 +39,7 @@ public class OAuth2 extends HttpServlet {
 
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		AsyncContext acxt = req.startAsync();
+		AsyncContext actx = req.startAsync();
 		String code = req.getParameter("code");
 		String state = req.getParameter("state");
 		if (Checker.hasNull(code, state)) {
@@ -51,14 +51,14 @@ public class OAuth2 extends HttpServlet {
 			resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED);
 			return;
 		}
-		acxt.start(() -> {
+		actx.start(() -> {
 			try {
 				WxMpService wxMpService = WxMpServlet.instance.wxMpService;
 				WxMpOAuth2AccessToken token = wxMpService.oauth2getAccessToken(code);
 				String wechat = token.getOpenId();
 				WxSession session = WechatSession.create();
-				handler.onOAuth2(acxt, (HttpServletResponse) acxt.getResponse(), wechat, session);
-				acxt.complete();
+				handler.onOAuth2(actx, (HttpServletResponse) actx.getResponse(), wechat, session);
+				actx.complete();
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java b/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java
index 6103d74..fb08a24 100644
--- a/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java
+++ b/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java
@@ -13,6 +13,6 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface OAuth2Handler {
 
-	void onOAuth2(AsyncContext acxt, HttpServletResponse resp, String user, WxSession session);
+	void onOAuth2(AsyncContext actx, HttpServletResponse resp, String user, WxSession session);
 
 }
diff --git a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
index 2737cf8..a2d1dac 100644
--- a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
+++ b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java
@@ -44,7 +44,7 @@ public class ProfileHandler implements WxMpMessageHandler, OAuth2Handler {
 	}
 
 	@Override
-	public void onOAuth2(AsyncContext acxt, HttpServletResponse resp, String user, WxSession session) {
+	public void onOAuth2(AsyncContext actx, HttpServletResponse resp, String user, WxSession session) {
 		try {
 			User u = TableUser.getByWechat(user);
 			if (u == null) {
diff --git a/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java
index c15e481..7ee38ab 100644
--- a/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java
+++ b/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java
@@ -57,7 +57,7 @@ public class LoginHandler implements WxMpMessageHandler, OAuth2Handler {
 
 
 	@Override
-	public void onOAuth2(AsyncContext acxt, HttpServletResponse resp, String user, WxSession session) {
+	public void onOAuth2(AsyncContext actx, HttpServletResponse resp, String user, WxSession session) {
 		try {
 			Operator operator = TableOperator.get(user);
 			if (operator == null) {