diff --git a/dsRes/src/main/java/com/dsideal/Res/ResApplication.java b/dsRes/src/main/java/com/dsideal/Res/ResApplication.java index 62ba208f..fc6cec05 100644 --- a/dsRes/src/main/java/com/dsideal/Res/ResApplication.java +++ b/dsRes/src/main/java/com/dsideal/Res/ResApplication.java @@ -1,12 +1,12 @@ package com.dsideal.Res; +import cn.hutool.core.io.FileUtil; import com.dsideal.Config.PropKit; import com.dsideal.Res.Base.Controller.BaseController; import com.dsideal.Res.Index.IndexController; import com.dsideal.Res.Interceptor.*; import com.dsideal.Res.Model._MappingKit; import com.dsideal.Res.Res.Controller.ResourceController; -import com.dsideal.Res.Util.FileUtil; import com.dsideal.Res.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; @@ -127,8 +127,6 @@ public class ResApplication extends JFinalConfig { @Override public void onStart() { //打印 启动Logo - String path = ResApplication.class.getClassLoader().getResource("logo.txt").getPath(); - File file = new File(path); - System.out.println(FileUtil.txt2String(file)); + System.out.println(FileUtil.readUtf8String("logo.txt")); } } diff --git a/dsSso/WebRoot/WEB-INF/web.xml b/dsSso/WebRoot/WEB-INF/web.xml index 3ee6c859..97bafe28 100644 --- a/dsSso/WebRoot/WEB-INF/web.xml +++ b/dsSso/WebRoot/WEB-INF/web.xml @@ -5,7 +5,7 @@ com.jfinal.core.JFinalFilter configClass - com.dsideal.SsoApplication + com.dsideal.Sso.SsoApplication diff --git a/dsSso/src/main/java/com/dsideal/SsoApplication.java b/dsSso/src/main/java/com/dsideal/Sso/SsoApplication.java similarity index 99% rename from dsSso/src/main/java/com/dsideal/SsoApplication.java rename to dsSso/src/main/java/com/dsideal/Sso/SsoApplication.java index ae7b7d6b..9768c299 100644 --- a/dsSso/src/main/java/com/dsideal/SsoApplication.java +++ b/dsSso/src/main/java/com/dsideal/Sso/SsoApplication.java @@ -1,4 +1,4 @@ -package com.dsideal; +package com.dsideal.Sso; import com.dsideal.Sso.Plugin.LogBackLogFactory; import cn.hutool.core.io.FileUtil; diff --git a/dsSso/src/main/java/com/dsideal/Sso/Util/LoginLogUtil.java b/dsSso/src/main/java/com/dsideal/Sso/Util/LoginLogUtil.java index 2485b0d0..dbf0dcd8 100644 --- a/dsSso/src/main/java/com/dsideal/Sso/Util/LoginLogUtil.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Util/LoginLogUtil.java @@ -1,6 +1,5 @@ package com.dsideal.Sso.Util; -import com.dsideal.SsoApplication; import com.jfinal.kit.PropKit; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; diff --git a/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java b/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java index c873653d..8464e72f 100644 --- a/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Util/SsoLoginHelper.java @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.dsideal.Config.PropKit; -import com.dsideal.SsoApplication; public class SsoLoginHelper {