diff --git a/ds-gw/src/main/java/com/dsideal/gw/Controller/IndexController.java b/ds-gw/src/main/java/com/dsideal/gw/Controller/IndexController.java deleted file mode 100644 index 16442d40..00000000 --- a/ds-gw/src/main/java/com/dsideal/gw/Controller/IndexController.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dsideal.gw.Controller; - -import com.jfinal.core.Controller; - -public class IndexController extends Controller { - - public void index() { - renderText("Welcome to ds-gw world! "+getRequest().getRequestURL()); - } -} diff --git a/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java b/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java index 37be3fd7..550e6270 100644 --- a/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java +++ b/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java @@ -2,13 +2,12 @@ package com.dsideal.gw; import cn.hutool.core.io.FileUtil; -import com.dsideal.gw.Controller.IndexController; +import com.dsideal.gw.Handler.RouterHandler; +import com.dsideal.gw.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.PropKit; -import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; - import java.io.File; public class GwApplication extends JFinalConfig { @@ -29,6 +28,8 @@ public class GwApplication extends JFinalConfig { */ @Override public void configConstant(Constants me) { + //使用LogBack + me.setLogFactory(new LogBackLogFactory()); //加载配置文件 String configFile = "application_{?}.properties".replace("{?}", getEnvPrefix()); PropKit.use(configFile); @@ -39,8 +40,6 @@ public class GwApplication extends JFinalConfig { */ @Override public void configRoute(Routes me) { - //默认页面 - me.add("/dsBase", IndexController.class); } @@ -52,10 +51,6 @@ public class GwApplication extends JFinalConfig { @Override public void configPlugin(Plugins me) { - // 用于缓存模块的redis服务 - //RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000); - //启动redis组件 - //me.add(redis); } /** @@ -63,7 +58,6 @@ public class GwApplication extends JFinalConfig { */ @Override public void configInterceptor(Interceptors me) { - } /** @@ -71,6 +65,8 @@ public class GwApplication extends JFinalConfig { */ @Override public void configHandler(Handlers me) { + //加入路由处理器 + me.add(new RouterHandler()); } /** diff --git a/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java new file mode 100644 index 00000000..78a9f7f2 --- /dev/null +++ b/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -0,0 +1,38 @@ +package com.dsideal.gw.Handler; + +import cn.hutool.json.JSONObject; +import com.jfinal.handler.Handler; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + + +public class RouterHandler extends Handler { + + + @Override + public void handle(String target, HttpServletRequest req, + HttpServletResponse res, boolean[] isHandled) { + + //可以正确获取到URL的完整路径 + String servletPath = req.getServletPath(); + + JSONObject jo = new JSONObject(); + jo.put("servletPath", servletPath); + jo.put("success", true); + + res.setHeader("Access-Control-Allow-Origin", "*"); + res.setHeader("Cache-Control", "no-cache"); + res.setCharacterEncoding("UTF-8"); + res.setContentType("application/json"); + try { + res.getWriter().println(jo); + res.getWriter().flush(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + isHandled[0] = true; + } +} diff --git a/ds-gw/src/main/java/com/dsideal/gw/Util/LogBackLog.java b/ds-gw/src/main/java/com/dsideal/gw/Util/LogBackLog.java new file mode 100644 index 00000000..ebffb22a --- /dev/null +++ b/ds-gw/src/main/java/com/dsideal/gw/Util/LogBackLog.java @@ -0,0 +1,101 @@ +package com.dsideal.gw.Util; + +import com.jfinal.log.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LogBackLog extends Log { + + public static Logger log; + + public LogBackLog(Class clazz) { + log = LoggerFactory.getLogger(clazz); + } + + public LogBackLog(String name) { + log = LoggerFactory.getLogger(name); + } + + public static LogBackLog getLog(Class clazz) { + return new LogBackLog(clazz); + } + + public static LogBackLog getLog(String name) { + return new LogBackLog(name); + } + + @Override + public void debug(String message) { + log.debug(message); + } + + @Override + public void debug(String message, Throwable t) { + log.debug(message, t); + } + + @Override + public void info(String message) { + log.info(message); + } + + @Override + public void info(String message, Throwable t) { + log.info(message, t); + } + + @Override + public void warn(String message) { + log.warn(message); + } + + @Override + public void warn(String message, Throwable t) { + log.warn(message, t); + } + + @Override + public void error(String message) { + log.error(message); + } + + @Override + public void error(String message, Throwable t) { + log.error(message, t); + } + + @Override + public void fatal(String message) { + log.error(message); + } + + @Override + public void fatal(String message, Throwable t) { + log.error(message, t); + } + + @Override + public boolean isDebugEnabled() { + return log.isDebugEnabled(); + } + + @Override + public boolean isInfoEnabled() { + return log.isInfoEnabled(); + } + + @Override + public boolean isWarnEnabled() { + return log.isWarnEnabled(); + } + + @Override + public boolean isErrorEnabled() { + return log.isErrorEnabled(); + } + + @Override + public boolean isFatalEnabled() { + return log.isErrorEnabled(); + } +} \ No newline at end of file diff --git a/ds-gw/src/main/java/com/dsideal/gw/Util/LogBackLogFactory.java b/ds-gw/src/main/java/com/dsideal/gw/Util/LogBackLogFactory.java new file mode 100644 index 00000000..8cd848ff --- /dev/null +++ b/ds-gw/src/main/java/com/dsideal/gw/Util/LogBackLogFactory.java @@ -0,0 +1,16 @@ +package com.dsideal.gw.Util; + +import com.jfinal.log.ILogFactory; +import com.jfinal.log.Log; + +public class LogBackLogFactory implements ILogFactory { + @Override + public Log getLog(Class clazz) { + return new LogBackLog(clazz); + } + + @Override + public Log getLog(String name) { + return new LogBackLog(name); + } +} diff --git a/ds-gw/src/main/resources/undertow_dev.properties b/ds-gw/src/main/resources/undertow_dev.properties index 60a9a719..baf90257 100644 --- a/ds-gw/src/main/resources/undertow_dev.properties +++ b/ds-gw/src/main/resources/undertow_dev.properties @@ -1,5 +1,5 @@ # true 值支持热加载 -undertow.devMode=true +undertow.devMode=false undertow.port=8000 undertow.host=0.0.0.0 #undertow.resourcePath =/root/dsGw/WebRoot,classpath:static diff --git a/ds-gw/src/main/resources/undertow_pro.properties b/ds-gw/src/main/resources/undertow_pro.properties index 17535295..0cb373c7 100644 --- a/ds-gw/src/main/resources/undertow_pro.properties +++ b/ds-gw/src/main/resources/undertow_pro.properties @@ -1,5 +1,5 @@ # true 值支持热加载 -undertow.devMode=true +undertow.devMode=false undertow.port=8001 undertow.host=0.0.0.0 undertow.resourcePath =/root/WebRoot,classpath:static diff --git a/ds-gw/target/classes/undertow_dev.properties b/ds-gw/target/classes/undertow_dev.properties index 60a9a719..baf90257 100644 --- a/ds-gw/target/classes/undertow_dev.properties +++ b/ds-gw/target/classes/undertow_dev.properties @@ -1,5 +1,5 @@ # true 值支持热加载 -undertow.devMode=true +undertow.devMode=false undertow.port=8000 undertow.host=0.0.0.0 #undertow.resourcePath =/root/dsGw/WebRoot,classpath:static diff --git a/ds-gw/target/classes/undertow_pro.properties b/ds-gw/target/classes/undertow_pro.properties index 17535295..0cb373c7 100644 --- a/ds-gw/target/classes/undertow_pro.properties +++ b/ds-gw/target/classes/undertow_pro.properties @@ -1,5 +1,5 @@ # true 值支持热加载 -undertow.devMode=true +undertow.devMode=false undertow.port=8001 undertow.host=0.0.0.0 undertow.resourcePath =/root/WebRoot,classpath:static