'commit'

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.Controller.CommomController;
-import com.dsideal.sso.server.Controller.WebLoginController;
+import com.dsideal.sso.Controller.WebLoginController;
-import com.dsideal.sso.server.Util.CommonUtil;
+import com.dsideal.sso.Util.CommonUtil;
 
 import java.io.File;
 

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 {

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;
 

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;