Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java

@@ -337,4 +337,19 @@ public class MonitorController {
         return Result.success(callCount);
     }
 
+    @GetMapping("/gateway-monitor/test/get")
+    public Result testGet(){
+        return Result.success(null);
+    }
+
+    @GetMapping("/gateway-monitor/test/404")
+    public void test404(HttpServletResponse response){
+        response.setStatus(404);
+    }
+
+    @GetMapping("/gateway-monitor/test/500")
+    public void test500(HttpServletResponse response){
+        response.setStatus(500);
+    }
+
 }