test/org/redkale/test/rest/SimpleRestServlet.java

@@ -6,7 +6,6 @@ import javax.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.service.RetResult;
 
-@HttpUserType(UserInfo.class)
 public class SimpleRestServlet extends HttpServlet {
 
     protected static final RetResult RET_UNLOGIN = RetCodes.retResult(RetCodes.RET_USER_UNLOGIN);
@@ -19,20 +18,20 @@ public class SimpleRestServlet extends HttpServlet {
     @Override
     public void preExecute(HttpRequest request, HttpResponse response) throws IOException {
         final String sessionid = request.getSessionid(true);
-        if (sessionid != null) request.setCurrentUser(userService.current(sessionid));
+        if (sessionid != null) {
+            UserInfo user = userService.current(sessionid);
+            if (user != null) request.setCurrentUserid(user.getUserid());
+        }
         response.nextEvent();
     }
 
     //普通鉴权
     @Override
     public void authenticate(HttpRequest request, HttpResponse response) throws IOException {
-        UserInfo info = request.currentUser();
-        if (info == null) {
+        int userid = request.currentUserid(int.class);
+        if (userid < 1) {
             response.finishJson(RET_UNLOGIN);
             return;
-        } else if (!info.checkAuth(request.getModuleid(), request.getActionid())) {
-            response.finishJson(RET_AUTHILLEGAL);
-            return;
         }
         response.nextEvent();
     }

test/org/redkale/test/rest/_DynHelloRestServlet1.java

@@ -13,10 +13,10 @@ import org.redkale.util.AnyValue.DefaultAnyValue;
 public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @Resource
-    private HelloService _service;
+    private HelloService _redkale_service;
 
     @Resource
-    private Map<String, HelloService> _servicemap;
+    private Map<String, HelloService> _redkale_servicemap;
 
     public static void main(String[] args) throws Throwable {
         final int port = 8888;
@@ -61,7 +61,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/create", auth = false)
     public void create(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -72,7 +72,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/delete/", auth = false)
     public void delete(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         service.deleteHello(id);
         resp.finishJson(RetResult.success());
@@ -80,7 +80,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/update", auth = false)
     public void update(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         String clientaddr = req.getRemoteAddr();
         HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean");
         bean.setClientaddr(req.getRemoteAddr());
@@ -91,7 +91,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/partupdate", auth = false)
     public void partupdate(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -102,7 +102,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/query", auth = false)
     public void query(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -115,7 +115,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/list", auth = false)
     public void list(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -127,7 +127,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/find/", auth = false)
     public void find(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         HelloEntity bean = service.findHello(id);
         resp.finishJson(bean);
@@ -135,21 +135,21 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet {
 
     @HttpMapping(url = "/hello/asyncfind/", auth = false)
     public void asyncfind(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         resp.finishJson(service.asyncFindHello(id));
     }
 
     @HttpMapping(url = "/hello/asyncfind2/", auth = false)
     public void asyncfind2(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         service.asyncFindHello(resp.createAsyncHandler(), id);
     }
 
     @HttpMapping(url = "/hello/asyncfind3/", auth = false)
     public void asyncfind3(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         service.asyncFindHello(resp.createAsyncHandler(HelloAsyncHandler.class), id);
     }

test/org/redkale/test/rest/_DynHelloRestServlet2.java

@@ -21,15 +21,15 @@ import org.redkale.util.*;
 public class _DynHelloRestServlet2 extends SimpleRestServlet {
 
     @Resource
-    private HelloService2 _service;
+    private HelloService2 _redkale_service;
 
     @Resource
-    private Map<String, HelloService2> _servicemap;
+    private Map<String, HelloService2> _redkale_servicemap;
 
     @HttpMapping(url = "/hello/create", auth = false, comment = "创建Hello对象")
     @HttpParam(name = "bean", type = HelloEntity.class, comment = "Hello对象")
     public void create(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -43,7 +43,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet {
     @HttpMapping(url = "/hello/delete/", auth = false, comment = "根据id删除Hello对象")
     @HttpParam(name = "#", type = int.class, comment = "Hello对象id")
     public void delete(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         service.deleteHello(id);
         resp.finishJson(RetResult.success());
@@ -52,7 +52,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet {
     @HttpMapping(url = "/hello/update", auth = false, comment = "修改Hello对象")
     @HttpParam(name = "bean", type = HelloEntity.class, comment = "Hello对象")
     public void update(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -65,7 +65,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet {
     @HttpMapping(url = "/hello/query", auth = false, comment = "查询Hello对象列表")
     @HttpParam(name = "bean", type = HelloBean.class, comment = "过滤条件")
     public void query(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_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"));
@@ -79,7 +79,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet {
     @HttpMapping(url = "/hello/find/", auth = false, comment = "根据id删除Hello对象")
     @HttpParam(name = "#", type = int.class, comment = "Hello对象id")
     public void find(HttpRequest req, HttpResponse resp) throws IOException {
-        HelloService2 service = _servicemap == null ? _service : _servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
+        HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, ""));
         int id = Integer.parseInt(req.getRequstURILastPath());
         HelloEntity bean = service.findHello(id);
         resp.finishJson(bean);