home/Martian
2
0
Fork 0
mirror of https://github.com/wahyd4/Martian.git synced 2026-08-09 05:16:21 +10:00
Code Issues Packages Projects Releases Wiki Activity

去除tomcat，不再使用第三方容器，而是直接采用jdk自带的HttpServer来做http服务

Browse Source
This commit is contained in:
yuye
2020-06-07 16:43:47 +08:00
parent 28bccc452a
commit daeb98d3af
14 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java
+1 -1
View File
@@ -11,7 +11,7 @@ import com.mars.common.constant.MarsSpace;
import com.mars.core.model.MarsBeanModel;
import com.mars.mvc.model.MarsMappingModel;
import com.mars.mvc.util.ParamAndResult;
import com.mars.tomcat.par.factory.ParamAndResultFactory;
import com.mars.iserver.par.factory.ParamAndResultFactory;
import java.lang.reflect.Method;
import java.util.HashMap;
mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.mars.common.constant.MarsConstant;
import com.mars.mvc.base.BaseInterceptor;
import com.mars.mvc.model.MarsInterModel;
import com.mars.mvc.util.ParamsCheckUtil;
import com.mars.tomcat.par.factory.ParamAndResultFactory;
import com.mars.iserver.par.factory.ParamAndResultFactory;
import com.mars.server.server.request.HttpMarsRequest;
import com.mars.server.server.request.HttpMarsResponse;
import com.mars.server.util.RequestUtil;
mars-mvc/src/main/java/com/mars/mvc/util/ParamAndResult.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.mars.common.constant.MarsConstant;
import com.mars.core.enums.DataType;
import com.mars.server.server.request.HttpMarsRequest;
import com.mars.server.server.request.HttpMarsResponse;
import com.mars.tomcat.par.base.BaseParamAndResult;
import com.mars.iserver.par.base.BaseParamAndResult;
import java.lang.reflect.Method;
mars-server/src/main/java/com/mars/tomcat/execute/HttpMarsRequestFactory.java → mars-server/src/main/java/com/mars/iserver/execute/HttpMarsRequestFactory.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.execute;
package com.mars.iserver.execute;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
mars-server/src/main/java/com/mars/tomcat/execute/RequestExecute.java → mars-server/src/main/java/com/mars/iserver/execute/RequestExecute.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.execute;
package com.mars.iserver.execute;
import com.mars.common.ncfg.mvc.CoreServletClass;
import com.mars.common.util.MesUtil;
@@ -6,8 +6,8 @@ import com.mars.common.util.StringUtil;
import com.mars.server.server.request.HttpMarsRequest;
import com.mars.server.server.request.HttpMarsResponse;
import com.mars.server.util.RequestUtil;
import com.mars.tomcat.execute.access.PathAccess;
import com.mars.tomcat.par.factory.ParamAndResultFactory;
import com.mars.iserver.execute.access.PathAccess;
import com.mars.iserver.par.factory.ParamAndResultFactory;
import com.sun.net.httpserver.HttpExchange;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
mars-server/src/main/java/com/mars/tomcat/execute/access/PathAccess.java → mars-server/src/main/java/com/mars/iserver/execute/access/PathAccess.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.execute.access;
package com.mars.iserver.execute.access;
import java.util.HashMap;
import java.util.Map;
mars-server/src/main/java/com/mars/tomcat/par/base/BaseParamAndResult.java → mars-server/src/main/java/com/mars/iserver/par/base/BaseParamAndResult.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.par.base;
package com.mars.iserver.par.base;
import com.mars.server.server.request.HttpMarsRequest;
import com.mars.server.server.request.HttpMarsResponse;
mars-server/src/main/java/com/mars/tomcat/par/factory/ParamAndResultFactory.java → mars-server/src/main/java/com/mars/iserver/par/factory/ParamAndResultFactory.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.mars.tomcat.par.factory;
package com.mars.iserver.par.factory;
import com.mars.tomcat.par.base.BaseParamAndResult;
import com.mars.iserver.par.base.BaseParamAndResult;
public class ParamAndResultFactory {
mars-server/src/main/java/com/mars/tomcat/server/MarsServer.java → mars-server/src/main/java/com/mars/iserver/server/MarsServer.java
+2 -3
View File
@@ -1,16 +1,15 @@
package com.mars.tomcat.server;
package com.mars.iserver.server;
import com.mars.common.base.config.MarsConfig;
import com.mars.common.constant.MarsConstant;
import com.mars.common.constant.MarsSpace;
import com.mars.common.util.MarsConfiguration;
import com.mars.tomcat.server.threadpool.ThreadPool;
import com.mars.iserver.server.threadpool.ThreadPool;
import com.sun.net.httpserver.HttpServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
import java.util.concurrent.Executors;
/**
* tomcat服务
mars-server/src/main/java/com/mars/tomcat/server/MarsServerHandler.java → mars-server/src/main/java/com/mars/iserver/server/MarsServerHandler.java
+3 -3
View File
@@ -1,7 +1,7 @@
package com.mars.tomcat.server;
package com.mars.iserver.server;
import com.mars.tomcat.execute.RequestExecute;
import com.mars.tomcat.util.ResponseUtil;
import com.mars.iserver.execute.RequestExecute;
import com.mars.iserver.util.ResponseUtil;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import org.slf4j.Logger;
mars-server/src/main/java/com/mars/tomcat/server/threadpool/ThreadPool.java → mars-server/src/main/java/com/mars/iserver/server/threadpool/ThreadPool.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.server.threadpool;
package com.mars.iserver.server.threadpool;
import com.mars.common.base.config.MarsConfig;
import com.mars.common.base.config.model.ThreadPoolConfig;
mars-server/src/main/java/com/mars/tomcat/util/FileUpLoad.java → mars-server/src/main/java/com/mars/iserver/util/FileUpLoad.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.util;
package com.mars.iserver.util;
import com.mars.common.base.config.model.FileUploadConfig;
import com.mars.common.util.MarsConfiguration;
mars-server/src/main/java/com/mars/tomcat/util/ResponseUtil.java → mars-server/src/main/java/com/mars/iserver/util/ResponseUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.mars.tomcat.util;
package com.mars.iserver.util;
import com.mars.common.util.MesUtil;
import com.mars.server.server.request.HttpMarsResponse;
mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.mars.start.base;
import com.mars.common.util.MarsConfiguration;
import com.mars.jdbc.load.InitJdbc;
import com.mars.tomcat.server.MarsServer;
import com.mars.iserver.server.MarsServer;
import com.mars.start.startmap.StartMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;