Merge branch 'dev' into 'test'

返回体加密bug修改

See merge request !12

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java

@@ -80,6 +80,7 @@ public class BindInfoControlller extends BaseController {
      */
      */
     @PostMapping( "unbind" )
     @PostMapping( "unbind" )
     @BodyDecryptAnnotation
     @BodyDecryptAnnotation
+    @ResponseEncryptAnnotation
     public Result unbindInfo( @RequestBody @Validated UnBindReq req ) {
     public Result unbindInfo( @RequestBody @Validated UnBindReq req ) {
         Result result = null;
         Result result = null;
         try {
         try {

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/intercept/EncryptResponseBodyAdvice.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hikcreate.common.sdk.response.apiparam.Response;
 import com.hikcreate.common.sdk.response.apiparam.Response;
 import com.hikcreate.common.sdk.response.statuscode.StatusCode;
 import com.hikcreate.common.sdk.response.statuscode.StatusCode;
 import com.hikcreate.edl.common.sdk.util.EncryptStringAes;
 import com.hikcreate.edl.common.sdk.util.EncryptStringAes;
+import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result;
 import com.hikcreate.edl.pub.web.mobile.infra.core.annotatiion.ResponseEncryptAnnotation;
 import com.hikcreate.edl.pub.web.mobile.infra.core.annotatiion.ResponseEncryptAnnotation;
 import com.hikcreate.edl.pub.web.mobile.infra.core.configbean.SignKeyConfigBean;
 import com.hikcreate.edl.pub.web.mobile.infra.core.configbean.SignKeyConfigBean;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.BaseEncryptRes;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.BaseEncryptRes;
@@ -42,8 +43,8 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
     public Object beforeBodyWrite( Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse ) {
     public Object beforeBodyWrite( Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse ) {
         try {
         try {
             log.info("Result body 明文: {}", objectMapper.writeValueAsString(o));
             log.info("Result body 明文: {}", objectMapper.writeValueAsString(o));
-            if ( methodParameter.getMethod().isAnnotationPresent(ResponseEncryptAnnotation.class) && o instanceof Response ) {
-                Response<Object> result = (Response<Object>) o;
+            if ( methodParameter.getMethod().isAnnotationPresent(ResponseEncryptAnnotation.class) && o instanceof Result ) {
+                Result<Object> result = (Result<Object>) o;
                 if ( StatusCode.SUCCESS.getCode() == (result.getCode()) ) {
                 if ( StatusCode.SUCCESS.getCode() == (result.getCode()) ) {
                     //进行加密
                     //进行加密
                     Object data = result.getData();
                     Object data = result.getData();