Merge branch 'mazq-gmverify-0512' into 'release/v2.1.0-beta'

国密加密、签名接口提供

See merge request dcuc-tjdsj/duceap-service!8

dcuc-duceap-api/src/main/java/com/dragoninfo/dcuc/duceap/facade/IGmSignFacade.java

@@ -59,6 +59,7 @@ public interface IGmSignFacade {
      * @param digest 摘要数据
      * @return
      */
+    @GetMapping(value = "gmSm3Verify")
     ResponseStatus gmSm3Verify(@RequestParam("origin") String origin, @RequestParam("digest") String digest);
 
     /**
@@ -67,6 +68,7 @@ public interface IGmSignFacade {
      * @param encode 加密数据
      * @return
      */
+    @GetMapping(value = "gmSm4Decode")
     ResponseDTO<String> gmSm4Decode(@RequestParam("encode") String encode);
 
     /**
@@ -75,6 +77,7 @@ public interface IGmSignFacade {
      * @param origin 原文数据
      * @return
      */
+    @GetMapping(value = "gmSm4Encode")
     ResponseDTO<String> gmSm4Encode(@RequestParam("origin") String origin);
 
     /**
@@ -83,7 +86,8 @@ public interface IGmSignFacade {
      * @param origin 原文
      * @return 签名
      */
-    ResponseDTO<String> gmSm2Sign(String origin);
+    @GetMapping(value = "gmSm2Sign")
+    ResponseDTO<String> gmSm2Sign(@RequestParam("origin") String origin);
 
     /**
      * 生成SM3摘要
@@ -91,5 +95,6 @@ public interface IGmSignFacade {
      * @param origin 原文
      * @return 摘要
      */
-    ResponseDTO<String> gmSm3Digest(String origin);
+    @GetMapping(value = "gmSm3Digest")
+    ResponseDTO<String> gmSm3Digest(@RequestParam("origin") String origin);
 }

dcuc-duceap-service/src/test/com.dragoninfo.dcuc.duceap/GMSignTest.java

@@ -1,88 +0,0 @@
-package com.dragoninfo.dcuc.duceap;
-
-import com.alibaba.fastjson.JSON;
-import com.dragoninfo.dcuc.duceap.facade.IGmSignFacade;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.smtools.enums.SM2SignStrategy;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * @author mazq
- * @date 2021/5/11
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = DcucDceapApplication.class)
-public class GMSignTest {
-
-    private String codeId = "DM_ROLE_LEVEL";
-    private String origin = "部级0";
-    private String digest = "56F1BC32905E350680226324BC27DE7F1F0C49A4A303F7810344165D58712598";
-    private String sign = "3044022058BE9306F6442C8003AABD0FA59F1B5414346384ACEFAFCE9161BB4E580BC99102202681B7E3230016793B6BB257958E398E413455070F59EC1EAD0F657420C367E9";
-    private String encode = "teeR/VVEAq4f35mnSa8pzw==";
-
-    @Autowired
-    IGmSignFacade gmSignFacade;
-
-    @Autowired
-    SM2SignStrategy sm2SignStrategy;
-
-
-    @Test
-    public void gmSm2Sign(){
-        String sign = sm2SignStrategy.sign(origin);
-        System.out.println(sign);
-    }
-
-    @Test
-    public void codeGmCheck(){
-        ResponseStatus responseStatus = gmSignFacade.codeGmCheck(codeId);
-        System.out.println(JSON.toJSONString(responseStatus));
-    }
-
-    @Test
-    public void codeGmCheckCodes(){
-        ResponseStatus responseStatus = gmSignFacade.codeGmCheckCodes(codeId);
-        System.out.println(JSON.toJSONString(responseStatus));
-
-    }
-
-    @Test
-    public void codeGmSign(){
-        ResponseStatus responseStatus = gmSignFacade.codeGmSign(codeId);
-        System.out.println(JSON.toJSONString(responseStatus));
-
-    }
-
-
-    @Test
-    public void gmSm2Verify(){
-        ResponseStatus responseStatus = gmSignFacade.gmSm2Verify(origin, sign);
-        System.out.println(JSON.toJSONString(responseStatus));
-    }
-
-
-    @Test
-    public void gmSm3Verify(){
-        ResponseStatus responseStatus = gmSignFacade.gmSm3Verify(origin, digest);
-        System.out.println(JSON.toJSONString(responseStatus));
-
-    }
-
-    @Test
-    public void gmSm4Encode(){
-        ResponseStatus responseStatus = gmSignFacade.gmSm4Encode(origin);
-        System.out.println(JSON.toJSONString(responseStatus));
-    }
-
-
-    @Test
-    public void gmSm4Decode(){
-        ResponseStatus responseStatus = gmSignFacade.gmSm4Decode(encode);
-        System.out.println(JSON.toJSONString(responseStatus));
-    }
-
-}

dcuc-duceap-service/src/test/com/dragoninfo/dcuc/duceap/facade/GMSignTest.java

@@ -0,0 +1,111 @@
+package com.dragoninfo.dcuc.duceap;
+
+import com.dragonsoft.smtools.enums.SM2SignStrategy;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * @author mazq
+ * @date 2021/5/11
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = DcucDceapApplication.class)
+@WebAppConfiguration
+public class GMSignTest {
+
+    private String baseUrl = "/duceapsvr/v2/gmSignFacade";
+    private String codeId = "DM_ROLE_LEVEL";
+    private String origin = "部级0";
+    private String digest = "56F1BC32905E350680226324BC27DE7F1F0C49A4A303F7810344165D58712598";
+    private String sign = "3044022058BE9306F6442C8003AABD0FA59F1B5414346384ACEFAFCE9161BB4E580BC99102202681B7E3230016793B6BB257958E398E413455070F59EC1EAD0F657420C367E9";
+    private String encode = "teeR/VVEAq4f35mnSa8pzw==";
+
+    public MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Before
+    public void setup() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+    }
+
+
+    @Test
+    public void gmSm2Sign() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/gmSm2Sign").param("origin", this.origin));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+    @Test
+    public void gmSm3Digest() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/gmSm3Digest").param("origin", this.origin));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+    @Test
+    public void codeGmCheck() throws Exception{
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/codeGmCheck").param("codeId", this.codeId));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+    @Test
+    public void codeGmCheckCodes() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/codeGmCheckCodes").param("codeIds", codeId));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+    @Test
+    public void codeGmSign() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/codeGmSign").param("codeId", this.codeId));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+
+    @Test
+    public void gmSm2Verify() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/sm2Verify").param("origin", origin).param("sign", sign));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+
+    @Test
+    public void gmSm3Verify() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/gmSm3Verify"));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+    @Test
+    public void gmSm4Encode() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/gmSm4Encode").param("origin", this.origin));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+
+    @Test
+    public void gmSm4Decode() throws Exception {
+        ResultActions perform = mockMvc.perform(MockMvcRequestBuilders.get(baseUrl + "/gmSm4Decode").param("encode", this.encode));
+        perform.andReturn().getResponse().setCharacterEncoding("UTF-8");
+        perform.andDo(MockMvcResultHandlers.print());
+    }
+
+}

dcuc-duceap-service/src/test/com/dragoninfo/dcuc/duceap/facade/IGmSignFacadeTest.java

@@ -1,25 +0,0 @@
-package com.dragoninfo.dcuc.duceap.facade;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author huangzqa
- * @date 2021/5/12
- */
-class IGmSignFacadeTest {
-
-
-    @Test
-    void gmSm2Sign() throws Exception {
-
-
-    }
-
-    @Test
-    void gmSm3Digest() {
-    }
-}