diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..038c2a6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.iml +.idea/ +.DS_Store +.classpath +target/ +lib/report/*.jar \ No newline at end of file diff --git a/lib/finekit-10.0.jar b/lib/finekit-10.0.jar new file mode 100644 index 0000000..68547fc Binary files /dev/null and b/lib/finekit-10.0.jar differ diff --git a/pom.xml b/pom.xml index c8efec5..ab6f044 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,60 @@ + 4.0.0 + - starter com.fr.plugin + starter 10.0 - 4.0.0 - + jar plugin-decision-url-login - - + + + com.fanruan.api + finekit + 10.0 + system + ${project.basedir}/lib/finekit-10.0.jar + + + + + ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.decision.url.login-1.0/classes + + + org.apache.maven.plugins + maven-compiler-plugin + + 6 + 6 + + + + + + + fanruan + fanruan + http://mvn.finedevelop.com/repository/maven-public/ + + true + always + warn + + + + + + fanruan + fanruan + http://mvn.finedevelop.com/repository/maven-public/ + + true + always + warn + + + \ No newline at end of file diff --git a/src/main/java/com/fr/plugin/decision/url/login/LoginUrlAliasProvider.java b/src/main/java/com/fr/plugin/decision/url/login/LoginUrlAliasProvider.java index 59312ff..3e22eaa 100644 --- a/src/main/java/com/fr/plugin/decision/url/login/LoginUrlAliasProvider.java +++ b/src/main/java/com/fr/plugin/decision/url/login/LoginUrlAliasProvider.java @@ -1,8 +1,8 @@ package com.fr.plugin.decision.url.login; +import com.fanruan.api.net.URLAliasKit; import com.fr.decision.fun.impl.AbstractURLAliasProvider; import com.fr.decision.webservice.url.alias.URLAlias; -import com.fr.decision.webservice.url.alias.URLAliasFactory; /** * @Author: Elijah @@ -14,7 +14,7 @@ public class LoginUrlAliasProvider extends AbstractURLAliasProvider { @Override public URLAlias[] registerAlias() { return new URLAlias[]{ - URLAliasFactory.createPluginAlias("/login", "/login", true) + URLAliasKit.createPluginAlias("/login", "/login", true) }; } } \ No newline at end of file diff --git a/src/main/java/com/fr/plugin/decision/url/login/web/LoginAction.java b/src/main/java/com/fr/plugin/decision/url/login/web/LoginAction.java index fb496b0..a8819d6 100644 --- a/src/main/java/com/fr/plugin/decision/url/login/web/LoginAction.java +++ b/src/main/java/com/fr/plugin/decision/url/login/web/LoginAction.java @@ -1,18 +1,17 @@ package com.fr.plugin.decision.url.login.web; -import com.fr.base.TemplateUtils; +import com.fanruan.api.decision.CommonKit; +import com.fanruan.api.decision.login.LoginKit; +import com.fanruan.api.decision.login.OpenLoginRequest; +import com.fanruan.api.decision.login.OpenLoginResponse; +import com.fanruan.api.decision.macro.Constants; +import com.fanruan.api.log.LogKit; +import com.fanruan.api.net.NetworkKit; +import com.fanruan.api.util.RenderKit; +import com.fanruan.api.util.StringKit; import com.fr.decision.fun.impl.BaseHttpHandler; -import com.fr.decision.webservice.bean.authentication.LoginRequestInfoBean; -import com.fr.decision.webservice.bean.authentication.LoginResponseInfoBean; -import com.fr.decision.webservice.utils.DecisionServiceConstants; -import com.fr.decision.webservice.utils.WebServiceUtils; -import com.fr.decision.webservice.v10.login.LoginService; -import com.fr.general.web.ParameterConstants; -import com.fr.log.FineLoggerFactory; import com.fr.plugin.transform.FunctionRecorder; -import com.fr.stable.StringUtils; import com.fr.third.springframework.web.bind.annotation.RequestMethod; -import com.fr.web.utils.WebUtils; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -46,35 +45,35 @@ public class LoginAction extends BaseHttpHandler { @Override public void handle(HttpServletRequest request, HttpServletResponse response) throws Exception { - String username = WebUtils.getHTTPRequestParameter(request, ParameterConstants.FINE_USERNAME); - String password = WebUtils.getHTTPRequestParameter(request, ParameterConstants.FINE_PASSWORD); - int validity = WebUtils.getHTTPRequestIntParameter(request, "validity"); - String origin = WebUtils.getHTTPRequestParameter(request, "origin"); - LoginRequestInfoBean requestInfoBean = new LoginRequestInfoBean(); + String username = NetworkKit.getHTTPRequestParameter(request, Constants.FINE_USERNAME); + String password = NetworkKit.getHTTPRequestParameter(request, Constants.FINE_PASSWORD); + int validity = NetworkKit.getHTTPRequestIntParameter(request, "validity"); + String origin = NetworkKit.getHTTPRequestParameter(request, "origin"); + OpenLoginRequest requestInfoBean = OpenLoginRequest.create(); requestInfoBean.setUsername(username); requestInfoBean.setOrigin(origin); requestInfoBean.setPassword(password); requestInfoBean.setValidity(validity); requestInfoBean.setSliderToken(""); - LoginResponseInfoBean responseInfoBean = LoginService.getInstance().login(request, response, requestInfoBean); - origin = StringUtils.isEmpty(origin) ? TemplateUtils.render(DecisionServiceConstants.MAIN_PAGE_URL) : WebServiceUtils.getBase64DecodeStr(origin); + OpenLoginResponse responseInfoBean = LoginKit.login(request, response, requestInfoBean); + origin = StringKit.isEmpty(origin) ? RenderKit.render(Constants.MAIN_PAGE_URL) : CommonKit.getBase64DecodeStr(origin); writeToken2Cookie(response, responseInfoBean.getAccessToken(), responseInfoBean.getValidity()); response.sendRedirect(origin); } private void writeToken2Cookie(HttpServletResponse response, String token, int validity) { try { - if (StringUtils.isNotEmpty(token)) { - Cookie cookie = new Cookie(DecisionServiceConstants.FINE_AUTH_TOKEN_NAME, token); - long cookieLife = validity == REMEMBER_PASSWORD ? DecisionServiceConstants.REMEMBER_PASSWORD_LIFE : validity; + if (StringKit.isNotEmpty(token)) { + Cookie cookie = new Cookie(Constants.FINE_AUTH_TOKEN_NAME, token); + long cookieLife = validity == REMEMBER_PASSWORD ? Constants.REMEMBER_PASSWORD_LIFE : validity; cookie.setMaxAge((int) cookieLife); cookie.setPath("/"); response.addCookie(cookie); } else { - FineLoggerFactory.getLogger().error("empty token cannot save."); + LogKit.error("empty token cannot save."); } } catch (Exception e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); + LogKit.error(e.getMessage(), e); } } } \ No newline at end of file