1

src/test/java/com/zksy/szpt/MainTest.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.zksy.szpt.domain.ListImageType;
 import com.zksy.szpt.domain.UploadImageDTO;
 import com.zksy.szpt.domain.dto.*;
+import com.zksy.szpt.util.HttpUtil;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -40,7 +41,7 @@ public class MainTest {
         xxRwwcqkDTO.setShsm("任务待完成");
         xxRwwcqkDTO.setMchid("333021");
 
-        TestHttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/index/updateXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
     }
 
@@ -77,7 +78,7 @@ public class MainTest {
         dto.setMchid("c449340a11e14638adf274bc7a8c6c7c");
 
 //        TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/xxZhxx/update", dto, XxZhxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxZhxx/update", dto, XxZhxxDTO.class);
     }
 
     /**
@@ -99,7 +100,7 @@ public class MainTest {
         dto.setBz("积分兑换");
         dto.setQbjlid("1");
 
-        TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/update", dto, XxZhjfbgDTO.class);
     }
 
@@ -114,7 +115,7 @@ public class MainTest {
         UploadImageDTO uploadImageDTO = new UploadImageDTO();
         uploadImageDTO.setImagePath("http://192.168.168.211/guoqing.jpg");
         uploadImageDTO.setImageType(ListImageType.FACE);
-        TestHttpUtil.signatureAndRequest("/rest/image/upload", uploadImageDTO, UploadImageDTO.class);
+        HttpUtil.signatureAndRequest("/rest/image/upload", uploadImageDTO, UploadImageDTO.class);
     }
 
     /**
@@ -147,7 +148,7 @@ public class MainTest {
         dto.setRwzt("1");
         dto.setRwlx("1");
         dto.setPictureUrls("https://pics5.baidu.com/feed/9825bc315c6034a8e54636072d08095b082376bf.jpeg@f_auto?token=98350f9a138414c8325ce9b265f43a9c,https://pics5.baidu.com/feed/9825bc315c6034a8e54636072d08095b082376bf.jpeg@f_auto?token=98350f9a138414c8325ce9b265f43a9c");
-        TestHttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/xxYjrw/update", dto, XxYjrwDTO.class);
     }
 
@@ -167,7 +168,7 @@ public class MainTest {
         dto.setYjdwmc("红色卫队");
         dto.setYjdwjs("红色卫队是一支由青年人组成的卫队");
         dto.setFid("-1");
-        TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/update", dto, XxYjdwdmDTO.class);
     }
 
@@ -180,7 +181,7 @@ public class MainTest {
         dto.setShxxyid("M15");
         dto.setYjdwdm("1dbcf7b68e6911eea13b000c293a2347");
 
-        TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/update", dto, XxShxxyDwDTO.class);
     }
 
@@ -226,7 +227,7 @@ public class MainTest {
         dto.setHfbz("");
         dto.setQbflid("70006015");
         dto.setShbz("1");
-        TestHttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/xxShxxy/update", dto, XxShxxyDTO.class);
     }
 
@@ -248,13 +249,13 @@ public class MainTest {
 //        String url = "xxZhxx/delete";
         CommonDelDTO delDTO=new CommonDelDTO();
         delDTO.setIds(ids);
-        TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/delete", dto, CommonDelParamDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/xxShxxy/delete", dto, CommonDelParamDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/delete", dto, CommonDelParamDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/xxYjrw/delete", dto, CommonDelParamDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/delete", dto, CommonDelParamDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/xxZhxx/delete", dto, CommonDelParamDTO.class);
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteXxRwwcqk", delDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxShxxyDw/delete", dto, CommonDelParamDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxShxxy/delete", dto, CommonDelParamDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxYjdwdm/delete", dto, CommonDelParamDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxYjrw/delete", dto, CommonDelParamDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxZhjfbg/delete", dto, CommonDelParamDTO.class);
+        HttpUtil.signatureAndRequest("/rest/xxZhxx/delete", dto, CommonDelParamDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteXxRwwcqk", delDTO, CommonDelDTO.class);
     }
 
 }

src/test/java/com/zksy/szpt/MainTestX.java → src/test/java/com/zksy/szpt/MainTest1.java

 package com.zksy.szpt;
 
-import com.zksy.szpt.domain.bo.SzptFwxxBO;
 import com.zksy.szpt.domain.dto.*;
+import com.zksy.szpt.util.HttpUtil;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -12,7 +12,7 @@ import java.util.Date;
 import java.util.List;
 
 @SpringBootTest()
-public class MainTestX {
+public class MainTest1 {
 
     /**
      * ===================================================考勤===================================================
@@ -23,7 +23,7 @@ public class MainTestX {
         SzptClockInQueryDTO szptClockInQueryDTO = new SzptClockInQueryDTO();
         szptClockInQueryDTO.setPageSize(10);
         szptClockInQueryDTO.setPageSize(1);
-        TestHttpUtil.signatureAndRequest("/rest/index/querySzptClockIn", szptClockInQueryDTO, SzptClockInQueryDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/querySzptClockIn", szptClockInQueryDTO, SzptClockInQueryDTO.class);
     }
 
     @Test
@@ -46,7 +46,7 @@ public class MainTestX {
             szptClockInDTO.setQtdkdd("1"+i);
             szptClockInDTO.setQtdkzp("1"+i);
             szptClockInDTO.setGkdj("1"+i);
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptClockIn", szptClockInDTO, SzptClockInDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptClockIn", szptClockInDTO, SzptClockInDTO.class);
         }
     }
 
@@ -69,7 +69,7 @@ public class MainTestX {
         szptClockInDTO.setQtdkdd("1");
         szptClockInDTO.setQtdkzp("1");
         szptClockInDTO.setGkdj("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptClockIn", szptClockInDTO, SzptClockInDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptClockIn", szptClockInDTO, SzptClockInDTO.class);
     }
 
     @Test
@@ -89,7 +89,7 @@ public class MainTestX {
         CommonDelIntDTO commonDelIntDTO = new CommonDelIntDTO();
         commonDelIntDTO.setIds(ids);
         commonDelIntDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptClockIn", commonDelIntDTO, CommonDelIntDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptClockIn", commonDelIntDTO, CommonDelIntDTO.class);
     }
 
     /**
@@ -101,7 +101,7 @@ public class MainTestX {
         SzptClockInRulesQueryDTO szptClockInRulesQueryDTO = new SzptClockInRulesQueryDTO();
         szptClockInRulesQueryDTO.setPageSize(10);
         szptClockInRulesQueryDTO.setPageSize(1);
-        TestHttpUtil.signatureAndRequest("/rest/index/querySzptClockInRules", szptClockInRulesQueryDTO, SzptClockInRulesQueryDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/querySzptClockInRules", szptClockInRulesQueryDTO, SzptClockInRulesQueryDTO.class);
     }
 
     @Test
@@ -118,7 +118,7 @@ public class MainTestX {
             szptClockInRulesDTO.setQrCode("1"+i);
             szptClockInRulesDTO.setCslx("123456"+i);
             szptClockInRulesDTO.setBz("123456"+i);
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptClockInRules", szptClockInRulesDTO, SzptClockInRulesDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptClockInRules", szptClockInRulesDTO, SzptClockInRulesDTO.class);
         }
     }
 
@@ -135,7 +135,7 @@ public class MainTestX {
         szptClockInRulesDTO.setQrCode("1");
         szptClockInRulesDTO.setCslx("123456");
         szptClockInRulesDTO.setBz("123456");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptClockInRules", szptClockInRulesDTO, SzptClockInRulesDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptClockInRules", szptClockInRulesDTO, SzptClockInRulesDTO.class);
     }
 
     @Test
@@ -148,7 +148,7 @@ public class MainTestX {
         CommonDelIntDTO commonDelIntDTO = new CommonDelIntDTO();
         commonDelIntDTO.setIds(ids);
         commonDelIntDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptClockInRules", commonDelIntDTO, CommonDelIntDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptClockInRules", commonDelIntDTO, CommonDelIntDTO.class);
     }
 
     /**
@@ -161,7 +161,7 @@ public class MainTestX {
 //        szptFwxxQueryDTO.setQyid();
         szptFwxxQueryDTO.setPageSize(10);
         szptFwxxQueryDTO.setPageSize(1);
-        TestHttpUtil.signatureAndRequest("/rest/index/querySzptFwxx", szptFwxxQueryDTO, SzptFwxxQueryDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/querySzptFwxx", szptFwxxQueryDTO, SzptFwxxQueryDTO.class);
     }
 
     @Test
@@ -208,7 +208,7 @@ public class MainTestX {
 //        szptFwxxDTO.setSjgsdwdm("330102");
 //        szptFwxxDTO.setSjgsdwmc("1");
         szptFwxxDTO.setFzzjzp("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/addSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/addSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
         }
     }
 
@@ -255,7 +255,7 @@ public class MainTestX {
 //        szptFwxxDTO.setSjgsdwdm("330102");
 //        szptFwxxDTO.setSjgsdwmc("1");
         szptFwxxDTO.setFzzjzp("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
     }
 
     @Test
@@ -267,7 +267,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptFwxx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptFwxx", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -287,7 +287,7 @@ public class MainTestX {
             szptGdCsyjhldxDTO.setYwms(i+"");
             szptGdCsyjhldxDTO.setBz(i+"");
             szptGdCsyjhldxDTO.setZt(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdCsyjhldx", szptGdCsyjhldxDTO, SzptGdCsyjhldxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptGdCsyjhldx", szptGdCsyjhldxDTO, SzptGdCsyjhldxDTO.class);
         }
     }
 
@@ -304,7 +304,7 @@ public class MainTestX {
         szptGdCsyjhldxDTO.setYwms("1");
         szptGdCsyjhldxDTO.setBz("123456");
         szptGdCsyjhldxDTO.setZt("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdCsyjhldx", szptGdCsyjhldxDTO, SzptGdCsyjhldxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptGdCsyjhldx", szptGdCsyjhldxDTO, SzptGdCsyjhldxDTO.class);
     }
 
     @Test
@@ -317,7 +317,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdCsyjhldx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptGdCsyjhldx", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -371,7 +371,7 @@ public class MainTestX {
             szptGdRyxxDTO.setDatasource(i+"");
             szptGdRyxxDTO.setOrderid(i+"");
             szptGdRyxxDTO.setSjrzrs(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdRyxx", szptGdRyxxDTO, SzptGdRyxxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptGdRyxx", szptGdRyxxDTO, SzptGdRyxxDTO.class);
         }
     }
 
@@ -422,7 +422,7 @@ public class MainTestX {
         szptGdRyxxDTO.setDatasource("1");
         szptGdRyxxDTO.setOrderid("1");
         szptGdRyxxDTO.setSjrzrs("123456");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdRyxx", szptGdRyxxDTO, SzptGdRyxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptGdRyxx", szptGdRyxxDTO, SzptGdRyxxDTO.class);
     }
 
     @Test
@@ -435,7 +435,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdRyxx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptGdRyxx", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -469,7 +469,7 @@ public class MainTestX {
 //        szptGdSbxxDTO.setSjgsdwmc("1");
             szptGdSbxxDTO.setCreateGajgjgdm(i+"");
             szptGdSbxxDTO.setCreateGajgmc(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
         }
     }
 
@@ -500,7 +500,7 @@ public class MainTestX {
 //        szptGdSbxxDTO.setSjgsdwmc("1");
         szptGdSbxxDTO.setCreateGajgjgdm("123");
         szptGdSbxxDTO.setCreateGajgmc("123");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
     }
 
     @Test
@@ -513,7 +513,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdSbxx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptGdSbxx", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -564,7 +564,7 @@ public class MainTestX {
 //        szptGdXxDTO.setSjgsdwmc("1");
             szptGdXxDTO.setCreateGajgjgdm(i+"");
             szptGdXxDTO.setCreateGajgmc(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
         }
     }
 
@@ -612,7 +612,7 @@ public class MainTestX {
 //        szptGdXxDTO.setSjgsdwmc("1");
         szptGdXxDTO.setCreateGajgjgdm("1");
         szptGdXxDTO.setCreateGajgmc("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
     }
 
     @Test
@@ -626,7 +626,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdXx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptGdXx", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -651,7 +651,7 @@ public class MainTestX {
             szptGdYjDTO.setCljg(i+"");
             szptGdYjDTO.setClrid(i+"");
             szptGdYjDTO.setClrxm(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdYj", szptGdYjDTO, SzptGdYjDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptGdYj", szptGdYjDTO, SzptGdYjDTO.class);
         }
     }
 
@@ -673,7 +673,7 @@ public class MainTestX {
         szptGdYjDTO.setCljg("123");
         szptGdYjDTO.setClrid("120.3");
         szptGdYjDTO.setClrxm("30");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdYj", szptGdYjDTO, SzptGdYjDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptGdYj", szptGdYjDTO, SzptGdYjDTO.class);
     }
 
     @Test
@@ -690,7 +690,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdYj", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptGdYj", commonDelDTO, CommonDelDTO.class);
     }
 
 
@@ -722,7 +722,7 @@ public class MainTestX {
 //        szptQyxxDTO.setSjgsdwmc("123");
             szptQyxxDTO.setCreateGajgjgdm(i+"");
             szptQyxxDTO.setCreateGajgmc(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
         }
     }
 
@@ -750,7 +750,7 @@ public class MainTestX {
 //        szptQyxxDTO.setSjgsdwmc("123");
         szptQyxxDTO.setCreateGajgjgdm("123");
         szptQyxxDTO.setCreateGajgmc("120.3");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
     }
 
     @Test
@@ -763,7 +763,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptQyxx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptQyxx", commonDelDTO, CommonDelDTO.class);
     }
 
 
@@ -792,7 +792,7 @@ public class MainTestX {
             szptXyzhDkxxDTO.setQttp(i+"");
             szptXyzhDkxxDTO.setCjsj(new Date());
             szptXyzhDkxxDTO.setGxsj(new Date());
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhDkxx", szptXyzhDkxxDTO, SzptXyzhDkxxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptXyzhDkxx", szptXyzhDkxxDTO, SzptXyzhDkxxDTO.class);
         }
     }
 
@@ -817,7 +817,7 @@ public class MainTestX {
         szptXyzhDkxxDTO.setQttp("1");
         szptXyzhDkxxDTO.setCjsj(new Date());
         szptXyzhDkxxDTO.setGxsj(new Date());
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhDkxx", szptXyzhDkxxDTO, SzptXyzhDkxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhDkxx", szptXyzhDkxxDTO, SzptXyzhDkxxDTO.class);
     }
 
     @Test
@@ -830,7 +830,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhDkxx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhDkxx", commonDelDTO, CommonDelDTO.class);
     }
 
 
@@ -846,7 +846,7 @@ public class MainTestX {
             szptXyzhKqmbDTO.setId(i+"");
             szptXyzhKqmbDTO.setMbmc(i+"");
             szptXyzhKqmbDTO.setZt(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhKqmb", szptXyzhKqmbDTO, SzptXyzhKqmbDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptXyzhKqmb", szptXyzhKqmbDTO, SzptXyzhKqmbDTO.class);
         }
     }
 
@@ -858,7 +858,7 @@ public class MainTestX {
         szptXyzhKqmbDTO.setId("2");
         szptXyzhKqmbDTO.setMbmc("22");
         szptXyzhKqmbDTO.setZt("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhKqmb", szptXyzhKqmbDTO, SzptXyzhKqmbDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhKqmb", szptXyzhKqmbDTO, SzptXyzhKqmbDTO.class);
     }
 
     @Test
@@ -871,7 +871,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhKqmb", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhKqmb", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -899,7 +899,7 @@ public class MainTestX {
             szptXyzhMbdhDTO.setGxrid(i+"");
             szptXyzhMbdhDTO.setGxrxm(i+"");
             szptXyzhMbdhDTO.setGxsj(new Date());
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhMbdh", szptXyzhMbdhDTO, SzptXyzhMbdhDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptXyzhMbdh", szptXyzhMbdhDTO, SzptXyzhMbdhDTO.class);
         }
     }
 
@@ -924,7 +924,7 @@ public class MainTestX {
         szptXyzhMbdhDTO.setGxrid("1");
         szptXyzhMbdhDTO.setGxrxm("1");
         szptXyzhMbdhDTO.setGxsj(new Date());
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhMbdh", szptXyzhMbdhDTO, SzptXyzhMbdhDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhMbdh", szptXyzhMbdhDTO, SzptXyzhMbdhDTO.class);
     }
 
     @Test
@@ -937,7 +937,7 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhMbdh", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhMbdh", commonDelDTO, CommonDelDTO.class);
     }
 
     /**
@@ -962,7 +962,7 @@ public class MainTestX {
             szptXyzhXyxxDTO.setDakafw(i);
             szptXyzhXyxxDTO.setKqmbid(i+"");
             szptXyzhXyxxDTO.setQrcode(i+"");
-            TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhXyxx", szptXyzhXyxxDTO, SzptXyzhXyxxDTO.class);
+            HttpUtil.signatureAndRequest("/rest/index/addSzptXyzhXyxx", szptXyzhXyxxDTO, SzptXyzhXyxxDTO.class);
         }
     }
 
@@ -984,7 +984,7 @@ public class MainTestX {
         szptXyzhXyxxDTO.setDakafw(1);
         szptXyzhXyxxDTO.setKqmbid("1");
         szptXyzhXyxxDTO.setQrcode("1");
-        TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhXyxx", szptXyzhXyxxDTO, SzptXyzhXyxxDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhXyxx", szptXyzhXyxxDTO, SzptXyzhXyxxDTO.class);
     }
 
     @Test
@@ -997,6 +997,6 @@ public class MainTestX {
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
 //        commonDelDTO.setSjgsdwdm("330102");
-        TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhXyxx", commonDelDTO, CommonDelDTO.class);
+        HttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhXyxx", commonDelDTO, CommonDelDTO.class);
     }
 }

src/test/java/com/zksy/szpt/TestAppStore.java

@@ -2,7 +2,7 @@ package com.zksy.szpt;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.zksy.szpt.domain.dto.*;
-import org.junit.jupiter.api.Assertions;
+import com.zksy.szpt.util.HttpUtil;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -30,7 +30,7 @@ public class TestAppStore {
         appStoreDTO.setDeptCode("330103");
 
 
-        TestHttpUtil.signatureAndRequest("/szptsjjs/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);
+        HttpUtil.signatureAndRequest("/szptsjjs/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);
 
 //        TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);
 //        TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO);
@@ -42,6 +42,6 @@ public class TestAppStore {
         AppStoreDTO appStoreDTO = new AppStoreDTO();
         appStoreDTO.setAppKey("us2");
         appStoreDTO.setAppSecret(DigestUtil.md5Hex("asdfasdfadf11"));
-        TestHttpUtil.signatureAndRequest("/rest/appStore/updateAppIdSecret", appStoreDTO, AppStoreDTO.class);
+        HttpUtil.signatureAndRequest("/rest/appStore/updateAppIdSecret", appStoreDTO, AppStoreDTO.class);
     }
 }

src/test/java/com/zksy/szpt/TestHttpUtil.java → src/test/java/com/zksy/szpt/util/HttpUtil.java

-package com.zksy.szpt;
+package com.zksy.szpt.util;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zksy.szpt.domain.CommonRequestDTO;
-import com.zksy.szpt.util.EncryptUtil;
-import com.zksy.szpt.util.SignatureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
-public class TestHttpUtil {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TestHttpUtil.class);
+public class HttpUtil {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(HttpUtil.class);
     final static String baseUrl = "https://demo.qmrzhz.cn:18030/szptsjjs";
 //    final static String baseUrl = "http://localhost:8086";