-
-
- 支持动态请求(后缀为do，请求路径restful风格) -
- 支持静态资源请求(后缀为对应资源类型后缀，可在配置文件中拓展) -
- 可通实现Controller接口处理动态请求，并支持注解方式进行映射 -
- 动态请求可返回页面、json数据，并支持跳转 -
- 整合Velocity，返回页面可通过Velocity语法渲染页面 -
- 支持HTTP表单方式的文件上传(input:file) -
-
-
- 1、clone easy-httpserver到本地，导入eclipse（已安装maven，编码utf-8） -
- 2、clone test-httpserver（示例项目）到本地，导入eclipse -
- 3、mvn install easy-httpserver（将jar导入test-httpserver，若配置maven则自动导），以下修改均在test-httpserver中 -
- 4、按照注释修改test-httpserver配置文件
---#包前缀 -PACKAGE_PREFIX=com.gj.web - -#view页面根路径（相对classes/view文件夹，项目中在src/main/view下） -VIEW_BASE_PATH=page/ - -#静态资源路劲（相对classes/view文件夹，项目中在src/main/view下） -STATIC_RESOURCE_PATH=static/ - -#端口 -httpserver.port=8888 - -#controller包路径，配置后可通过annocation直接配置 -controller.package=com.gj.web.controller - -#url与controller类对应关系，与上边controller.package效果一致，二选一，格式："url"+url路径+“=”+对应controller路径 -#url/list=com.gj.web.controller.MyController-
- - 5、编写Controller类，需实现Controller接口，并返回ResultInfo对象（详情见示例）。使用注解配置映射（如：http://127.0.0.1/test/path/show.do,配置controller为/test/path/，方法名为show） -
- 5、在配置文件指定文件夹(page:velocity文件，static:静态页面和资源)下编写对应页面 -
- 6、mvn exec:java -Dexec.mainClass="org.eh.core.http.EHServer" 启动服务 -
- 7、浏览器访问http://127.0.0.1:8888/test/path/show.do，即可看到结果 -
~src/main/java
--org.eh.core
--annotation
AnnocationHandler.java 注解处理类
Controller.java Controller注解
RequestMapping 请求方法注解，用来标注Controller中的处理方法
--common
Constants.java 常量类，包括系统常量和配置文件对应信息
ReturnType.java 枚举，返回类型
--http
EHHttpHandler.java httpserver请求核心处理类，完成请求的接收、处理、返回
EHServer.java 项目启动类，完成服务器启动
ApplicationContext.java 全局数据和会话相关数据,单例
HttpSession.java session会话
--model
FileInfo.java 上传文件信息封装
ResultInfo.java Controller返回结果
--util
FileUploadContentAnalysis.java 上传请求解析类，从中提取表单中的域值和文件信息
FileUtil.java 文件工具类
IOUtil.java IO工具类
PropertyUtil.java 配置文件工具类
StringUtil.java 字符串工具类
VelocityUtil.java Velocity工具类
--web
--controller
Controller.java Controller接口，实现类必须继承Controller且标记Controller注解，实现方法必须标记RequestMapping注解
--view
ViewHandler.java View处理类，完成页面文件渲染
~src/main/resources
velocity.properties
web.properties
页面不存在");
return;
}
-
- String viewPath = resultInfo.getView();
- if (viewPath.startsWith(ReturnType.redirect.name())) {// redirect跳转
- String redirectUrl = viewPath.replace(ReturnType.redirect.name() + ":", "");
- responseToClient(httpExchange, 302, redirectUrl);
- return;
- } else if (viewPath.startsWith(ReturnType.json.name())) { // 返回json数据
- String jsonContent = viewPath.replace(ReturnType.json.name() + ":", "");
- responseToClient(httpExchange, 200, jsonContent);
- return;
- } else if (viewPath.startsWith(ReturnType.velocity.name())) { // 解析对应view并返回
- String content = invokViewHandler(resultInfo);
- if (content == null) {
- content = "";
- }
- responseToClient(httpExchange, 200, content);
- return;
- } else {
- responseToClient(httpExchange, 200, resultInfo.getView());
- return;
+
+ // 解析对应view并返回
+ String content = invokViewHandler(resultInfo);
+ if (content == null) {
+ content = "";
}
+ responseToClient(httpExchange, 200, content);
+ return;
} catch (Exception e) {
httpExchange.close();
@@ -97,13 +68,17 @@ public void handle(HttpExchange httpExchange) throws IOException {
/**
* 响应请求
- * @param httpExchange 请求-响应的封装
- * @param code 返回状态码
- * @param msg 返回信息
+ *
+ * @param httpExchange
+ * 请求-响应的封装
+ * @param code
+ * 返回状态码
+ * @param msg
+ * 返回信息
* @throws IOException
*/
- private void responseToClient(HttpExchange httpExchange, Integer code, String msg)
- throws IOException {
+ private void responseToClient(HttpExchange httpExchange, Integer code,
+ String msg) throws IOException {
switch (code) {
case 200: { // 成功
@@ -135,16 +110,17 @@ private void responseToClient(HttpExchange httpExchange, Integer code, String ms
break;
}
}
-
+
/**
* 响应请求，返回静态资源
+ *
* @param httpExchange
* @param code
* @param bytes
* @throws IOException
*/
- private void responseStaticToClient(HttpExchange httpExchange, Integer code, byte[] bytes)
- throws IOException {
+ private void responseStaticToClient(HttpExchange httpExchange,
+ Integer code, byte[] bytes) throws IOException {
httpExchange.sendResponseHeaders(code, bytes.length);
OutputStream out = httpExchange.getResponseBody();
out.write(bytes);
@@ -154,51 +130,14 @@ private void responseStaticToClient(HttpExchange httpExchange, Integer code, byt
/**
* 调用对应Controller处理业务
+ * @throws UnsupportedEncodingException
*/
- @SuppressWarnings("rawtypes")
- private ResultInfo invokController(HttpExchange httpExchange) throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, IOException, NoSuchMethodException,
- SecurityException, IllegalArgumentException, InvocationTargetException {
- String path = httpExchange.getRequestURI().getPath();
-
- String classPath = Constants.UrlClassMap.get(path.substring(0, path.lastIndexOf("/") + 1));
- if (classPath == null || classPath.length() == 0) {
- return null;
- }
- Class controllerClass = Class.forName(classPath);
- Controller controller = (Controller) controllerClass.newInstance();
-
- String methodName = path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf("."));
- //通过反射获取对应方法
- AnnocationHandler annocationHandler = new AnnocationHandler();
- Method method = annocationHandler.getMethod(controllerClass, methodName);
-
- Map map = null; // 参数
- // 判断表单类型，若是multipart/form-data，则是文件上传；否则做普通处理
- Headers headers = httpExchange.getRequestHeaders();
- // 获取ContentType
- String contentType = "";
- if(null != headers.get("Content-type")){
- contentType = headers.get("Content-type").toString().replace("[", "")
- .replace("]", "");
- }
-
- if (contentType.indexOf("multipart/form-data") != -1) {
- // 获取content长度
- int length = Integer.parseInt(headers.get("Content-length").toString().replace("[", "")
- .replace("]", ""));
- map = FileUploadContentAnalysis.parse(httpExchange.getRequestBody(), contentType,
- length);
- } else {
- map = analysisParms(httpExchange);
- }
-
- // 设置session
- HttpSession httpSession = ApplicationContext.getApplicationContext().getSession(
- httpExchange);
- map.put("session", httpSession);
+ private ResultInfo invokController(HttpExchange httpExchange) throws UnsupportedEncodingException {
+ // 获取参数
+ Map map = analysisParms(httpExchange);
- return (ResultInfo) method.invoke(controller, new Object[] { map });
+ IndexController controller = new IndexController();
+ return controller.process(map);
}
/**
@@ -206,8 +145,7 @@ private ResultInfo invokController(HttpExchange httpExchange) throws ClassNotFou
*/
private String invokViewHandler(ResultInfo resultInfo) throws IOException {
ViewHandler viewHandler = new ViewHandler();
- // return viewHandler.processView(resultInfo);
- return viewHandler.processVelocityView(resultInfo);
+ return viewHandler.processView(resultInfo);
}
/**
@@ -219,13 +157,15 @@ private Map analysisParms(HttpExchange httpExchange)
URI requestedUri = httpExchange.getRequestURI();
String queryGet = requestedUri.getRawQuery();
- String queryPost = IOUtil.getRequestContent(httpExchange.getRequestBody());
+ String queryPost = IOUtil.getRequestContent(httpExchange
+ .getRequestBody());
String query = "";
if (!StringUtil.isEmpty(queryGet)) {
query = queryGet;
}
if (!StringUtil.isEmpty(queryPost)) {
- query = StringUtil.isEmpty(query) ? queryPost : (query + "&" + queryPost);
+ query = StringUtil.isEmpty(query) ? queryPost
+ : (query + "&" + queryPost);
}
if (StringUtil.isEmpty(query)) {
return map;
diff --git a/src/main/java/org/eh/core/http/EHServer.java b/src/main/java/org/eh/core/http/EHServer.java
index 8d17efb..b731702 100644
--- a/src/main/java/org/eh/core/http/EHServer.java
+++ b/src/main/java/org/eh/core/http/EHServer.java
@@ -2,15 +2,10 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.util.Date;
-import java.util.Timer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.app.Velocity;
-import org.eh.core.annotation.AnnocationHandler;
import org.eh.core.common.Constants;
-import org.eh.core.task.SessionCleanTask;
import com.sun.net.httpserver.HttpServer;
import com.sun.net.httpserver.spi.HttpServerProvider;
@@ -28,65 +23,22 @@ public class EHServer {
*/
public void startServer() throws IOException {
log.info("Starting EHServer......");
- log.info("Loading configuration......");
-
- //设置classes文件夹路径
- Constants.CLASS_PATH = this.getClass().getResource("/").getPath().replace("bin", "classes");
- // 加载配置文件
- String propPath = Constants.CLASS_PATH + Constants.PROPERTIES_NAME;
- Constants.loadFromProp(propPath);
-
- // 加载注解配置的controller
- if (Constants.OTHER_CONFIG_INFO.get(Constants.PROPERTIES_CONTROLLER_PACKAGE) != null) {
- AnnocationHandler annocationHandler = new AnnocationHandler();
- try {
- annocationHandler.paserControllerAnnocation(Constants.OTHER_CONFIG_INFO.get(
- Constants.PROPERTIES_CONTROLLER_PACKAGE).toString());
- } catch (Exception e) {
- log.error("加载controller配置出错！", e);
- return;
- }
- }
-
- // 初始化Velocity模板
- log.info("Initializing velocity......");
- Velocity.init(Constants.CLASS_PATH
- + Constants.PROPERTIES_VELOCITY_NAME);
-
- for (String key : Constants.UrlClassMap.keySet()) {
- log.info("Add url-class:" + key + " " + Constants.UrlClassMap.get(key));
- }
-
- int port = 8899;
+ //设置路径
+ Constants.CLASS_PATH = this.getClass().getResource("/").getPath();
+ Constants.VIEW_BASE_PATH = "page";
+ Constants.STATIC_RESOURCE_PATH = "static";
+
//设置端口号
- String portValue = Constants.OTHER_CONFIG_INFO.get(Constants.PROPERTIES_HPPTSERVER_PORT);
- log.info("Set port:" + portValue);
- if (portValue != null) {
- try {
- port = Integer.parseInt(portValue);
- } catch (Exception e) {
- log.error("端口错误！", e);
- return;
- }
- }
+ int port = 8899;
- //启动session过期清理定时器
- Timer timer = new Timer();
- SessionCleanTask sessionCleanTask = new SessionCleanTask();
- int session_timeout = Integer.parseInt(Constants.OTHER_CONFIG_INFO
- .get(Constants.SESSION_TIMEOUT));
- log.info("Initializing SessionCleanTask,the session_out_time is " + session_timeout * 2
- + " minute.");
- timer.schedule(sessionCleanTask, new Date(), session_timeout * 60 * 2 * 1000);
-
// 启动服务器
HttpServerProvider provider = HttpServerProvider.provider();
HttpServer httpserver = provider.createHttpServer(new InetSocketAddress(port), 100);
httpserver.createContext("/", new EHHttpHandler());
httpserver.setExecutor(null);
httpserver.start();
- log.info("EHServer has started");
+ log.info("EHServer is started, listening at 8899.");
}
/**
diff --git a/src/main/java/org/eh/core/http/HttpSession.java b/src/main/java/org/eh/core/http/HttpSession.java
deleted file mode 100644
index b117dae..0000000
--- a/src/main/java/org/eh/core/http/HttpSession.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eh.core.http;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * session数据
- * @author guojing
- * @date 2014-3-17
- */
-public class HttpSession {
-
- Map map = new HashMap();
-
- Date lastVisitTime = new Date(); // 最后访问时间
-
- public void addAttribute(String name, Object value) {
- map.put(name, value);
- }
-
- public Object getAttribute(String name) {
- return map.get(name);
- }
-
- public Map getAllAttribute() {
- return map;
- }
-
- public Set getAllNames() {
- return map.keySet();
- }
-
- public boolean containsName(String name) {
- return map.containsKey(name);
- }
-
- public Map getMap() {
- return map;
- }
-
- public void setMap(Map map) {
- this.map = map;
- }
-
- public Date getLastVisitTime() {
- return lastVisitTime;
- }
-
- public void setLastVisitTime(Date lastVisitTime) {
- this.lastVisitTime = lastVisitTime;
- }
-
-}
diff --git a/src/main/java/org/eh/core/model/FileInfo.java b/src/main/java/org/eh/core/model/FileInfo.java
deleted file mode 100644
index b92c684..0000000
--- a/src/main/java/org/eh/core/model/FileInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eh.core.model;
-
-/**
- * 上传文件信息
- * @author guojing
- * @date 2014-3-3
- */
-public class FileInfo {
-
- private String filename; //文件名
- private String fieldname; // 表单中参数名
- private int length; //文件长度
- private byte[] bytes; //文件字节数组
-
- public String getFilename() {
- return filename;
- }
- public void setFilename(String filename) {
- this.filename = filename;
- }
- public int getLength() {
- return length;
- }
- public void setLength(int length) {
- this.length = length;
- }
- public byte[] getBytes() {
- return bytes;
- }
- public void setBytes(byte[] bytes) {
- this.bytes = bytes;
- }
-
- public String getFieldname() {
- return fieldname;
- }
-
- public void setFieldname(String fieldname) {
- this.fieldname = fieldname;
- }
-
-
-}
diff --git a/src/main/java/org/eh/core/task/SessionCleanTask.java b/src/main/java/org/eh/core/task/SessionCleanTask.java
deleted file mode 100644
index 2df93da..0000000
--- a/src/main/java/org/eh/core/task/SessionCleanTask.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eh.core.task;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eh.core.common.Constants;
-import org.eh.core.http.ApplicationContext;
-import org.eh.core.http.HttpSession;
-
-/**
- * 定时清理过期session
- * @author guojing
- * @date 2014-3-17
- */
-public class SessionCleanTask extends TimerTask {
- private final Log log = LogFactory.getLog(SessionCleanTask.class);
-
- @Override
- public void run() {
- log.info("清理session......");
- ConcurrentMap sessionMap = ApplicationContext.getApplicationContext()
- .getAllSession();
-
- Iterator> it = sessionMap.entrySet().iterator();
- while (it.hasNext()) {
- ConcurrentMap.Entry entry= (Entry) it.next();
- HttpSession httpSession= entry.getValue();
-
- Date nowDate = new Date();
- int diff = (int) ((nowDate.getTime() - httpSession.getLastVisitTime().getTime())/1000/60);
-
- if (diff > Integer.parseInt(Constants.OTHER_CONFIG_INFO.get(Constants.SESSION_TIMEOUT))) {
- it.remove();
- }
- }
-
- log.info("清理session结束");
- }
-}
diff --git a/src/main/java/org/eh/core/util/FileUploadContentAnalysis.java b/src/main/java/org/eh/core/util/FileUploadContentAnalysis.java
deleted file mode 100644
index 6b99ed0..0000000
--- a/src/main/java/org/eh/core/util/FileUploadContentAnalysis.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.eh.core.util;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eh.core.model.FileInfo;
-
-/**
- * 解析content获取上传文件表单信息
- * @author 自己写的老有问题，一怒之下copy了一份。不过这个也有些问题，由于office不同版本的Content-Type格式不固定， 所以office文件上传生成的文件一般会少几个字节，以后有心情了再改吧
- * @date 2014-3-10
- */
-public class FileUploadContentAnalysis {
- static final int NONE = 0;
- static final int DATAHEADER = 1;
- static final int FILEDATA = 2;
- static final int FIELDDATA = 3;
- static final int MXA_SEGSIZE = 1000 * 1024 * 10; //最大文件长度
-
- public static Map parse(InputStream ins, String contentType, int totalLength)
- throws IOException {
-
- FileInfo fileInfo =new FileInfo();
- String fieldname = ""; // 表单域的名称
- String fieldvalue = ""; // 表单域的值
- String filename = ""; // 文件名
- String boundary = ""; // 分界符
- String lastboundary = ""; // 结束符
- String filefieldname = ""; // 文件表单域名
- Map formfields = new HashMap();
- int filesize = 0; // 文件长度
-
- int pos = contentType.indexOf("boundary=");
-
- if (pos != -1) { // 取得分界符和结束符
- pos += "boundary=".length();
- boundary = "--" + contentType.substring(pos);
- lastboundary = boundary + "--";
- }
- int state = NONE;
- // 得到数据输入流reqbuf
- DataInputStream in = new DataInputStream(ins);
- // 将请求消息的实体送到b变量中
- int totalBytes = totalLength;
- if (totalBytes > MXA_SEGSIZE) {// 每批大于10m时
- return null;
- }
- byte[] b = new byte[totalBytes];
- in.readFully(b);
- in.close();
- String reqContent = new String(b, "UTF-8");//
- BufferedReader reqbuf = new BufferedReader(new StringReader(reqContent));
-
- boolean flag = true;
- while (flag == true) {
- String s = reqbuf.readLine();
- if ((s == null) || (s.equals(lastboundary)))
- break;
-
- switch (state) {
- case NONE:
- if (s.startsWith(boundary)) {
- state = DATAHEADER;
- }
- break;
- case DATAHEADER:
- pos = s.indexOf("filename=");
- if (pos == -1) { // 将表单域的名字解析出来
- pos = s.indexOf("name=");
- pos += "name=".length() + 1;
- s = s.substring(pos);
- int l = s.length();
- s = s.substring(0, l - 1);
- fieldname = s;
- state = FIELDDATA;
- } else {
- String temp = s;
- // 将文件表单参数名解析出来
- pos = s.indexOf("name=");
- pos += "name=".length() + 1;
- s = s.substring(pos);
- int pos1 = s.indexOf("\";");
- filefieldname = s.substring(0, pos1);
-
- // 将文件名解析出来
- pos = s.indexOf("filename=");
- pos += "filename=".length() + 1;
- s = s.substring(pos);
- int l = s.length();
- s = s.substring(0, l - 1);// 去掉最后那个引号”
- pos = s.lastIndexOf("\\");
- s = s.substring(pos + 1);
- filename = s;
- // 从字节数组中取出文件数组
- pos = byteIndexOf(b, temp, 0);
- b = subBytes(b, pos + temp.getBytes().length + 2, b.length);// 去掉前面的部分
- int n = 0;
- /**
- * 过滤boundary下形如 Content-Disposition: form-data; name="bin"; filename="12.pdf" Content-Type:
- * application/octet-stream Content-Transfer-Encoding: binary 的字符串
- */
- while ((s = reqbuf.readLine()) != null) {
- if (n == 1)
- break;
- if (s.equals(""))
- n++;
-
- b = subBytes(b, s.getBytes().length + 2, b.length);
- }
- pos = byteIndexOf(b, boundary, 0);
- if (pos != -1)
- b = subBytes(b, 0, pos - 1);
-
- filesize = b.length - 1;
- state = FILEDATA;
- }
- break;
- case FIELDDATA:
- s = reqbuf.readLine();
- fieldvalue = s;
- formfields.put(fieldname, fieldvalue);
- state = NONE;
- break;
- case FILEDATA:
- while ((!s.startsWith(boundary)) && (!s.startsWith(lastboundary))) {
- s = reqbuf.readLine();
- if (s.startsWith(boundary)) {
- state = DATAHEADER;
- break;
- }
- }
- break;
- }
- }
- fileInfo.setFieldname(filefieldname);
- fileInfo.setBytes(b);
- fileInfo.setFilename(filename);
- fileInfo.setLength(filesize);
- formfields.put(filefieldname, fileInfo);
- return formfields;
-
- }
-
- // 字节数组中的INDEXOF函数，与STRING类中的INDEXOF类似
- public static int byteIndexOf(byte[] b, String s, int start) {
- return byteIndexOf(b, s.getBytes(), start);
- }
-
- // 字节数组中的INDEXOF函数，与STRING类中的INDEXOF类似
- public static int byteIndexOf(byte[] b, byte[] s, int start) {
- int i;
- if (s.length == 0) {
- return 0;
- }
- int max = b.length - s.length;
- if (max < 0)
- return -1;
- if (start > max)
- return -1;
- if (start < 0)
- start = 0;
- search: for (i = start; i <= max; i++) {
- if (b[i] == s[0]) {
- int k = 1;
- while (k < s.length) {
- if (b[k + i] != s[k]) {
- continue search;
- }
- k++;
- }
- return i;
- }
- }
- return -1;
- }
-
- // 用于从一个字节数组中提取一个字节数组
- public static byte[] subBytes(byte[] b, int from, int end) {
- byte[] result = new byte[end - from];
- System.arraycopy(b, from, result, 0, end - from);
- return result;
- }
-
- // 用于从一个字节数组中提取一个字符串
- public static String subBytesString(byte[] b, int from, int end) {
- return new String(subBytes(b, from, end));
- }
-
-}
diff --git a/src/main/java/org/eh/core/util/PropertyUtil.java b/src/main/java/org/eh/core/util/PropertyUtil.java
deleted file mode 100644
index 7a8cdbd..0000000
--- a/src/main/java/org/eh/core/util/PropertyUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eh.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * 配置文件工具类
- * @author guojing
- * @date 2014-3-4
- */
-public class PropertyUtil {
- private static final Log log = LogFactory.getLog(PropertyUtil.class);
- public static Map analysisProperties(String path) {
- Map map = new HashMap();
- Properties props = new Properties();
- try {
- InputStream in = new BufferedInputStream(new FileInputStream(path));
- props.load(in);
- for (String key : props.stringPropertyNames()) {
- map.put(key, props.get(key).toString());
- }
- } catch (Exception e) {
- log.error("配置文件解析错误：", e);
- }
- return map;
- }
-}
diff --git a/src/main/java/org/eh/core/util/VelocityUtil.java b/src/main/java/org/eh/core/util/VelocityUtil.java
deleted file mode 100644
index 08c5f3b..0000000
--- a/src/main/java/org/eh/core/util/VelocityUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eh.core.util;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Map;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-/**
- * Velocity解析类
- * @author guojing
- * @date 2014-3-10
- */
-public class VelocityUtil {
-
- /**
- * 渲染Velocity模板
- * @param path
- * @param map
- */
- public static String mergeTemplate(String path, Map map) throws IOException {
- VelocityContext vc = new VelocityContext();
- if (null != map) {
- for (String key : map.keySet()) {
- vc.put(key, map.get(key));
- }
- }
- StringWriter w = new StringWriter();
- Velocity.mergeTemplate(path, "utf-8", vc, w);
- String content = w.toString();
- w.close();
- return content;
- }
-}
diff --git a/src/main/java/org/eh/core/web/controller/IndexController.java b/src/main/java/org/eh/core/web/controller/IndexController.java
new file mode 100644
index 0000000..45b7816
--- /dev/null
+++ b/src/main/java/org/eh/core/web/controller/IndexController.java
@@ -0,0 +1,19 @@
+package org.eh.core.web.controller;
+
+import java.util.Map;
+
+import org.eh.core.model.ResultInfo;
+
+/**
+ * 主页对应的contoller
+ * @author guojing
+ */
+public class IndexController implements Controller{
+
+ public ResultInfo process(Map map){
+ ResultInfo result =new ResultInfo();
+ result.setView("index");
+ result.setResultMap(map);
+ return result;
+ }
+}
diff --git a/src/main/java/org/eh/core/web/view/ViewHandler.java b/src/main/java/org/eh/core/web/view/ViewHandler.java
index 1a1bbab..c0548bd 100644
--- a/src/main/java/org/eh/core/web/view/ViewHandler.java
+++ b/src/main/java/org/eh/core/web/view/ViewHandler.java
@@ -3,11 +3,9 @@
import java.io.IOException;
import org.eh.core.common.Constants;
-import org.eh.core.common.ReturnType;
import org.eh.core.model.ResultInfo;
import org.eh.core.util.IOUtil;
import org.eh.core.util.StringUtil;
-import org.eh.core.util.VelocityUtil;
/**
* 处理页面信息
@@ -20,7 +18,6 @@ public class ViewHandler {
* 处理View模板,只提供建单变量(格式${XXX})替换,已废弃
* @return
*/
- @Deprecated
public String processView(ResultInfo resultInfo) {
// 获取路径
String path = analysisViewPath(resultInfo.getView());
@@ -44,48 +41,16 @@ public String processView(ResultInfo resultInfo) {
return content;
}
-
- /**
- * 处理Velocity模板
- * @param resultInfo
- * @return
- * @throws IOException
- */
- public String processVelocityView(ResultInfo resultInfo) throws IOException {
- if (StringUtil.isEmpty(resultInfo.getView())) {
- return "";
- }
-
- // 获取路径
- String path = analysisVelocityViewPath(resultInfo.getView());
- String content = VelocityUtil.mergeTemplate(path, resultInfo.getResultMap());
-
- if (StringUtil.isEmpty(content)) {
- return "";
- }
-
- return content;
- }
-
+
/**
* 解析路径（根据Controller返回ResultInfo的view）,已废弃
* @param viewPath
* @return
*/
- @Deprecated
private String analysisViewPath(String viewPath) {
String path = Constants.CLASS_PATH
- + (Constants.VIEW_BASE_PATH == null ? "/" : Constants.VIEW_BASE_PATH)
+ + (Constants.VIEW_BASE_PATH == null ? "/" : Constants.VIEW_BASE_PATH+"/")
+ viewPath + ".page";
return path;
}
-
- /**
- * 解析velocity路径（根据Controller返回ResultInfo的view）
- */
- private String analysisVelocityViewPath(String viewPath) {
- String path = Constants.VIEW_BASE_PATH + "/"
- + viewPath.replace(ReturnType.velocity.name() + ":", "") + ".vm";
- return path;
- }
}
diff --git a/src/main/resources/velocity.properties b/src/main/resources/velocity.properties
deleted file mode 100644
index db5a5ec..0000000
--- a/src/main/resources/velocity.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-resource.loader=class
-class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
\ No newline at end of file
diff --git a/src/main/resources/web.properties b/src/main/resources/web.properties
deleted file mode 100644
index 897b070..0000000
--- a/src/main/resources/web.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#包前缀
-PACKAGE_PREFIX=org.eh.web
-
-#模板页面根路径（相对classes文件夹,项目src/main/view下）
-VIEW_BASE_PATH=page
-
-#静态资源路劲（相对classes文件夹,项目src/main/view下）
-STATIC_RESOURCE_PATH=static
-
-#端口
-httpserver.port=8888
-
-#controller包路径，配置后可通过annocation直接配置
-controller.package=com.gj.web.controller
-
-#url与controller类对应关系
-#url/list=com.gj.web.controller.MyController
-
-#session超时时间(分钟)
-session_timeout = 10
\ No newline at end of file
diff --git a/src/main/view/page/index.page b/src/main/view/page/index.page
new file mode 100644
index 0000000..77b4b2c
--- /dev/null
+++ b/src/main/view/page/index.page
@@ -0,0 +1,12 @@
+
+
+
+
+
+ Hello,${name}
+ 
+
+
\ No newline at end of file
diff --git a/src/main/view/static/js/test.js b/src/main/view/static/js/test.js
new file mode 100644
index 0000000..43d363e
--- /dev/null
+++ b/src/main/view/static/js/test.js
@@ -0,0 +1,3 @@
+function hello(){
+ console.log("hello!")
+}
\ No newline at end of file
diff --git a/src/main/view/static/pic/tx.jpg b/src/main/view/static/pic/tx.jpg
new file mode 100644
index 0000000..7bf50f3
Binary files /dev/null and b/src/main/view/static/pic/tx.jpg differ
diff --git a/src/test/java/org/eh/core/annotation/AnnotationHandlerTest.java b/src/test/java/org/eh/core/annotation/AnnotationHandlerTest.java
deleted file mode 100644
index fe2d5f5..0000000
--- a/src/test/java/org/eh/core/annotation/AnnotationHandlerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eh.core.annotation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-13
- */
-public class AnnotationHandlerTest {
-
- @Test
- @SuppressWarnings("rawtypes")
- public void testMethods() {
- try {
- Class c = Class.forName("org.eh.core.controller.Test1Controller");
- Method[] methods = c.getMethods();
- for (Method method : methods) {
- if (method.isAnnotationPresent(RequestMapping.class)) {
- System.out.println(method.getName());
- org.eh.core.web.controller.Controller controller = (org.eh.core.web.controller.Controller) c
- .newInstance();
- method.invoke(controller, new Object[] { null });
- }
- }
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Test
- public void testMethod() {
- try {
- Class c = Class.forName("org.eh.core.controller.Test1Controller");
- Method methods = c.getMethod("add", Map.class);
- System.out.println(methods.getName());
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (SecurityException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/test/java/org/eh/core/controller/Test1Controller.java b/src/test/java/org/eh/core/controller/Test1Controller.java
deleted file mode 100644
index 5e611ed..0000000
--- a/src/test/java/org/eh/core/controller/Test1Controller.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eh.core.controller;
-
-import java.util.Map;
-
-import org.eh.core.annotation.RequestMapping;
-import org.eh.core.web.controller.Controller;
-
-/**
- *
- * @author guojing
- * @date 2014-3-5
- */
-@org.eh.core.annotation.Controller(name = "test1", url = "/test/show")
-public class Test1Controller implements Controller {
-
- @RequestMapping
- public String add(Map map) {
- System.out.println("aaa");
- return null;
- }
-}
diff --git a/src/test/java/org/eh/core/controller/Test2Controller.java b/src/test/java/org/eh/core/controller/Test2Controller.java
deleted file mode 100644
index e1045d5..0000000
--- a/src/test/java/org/eh/core/controller/Test2Controller.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eh.core.controller;
-
-import org.eh.core.annotation.Controller;
-
-/**
- *
- * @author guojing
- * @date 2014-3-5
- */
-@Controller(name = "test2", url = "/test/list")
-public interface Test2Controller {
-
-}
diff --git a/src/test/java/org/eh/core/controller/TestAnnocation.java b/src/test/java/org/eh/core/controller/TestAnnocation.java
deleted file mode 100644
index 109ef27..0000000
--- a/src/test/java/org/eh/core/controller/TestAnnocation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eh.core.controller;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-5
- */
-public class TestAnnocation {
-
- @Test
- public void getAnnontion() {
- List list = getPkgClass("org.eh.core.controller");
- System.out.println(Arrays.toString(list.toArray()));
- }
-
- public List getPkgClass(String parkage) {
- String path = this.getClass().getResource("/").getPath() + parkage.replace(".", "/") + "/";
- List list = new ArrayList();
-
- File file = new File(path);
- for(String str :file.list()){
- if (str.endsWith(".class")) {
- list.add(parkage + "." + str.replace(".class", ""));
- } else if (str.indexOf(".") == -1) {
- list.addAll(getPkgClass(parkage + "." + str));
- }
- }
-
- return list;
- }
-}
diff --git a/src/test/java/org/eh/core/controller/pss/Test3Controller.java b/src/test/java/org/eh/core/controller/pss/Test3Controller.java
deleted file mode 100644
index 28839db..0000000
--- a/src/test/java/org/eh/core/controller/pss/Test3Controller.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eh.core.controller.pss;
-
-import org.eh.core.annotation.Controller;
-
-/**
- *
- * @author guojing
- * @date 2014-3-5
- */
-@Controller(name = "test3", url = "/test/send")
-public class Test3Controller {
-
-}
diff --git a/src/test/java/org/eh/core/other/StringTest.java b/src/test/java/org/eh/core/other/StringTest.java
deleted file mode 100644
index 630765c..0000000
--- a/src/test/java/org/eh/core/other/StringTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eh.core.other;
-
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-6
- */
-public class StringTest {
-
- @Test
- public void testSub() {
- // String path = "test/path/list.do";
- // String suffix = path.substring(path.lastIndexOf("."), path.length());
- System.out.println(System.getProperty("user.dir"));
- }
-}
diff --git a/src/test/java/org/eh/core/util/FileUtilTest.java b/src/test/java/org/eh/core/util/FileUtilTest.java
deleted file mode 100644
index 419e1e8..0000000
--- a/src/test/java/org/eh/core/util/FileUtilTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eh.core.util;
-
-import org.eh.core.common.Constants;
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-4
- */
-public class FileUtilTest {
-
- @Test
- public void TestRead() {
- String path = Constants.CLASS_PATH
- + "org/eh/web/view/test/myinfo.page";
- String content = IOUtil.readFile(path);
- System.out.println(content);
- }
-
-}
diff --git a/src/test/java/org/eh/core/util/PropertyUtilTest.java b/src/test/java/org/eh/core/util/PropertyUtilTest.java
deleted file mode 100644
index 2ec031e..0000000
--- a/src/test/java/org/eh/core/util/PropertyUtilTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eh.core.util;
-
-import org.eh.core.common.Constants;
-import org.eh.core.common.ReturnType;
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-4
- */
-public class PropertyUtilTest {
-
- @Test
- public void testResd() {
- PropertyUtil.analysisProperties(Constants.CLASS_PATH
- + "web.properties");
- }
-
- @Test
- public void testReflect() {
- System.out.println(ReturnType.redirect.name());
- }
-}
diff --git a/src/test/java/org/eh/velocity/VelocityTest.java b/src/test/java/org/eh/velocity/VelocityTest.java
deleted file mode 100644
index 89e360b..0000000
--- a/src/test/java/org/eh/velocity/VelocityTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eh.velocity;
-
-import java.io.StringWriter;
-import java.util.Properties;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-10
- */
-public class VelocityTest {
-
- @Test
- public void testVelocity() {
- Properties p =new Properties();
- p.setProperty("resource.loader", "class");
- p.setProperty("class.resource.loader.class",
- "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
-
- Velocity.init(p);
- VelocityContext vc = new VelocityContext();
- vc.put("name", "guojing");
- StringWriter w = new StringWriter();
-// Velocity.mergeTemplate("org/eh/velocity/test.vm", "utf-8", vc, w);
- System.out.println(w);
- }
-}
diff --git a/src/test/java/org/eh/velocity/test.vm b/src/test/java/org/eh/velocity/test.vm
deleted file mode 100644
index ccf2d93..0000000
--- a/src/test/java/org/eh/velocity/test.vm
+++ /dev/null
@@ -1 +0,0 @@
-hello!$!{name}。
\ No newline at end of file
diff --git a/src/test/java/org/eh/web/controller/Test1Controller.java b/src/test/java/org/eh/web/controller/Test1Controller.java
deleted file mode 100644
index 926ef10..0000000
--- a/src/test/java/org/eh/web/controller/Test1Controller.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eh.web.controller;
-
-import org.eh.core.annotation.Controller;
-
-/**
- *
- * @author guojing
- * @date 2014-3-5
- */
-@Controller(name = "test1", url = "/test/mark")
-public class Test1Controller {
-
-}
diff --git a/src/test/java/org/eh/web/controller/TestController.java b/src/test/java/org/eh/web/controller/TestController.java
deleted file mode 100644
index cc53eb0..0000000
--- a/src/test/java/org/eh/web/controller/TestController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eh.web.controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eh.core.model.ResultInfo;
-import org.eh.core.web.controller.Controller;
-
-/**
- *
- * @author guojing
- * @date 2014-3-3
- */
-public class TestController implements Controller {
-
- public ResultInfo process(Map parms) {
- ResultInfo resultInfo = new ResultInfo();
- Map map = new HashMap();
- map.put("name", parms.get("name"));
- map.put("msg", parms.get("msg"));
-
- resultInfo.setResultMap(map);
- resultInfo.setView("test/myinfo");
- return resultInfo;
- }
-
-}
diff --git a/src/test/java/org/eh/web/view/test/myinfo.page b/src/test/java/org/eh/web/view/test/myinfo.page
deleted file mode 100644
index c7fbbc5..0000000
--- a/src/test/java/org/eh/web/view/test/myinfo.page
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- ${msg},${name}
-
-
\ No newline at end of file
diff --git a/target/classes/web.properties b/target/classes/web.properties
deleted file mode 100644
index 897b070..0000000
--- a/target/classes/web.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#包前缀
-PACKAGE_PREFIX=org.eh.web
-
-#模板页面根路径（相对classes文件夹,项目src/main/view下）
-VIEW_BASE_PATH=page
-
-#静态资源路劲（相对classes文件夹,项目src/main/view下）
-STATIC_RESOURCE_PATH=static
-
-#端口
-httpserver.port=8888
-
-#controller包路径，配置后可通过annocation直接配置
-controller.package=com.gj.web.controller
-
-#url与controller类对应关系
-#url/list=com.gj.web.controller.MyController
-
-#session超时时间(分钟)
-session_timeout = 10
\ No newline at end of file
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
deleted file mode 100644
index 87bbb17..0000000
--- a/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Mar 27 22:41:48 CST 2014
-version=0.0.1
-groupId=org.eh.http
-artifactId=easy-httpserver
Hello,${name}
+
+
+
\ No newline at end of file
diff --git a/src/main/view/static/js/test.js b/src/main/view/static/js/test.js
new file mode 100644
index 0000000..43d363e
--- /dev/null
+++ b/src/main/view/static/js/test.js
@@ -0,0 +1,3 @@
+function hello(){
+ console.log("hello!")
+}
\ No newline at end of file
diff --git a/src/main/view/static/pic/tx.jpg b/src/main/view/static/pic/tx.jpg
new file mode 100644
index 0000000..7bf50f3
Binary files /dev/null and b/src/main/view/static/pic/tx.jpg differ
diff --git a/src/test/java/org/eh/core/annotation/AnnotationHandlerTest.java b/src/test/java/org/eh/core/annotation/AnnotationHandlerTest.java
deleted file mode 100644
index fe2d5f5..0000000
--- a/src/test/java/org/eh/core/annotation/AnnotationHandlerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eh.core.annotation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.junit.Test;
-
-/**
- *
- * @author guojing
- * @date 2014-3-13
- */
-public class AnnotationHandlerTest {
-
- @Test
- @SuppressWarnings("rawtypes")
- public void testMethods() {
- try {
- Class c = Class.forName("org.eh.core.controller.Test1Controller");
- Method[] methods = c.getMethods();
- for (Method method : methods) {
- if (method.isAnnotationPresent(RequestMapping.class)) {
- System.out.println(method.getName());
- org.eh.core.web.controller.Controller controller = (org.eh.core.web.controller.Controller) c
- .newInstance();
- method.invoke(controller, new Object[] { null });
- }
- }
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Test
- public void testMethod() {
- try {
- Class c = Class.forName("org.eh.core.controller.Test1Controller");
- Method methods = c.getMethod("add", Map.class);
- System.out.println(methods.getName());
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (SecurityException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/test/java/org/eh/core/controller/Test1Controller.java b/src/test/java/org/eh/core/controller/Test1Controller.java
deleted file mode 100644
index 5e611ed..0000000
--- a/src/test/java/org/eh/core/controller/Test1Controller.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eh.core.controller;
-
-import java.util.Map;
-
-import org.eh.core.annotation.RequestMapping;
-import org.eh.core.web.controller.Controller;
-
-/**
- *
- * @author guojing
- * @date 2014-3-5
- */
-@org.eh.core.annotation.Controller(name = "test1", url = "/test/show")
-public class Test1Controller implements Controller {
-
- @RequestMapping
- public String add(Map