diff --git a/src/main/java/com/dsideal/Start.java b/src/main/java/com/dsideal/Start.java index 7118c7c..e324d1d 100644 --- a/src/main/java/com/dsideal/Start.java +++ b/src/main/java/com/dsideal/Start.java @@ -9,9 +9,9 @@ import com.jfinal.plugin.hikaricp.HikariCpPlugin; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; -import com.dsideal.sso.server.Controller.CommomController; -import com.dsideal.sso.server.Controller.WebLoginController; -import com.dsideal.sso.server.Util.CommonUtil; +import com.dsideal.sso.Controller.CommomController; +import com.dsideal.sso.Controller.WebLoginController; +import com.dsideal.sso.Util.CommonUtil; import java.io.File; diff --git a/src/main/java/com/dsideal/sso/server/Controller/CommomController.java b/src/main/java/com/dsideal/sso/Controller/CommomController.java similarity index 87% rename from src/main/java/com/dsideal/sso/server/Controller/CommomController.java rename to src/main/java/com/dsideal/sso/Controller/CommomController.java index fb0406b..85cd25a 100644 --- a/src/main/java/com/dsideal/sso/server/Controller/CommomController.java +++ b/src/main/java/com/dsideal/sso/Controller/CommomController.java @@ -1,9 +1,9 @@ -package com.dsideal.sso.server.Controller; +package com.dsideal.sso.Controller; import org.apache.commons.lang3.StringUtils; import com.alibaba.fastjson.JSONObject; -import com.dsideal.sso.server.Model.LoginModel; +import com.dsideal.sso.Model.LoginModel; import com.jfinal.core.Controller; public class CommomController extends Controller { diff --git a/src/main/java/com/dsideal/sso/server/Controller/WebLoginController.java b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java similarity index 93% rename from src/main/java/com/dsideal/sso/server/Controller/WebLoginController.java rename to src/main/java/com/dsideal/sso/Controller/WebLoginController.java index 7c51c17..fe4439b 100644 --- a/src/main/java/com/dsideal/sso/server/Controller/WebLoginController.java +++ b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Controller; +package com.dsideal.sso.Controller; import java.awt.image.BufferedImage; import java.util.Map; @@ -8,6 +8,10 @@ import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import com.dsideal.sso.Util.AesUtil; +import com.dsideal.sso.Util.CaptchaUtil; +import com.dsideal.sso.Util.CommonUtil; +import com.dsideal.sso.Util.SsoLoginHelper; import com.dsideal.sso.server.Util.*; import com.jfinal.aop.Before; import com.jfinal.ext.interceptor.GET; diff --git a/src/main/java/com/dsideal/sso/server/Model/LoginModel.java b/src/main/java/com/dsideal/sso/Model/LoginModel.java similarity index 94% rename from src/main/java/com/dsideal/sso/server/Model/LoginModel.java rename to src/main/java/com/dsideal/sso/Model/LoginModel.java index c9b249a..6a4b209 100644 --- a/src/main/java/com/dsideal/sso/server/Model/LoginModel.java +++ b/src/main/java/com/dsideal/sso/Model/LoginModel.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Model; +package com.dsideal.sso.Model; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/dsideal/sso/server/Util/AesUtil.java b/src/main/java/com/dsideal/sso/Util/AesUtil.java similarity index 95% rename from src/main/java/com/dsideal/sso/server/Util/AesUtil.java rename to src/main/java/com/dsideal/sso/Util/AesUtil.java index e6a1a5d..ed49b25 100644 --- a/src/main/java/com/dsideal/sso/server/Util/AesUtil.java +++ b/src/main/java/com/dsideal/sso/Util/AesUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import java.math.BigInteger; diff --git a/src/main/java/com/dsideal/sso/server/Util/CaptchaUtil.java b/src/main/java/com/dsideal/sso/Util/CaptchaUtil.java similarity index 95% rename from src/main/java/com/dsideal/sso/server/Util/CaptchaUtil.java rename to src/main/java/com/dsideal/sso/Util/CaptchaUtil.java index de456e1..8ba2c17 100644 --- a/src/main/java/com/dsideal/sso/server/Util/CaptchaUtil.java +++ b/src/main/java/com/dsideal/sso/Util/CaptchaUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import java.awt.Color; import java.awt.Font; diff --git a/src/main/java/com/dsideal/sso/server/Util/CommonUtil.java b/src/main/java/com/dsideal/sso/Util/CommonUtil.java similarity index 95% rename from src/main/java/com/dsideal/sso/server/Util/CommonUtil.java rename to src/main/java/com/dsideal/sso/Util/CommonUtil.java index 9d12f25..926cec0 100644 --- a/src/main/java/com/dsideal/sso/server/Util/CommonUtil.java +++ b/src/main/java/com/dsideal/sso/Util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import java.io.BufferedReader; import java.io.File; @@ -8,7 +8,7 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.dsideal.sso.server.Model.LoginModel; +import com.dsideal.sso.Model.LoginModel; import com.jfinal.kit.PropKit; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/com/dsideal/sso/server/Util/CookieUtil.java b/src/main/java/com/dsideal/sso/Util/CookieUtil.java similarity index 94% rename from src/main/java/com/dsideal/sso/server/Util/CookieUtil.java rename to src/main/java/com/dsideal/sso/Util/CookieUtil.java index a186564..86d8ba2 100644 --- a/src/main/java/com/dsideal/sso/server/Util/CookieUtil.java +++ b/src/main/java/com/dsideal/sso/Util/CookieUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/dsideal/sso/server/Util/IpUtil.java b/src/main/java/com/dsideal/sso/Util/IpUtil.java similarity index 96% rename from src/main/java/com/dsideal/sso/server/Util/IpUtil.java rename to src/main/java/com/dsideal/sso/Util/IpUtil.java index c7067bc..e809cde 100644 --- a/src/main/java/com/dsideal/sso/server/Util/IpUtil.java +++ b/src/main/java/com/dsideal/sso/Util/IpUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; diff --git a/src/main/java/com/dsideal/sso/server/Util/LdapPassWordEncoder.java b/src/main/java/com/dsideal/sso/Util/LdapPassWordEncoder.java similarity index 94% rename from src/main/java/com/dsideal/sso/server/Util/LdapPassWordEncoder.java rename to src/main/java/com/dsideal/sso/Util/LdapPassWordEncoder.java index c889e97..10df3c0 100644 --- a/src/main/java/com/dsideal/sso/server/Util/LdapPassWordEncoder.java +++ b/src/main/java/com/dsideal/sso/Util/LdapPassWordEncoder.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/com/dsideal/sso/server/Util/SsoLoginHelper.java b/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java similarity index 94% rename from src/main/java/com/dsideal/sso/server/Util/SsoLoginHelper.java rename to src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java index d276321..4409e8b 100644 --- a/src/main/java/com/dsideal/sso/server/Util/SsoLoginHelper.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import java.util.Map; diff --git a/src/main/java/com/dsideal/sso/server/Util/SsoLoginStore.java b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java similarity index 93% rename from src/main/java/com/dsideal/sso/server/Util/SsoLoginStore.java rename to src/main/java/com/dsideal/sso/Util/SsoLoginStore.java index 1b6e49c..d619285 100644 --- a/src/main/java/com/dsideal/sso/server/Util/SsoLoginStore.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java @@ -1,4 +1,4 @@ -package com.dsideal.sso.server.Util; +package com.dsideal.sso.Util; import com.jfinal.kit.PropKit; import com.jfinal.plugin.redis.Redis;