Merge remote-tracking branch 'origin/master'

liuhaonan

2022-01-13 05b0595cdd7fad54e2b3c7a5e2bd7d77b2d4c10b

 ximon-admin/src/test/java/com/sandu/ximon/admin/base/BaseTest.java

@@ -37,7 +37,7 @@
    }


    public void checkPost(String url,Object param) throws Exception{
    public JSONObject checkPost(String url,Object param) throws Exception{
        MockHttpServletRequestBuilder builder = BaseMockMvcRequestBuilders.post(url);
        if(param != null){
            builder.content((new ObjectMapper()).valueToTree(param).toString());//请求的参数
@@ -48,9 +48,10 @@
        resultActions.andDo(print());
        //对数据进行预期的判断
        Assert.assertEquals("20000", response.getString("code"));
        return  response;
    }

    public void checkGet(String url) throws Exception{
    public JSONObject checkGet(String url) throws Exception{
        MockHttpServletRequestBuilder builder = BaseMockMvcRequestBuilders.get(url);
        ResultActions resultActions = mockMvc.perform(builder);
        JSONObject response = ResultActionsUtil.getResponse(resultActions);
@@ -58,5 +59,6 @@
        resultActions.andDo(print());
        //对数据进行预期的判断
        Assert.assertEquals("20000", response.getString("code"));
        return  response;
    }
}