From 254e2e8ccd4fc7bf60b04657fef61f1f3f9a442d Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Fri, 25 Nov 2016 11:28:11 +0800 Subject: [PATCH] --- test/org/redkale/test/rest/HelloBean.java | 46 ++++++++++++++++--- test/org/redkale/test/rest/HelloService2.java | 12 ++--- .../test/rest/_DynHelloRestServlet1.java | 14 ++++++ .../test/rest/_DynHelloRestServlet2.java | 8 ++++ 4 files changed, 68 insertions(+), 12 deletions(-) diff --git a/test/org/redkale/test/rest/HelloBean.java b/test/org/redkale/test/rest/HelloBean.java index 1e479b448..fed43501d 100644 --- a/test/org/redkale/test/rest/HelloBean.java +++ b/test/org/redkale/test/rest/HelloBean.java @@ -8,9 +8,19 @@ public class HelloBean implements FilterBean { private int helloid; - @RestHeader(name = "hello-res") - private String res; + @RestHeader(name = "User-Agent") + private String useragent; //从Http Header中获取浏览器信息 + + @RestCookie(name = "hello-cookie") + private String rescookie; //从Cookie中获取名为hello-cookie的值 + @RestAddress + private String clientaddr; //客户端请求IP + + @RestSessionid + private String sessionid; //用户Sessionid, 未登录时为null + + /** 以下省略getter setter方法 */ public int getHelloid() { return helloid; } @@ -19,12 +29,36 @@ public class HelloBean implements FilterBean { this.helloid = helloid; } - public String getRes() { - return res; + public String getUseragent() { + return useragent; } - public void setRes(String res) { - this.res = res; + public void setUseragent(String useragent) { + this.useragent = useragent; + } + + public String getRescookie() { + return rescookie; + } + + public void setRescookie(String rescookie) { + this.rescookie = rescookie; + } + + public String getClientaddr() { + return clientaddr; + } + + public void setClientaddr(String clientaddr) { + this.clientaddr = clientaddr; + } + + public String getSessionid() { + return sessionid; + } + + public void setSessionid(String sessionid) { + this.sessionid = sessionid; } @Override diff --git a/test/org/redkale/test/rest/HelloService2.java b/test/org/redkale/test/rest/HelloService2.java index 22688f49c..178ad2f56 100644 --- a/test/org/redkale/test/rest/HelloService2.java +++ b/test/org/redkale/test/rest/HelloService2.java @@ -19,14 +19,14 @@ import org.redkale.util.Sheet; * HelloBean: Hellow模块实现FilterBean的过滤Bean类 * */ -@RestService(name = "hello", moduleid = 0, repair = true, ignore = false) +@RestService(name = "hello", moduleid = 0, repair = true, ignore = false, comment = "Hello服务模块") public class HelloService2 implements Service { @Resource private DataSource source; //增加记录 - @RestMapping(name = "create", auth = false) + @RestMapping(name = "create", auth = false, comment = "创建Hello对象") public RetResult createHello(UserInfo info, @RestParam(name = "bean") HelloEntity entity) { entity.setCreator(info == null ? 0 : info.getUserid()); //设置当前用户ID entity.setCreatetime(System.currentTimeMillis()); @@ -35,26 +35,26 @@ public class HelloService2 implements Service { } //删除记录 - @RestMapping(name = "delete", auth = false) + @RestMapping(name = "delete", auth = false, comment = "根据id删除Hello对象") public void deleteHello(@RestParam(name = "#") int id) { //通过 /hello/delete/1234 删除对象 source.delete(HelloEntity.class, id); } //修改记录 - @RestMapping(name = "update", auth = false) + @RestMapping(name = "update", auth = false, comment = "修改Hello对象") public void updateHello(@RestParam(name = "bean") HelloEntity entity) { //通过 /hello/update?bean={...} 修改对象 entity.setUpdatetime(System.currentTimeMillis()); source.update(entity); } //查询列表 - @RestMapping(name = "query", auth = false) + @RestMapping(name = "query", auth = false, comment = "修改Hello对象部分属性") public Sheet queryHello(@RestParam(name = "bean") HelloBean bean, Flipper flipper) { //通过 /hello/query/offset:0/limit:20?bean={...} 查询列表 return source.querySheet(HelloEntity.class, flipper, bean); } //查询单个 - @RestMapping(name = "find", auth = false) + @RestMapping(name = "find", auth = false, comment = "根据id查找单个Hello对象") public HelloEntity findHello(@RestParam(name = "#") int id) { //通过 /hello/find/1234 查询对象 return source.find(HelloEntity.class, id); } diff --git a/test/org/redkale/test/rest/_DynHelloRestServlet1.java b/test/org/redkale/test/rest/_DynHelloRestServlet1.java index 913a562d6..d5a09a237 100644 --- a/test/org/redkale/test/rest/_DynHelloRestServlet1.java +++ b/test/org/redkale/test/rest/_DynHelloRestServlet1.java @@ -46,6 +46,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { public void create(HttpRequest req, HttpResponse resp) throws IOException { HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setResname(req.getHeader("hello-res")); UserInfo user = currentUser(req); RetResult result = service.createHello(user, bean); resp.finishJson(result); @@ -66,6 +68,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); String clientaddr = req.getRemoteAddr(); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setResname(req.getHeader("hello-res")); service.updateHello(clientaddr, bean); resp.finishJson(RetResult.success()); } @@ -75,6 +79,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { public void partupdate(HttpRequest req, HttpResponse resp) throws IOException { HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setResname(req.getHeader("hello-res")); String[] cols = req.getJsonParameter(String[].class, "cols"); service.updateHello(bean, cols); resp.finishJson(RetResult.success()); @@ -85,6 +91,10 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { public void query(HttpRequest req, HttpResponse resp) throws IOException { HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloBean bean = req.getJsonParameter(HelloBean.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setUseragent(req.getHeader("User-Agent")); + bean.setRescookie(req.getCookie("hello-cookie")); + bean.setSessionid(req.getSessionid(false)); Flipper flipper = req.getFlipper(); Sheet result = service.queryHello(bean, flipper); resp.finishJson(result); @@ -95,6 +105,10 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { public void list(HttpRequest req, HttpResponse resp) throws IOException { HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloBean bean = req.getJsonParameter(HelloBean.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setUseragent(req.getHeader("User-Agent")); + bean.setRescookie(req.getCookie("hello-cookie")); + bean.setSessionid(req.getSessionid(false)); List result = service.queryHello(bean); resp.finishJson(result); } diff --git a/test/org/redkale/test/rest/_DynHelloRestServlet2.java b/test/org/redkale/test/rest/_DynHelloRestServlet2.java index 33de5bf98..58c7ce4a9 100644 --- a/test/org/redkale/test/rest/_DynHelloRestServlet2.java +++ b/test/org/redkale/test/rest/_DynHelloRestServlet2.java @@ -31,6 +31,8 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { public void create(HttpRequest req, HttpResponse resp) throws IOException { HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setResname(req.getHeader("hello-res")); UserInfo user = currentUser(req); RetResult result = service.createHello(user, bean); resp.finishJson(result); @@ -50,6 +52,8 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { public void update(HttpRequest req, HttpResponse resp) throws IOException { HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setResname(req.getHeader("hello-res")); service.updateHello(bean); resp.finishJson(RetResult.success()); } @@ -59,6 +63,10 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { public void query(HttpRequest req, HttpResponse resp) throws IOException { HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); HelloBean bean = req.getJsonParameter(HelloBean.class, "bean"); + bean.setClientaddr(req.getRemoteAddr()); + bean.setUseragent(req.getHeader("User-Agent")); + bean.setRescookie(req.getCookie("hello-cookie")); + bean.setSessionid(req.getSessionid(false)); Flipper flipper = req.getFlipper(); Sheet result = service.queryHello(bean, flipper); resp.finishJson(result);