feat(口腔医院): 加密

eitc-common/src/main/java/com/eitc/common/filter/CustomResponseBodyAdviceAdapter.java

@@ -1,60 +1,54 @@
 package com.eitc.common.filter;
 
 import com.alibaba.fastjson2.JSON;
+import com.eitc.common.annotation.IgnoreReturnResultEncryption;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.core.page.TableDataInfo;
 import com.eitc.common.utils.CryptoUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-import java.util.Map;
-
-
-
-
-
-
-
-
+import java.lang.reflect.Method;
+import java.util.Objects;
 
 
 @ControllerAdvice
+@Slf4j
 public class CustomResponseBodyAdviceAdapter implements ResponseBodyAdvice<Object> {
 
     @Override
     public boolean supports(MethodParameter returnType, Class converterType) {
-        // 这里可以根据需要判断是否需要拦截，例如只拦截特定的Controller的方法
-        return true;
+        Method method = returnType.getMethod();
+        assert method != null;
+        IgnoreReturnResultEncryption ra = method.getAnnotation(IgnoreReturnResultEncryption.class);
+        return Objects.isNull(ra);
     }
 
     @Override
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
-        // 这里可以对body进行处理，比如添加公共字段，或者修改返回格式等
-        if (body instanceof String) {
-            return "Custom: " + body;
-        } else if (body instanceof ResponseEntity) {
-            ResponseEntity<?> responseEntity = (ResponseEntity<?>) body;
-            Object originalBody = responseEntity.getBody();
-            return ResponseEntity.ok("Custom: " + originalBody);
-        }else if (body instanceof AjaxResult) {
+        if (body instanceof AjaxResult) {
             AjaxResult ajaxResult = (AjaxResult) body;
-//            String encrypt = CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
-//            AjaxResult ajaxResult2 = new AjaxResult(200, "success", encrypt);
-//            return ajaxResult2;
-            return ajaxResult;
-        }else if (body instanceof TableDataInfo){
+            try {
+                return CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
+            } catch (Exception e) {
+                log.error("AjaxResult加密失败：" + body, e);
+                return ajaxResult;
+            }
+        } else if (body instanceof TableDataInfo) {
             TableDataInfo tableDataInfo = (TableDataInfo) body;
-//            AjaxResult ajaxResult = new AjaxResult(200, "success", CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo)));
-//            return ajaxResult;
-            return tableDataInfo;
+            try {
+                return CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo));
+            } catch (Exception e) {
+                log.error("TableDataInfo加密失败：" + body, e);
+                return tableDataInfo;
+            }
         }
-        System.out.println(body);
         return body;
     }
 }

eitc-common/src/main/java/com/eitc/common/filter/RepeatableFilter.java

@@ -1,12 +1,12 @@
 package com.eitc.common.filter;
 
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.TypeReference;
 import com.eitc.common.config.ParameterRequestWrapper;
 import com.eitc.common.constant.HttpConst;
 import com.eitc.common.utils.CryptoUtil;
 import com.eitc.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 
 import javax.servlet.Filter;
@@ -20,25 +20,15 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 
-
-
-
-
-
-
-
-
 /**
  * Repeatable 过滤器
  *
  * @author eitc
  */
+@Slf4j
 public class RepeatableFilter implements Filter {
 
     private static final String DECRYPT_PARAM_NAME = "decrypt";//请求参数包含的是否加密的字段
@@ -57,7 +47,7 @@ public class RepeatableFilter implements Filter {
         HttpServletResponse res = (HttpServletResponse) response;
         {
             String contentType = req.getContentType();//获取contentType请求头
-            if(StringUtils.isNotBlank(contentType)){
+            if (StringUtils.isNotBlank(contentType)) {
                 String method = req.getMethod();//获取请求方法  post/get
                 //2 处理post请求  只处理application/x-www-form-urlencoded  application/json,对于multipart/form-data，直接放行
                 if (method.trim().equalsIgnoreCase(HttpConst.POST_METHOD) || method.trim().equalsIgnoreCase(HttpConst.PUT_METHOD)) {
@@ -68,7 +58,7 @@ public class RepeatableFilter implements Filter {
                     //处理application/x-www-form-urlencoded
                     if (contentType.trim().toLowerCase().contains(HttpConst.FORM_URLENCODED_CONTENT_TYPE)) {
                         String decrypt = request.getParameter(DECRYPT_PARAM_NAME);
-                        if(decrypt==null||decrypt.trim().isEmpty()){
+                        if (decrypt == null || decrypt.trim().isEmpty()) {
                             chain.doFilter(request, response);
                             return;
                         }
@@ -78,25 +68,36 @@ public class RepeatableFilter implements Filter {
                     //处理application/json
                     if (contentType.trim().toLowerCase().contains(HttpConst.JSON_CONTENT_TYPE)) {
                         ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper(req);
-    //                    String collect = requestWrapper.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
-    //                    // 解密
-    //                    String decrypt = CryptoUtil.decrypt(collect);
-    //                    System.out.println(decrypt);
-    //                    byte[] bytes = decrypt.getBytes(StandardCharsets.UTF_8);
-    //                    ByteArrayOutputStream binaryStream = new ByteArrayOutputStream();
-    //                    try {
-    //                        binaryStream.write(bytes);
-    //                        byte[] byteArray = binaryStream.toByteArray();
-    //                        requestWrapper.setInputStream(byteArray);
-    //                    } catch (IOException e) {
-    //                        e.printStackTrace();
-    //                    } finally {
-    //                        try {
-    //                            binaryStream.close();
-    //                        } catch (IOException e) {
-    //                            e.printStackTrace();
-    //                        }
-    //                    }
+                        try {
+                            String collect = requestWrapper.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+                            // 解密
+                            String decrypt = CryptoUtil.decrypt(collect);
+                            String jsonString = null;
+                            try {
+                                JSONObject parseObject = JSONObject.parseObject(decrypt);
+                                jsonString = parseObject.toJSONString();
+                            } catch (Exception e) {
+                                JSONArray jsonArray = JSONArray.parseArray(decrypt);
+                                jsonString = jsonArray.toJSONString();
+                            }
+                            byte[] bytes = jsonString.getBytes(StandardCharsets.UTF_8);
+                            ByteArrayOutputStream binaryStream = new ByteArrayOutputStream();
+                            try {
+                                binaryStream.write(bytes);
+                                byte[] byteArray = binaryStream.toByteArray();
+                                requestWrapper.setInputStream(byteArray);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            } finally {
+                                try {
+                                    binaryStream.close();
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        } catch (Exception e) {
+                            log.error("解密失败：" + req.getContextPath(), e);
+                        }
                         chain.doFilter(requestWrapper, response);
                         return;
                     }
@@ -117,91 +118,6 @@ public class RepeatableFilter implements Filter {
         }
     }
 
-
-    /**
-     * 字符串解密
-     *
-     * @param value
-     * @return
-     */
-    public String decryptParam(String value, String decryptType) {
-        if (decryptType.trim().equalsIgnoreCase(DEFAULT_DECRYPT_TYPE)) {
-//            return AESCipher.decryptAES(value,AESCipher.KEY);
-            return "111";
-        } else {
-            return value + "+++";
-        }
-
-    }
-
-    /**
-     * 普通的post/get请求
-     *
-     * @param parameterMap
-     */
-    public Map<String, String[]> decryptParamForNormalRequest(Map<String, String[]> parameterMap, String decryptType) {
-        Map<String, String[]> decryptMap = new HashMap<>();
-        if (parameterMap == null || parameterMap.size() == 0) {
-            return decryptMap;
-        }
-        for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-            String key = entry.getKey();
-            if (key == null || key.trim().equalsIgnoreCase(DECRYPT_PARAM_NAME)) {
-                continue;
-            }
-            String[] value = entry.getValue();
-            //String decryptKey = decodeParam(key,decryptType);
-            String[] decryptValue = null;
-            if (value != null && value.length > 0) {
-                decryptValue = new String[value.length];
-                for (int i = 0; i < value.length; i++) {
-                    decryptValue[i] = decryptParam(value[i], decryptType);
-                }
-            }
-            decryptMap.put(key, decryptValue);
-        }
-        //打印用
-        StringBuffer printStr = new StringBuffer();
-        for (Map.Entry<String, String[]> entry1 : decryptMap.entrySet()) {
-            printStr.append(entry1.getKey()).append("=").append(Arrays.asList(entry1.getValue())).append("&");
-        }
-        System.out.println("ParamsFilter:发送的请求参数:" + JSON.toJSONString(printStr));
-        return decryptMap;
-    }
-
-    /**
-     * post的application/json请求
-     *
-     * @param body
-     */
-    public String decryptParamForPostJsonRequest(String body, String decryptType) {
-        String decryptBody = "{}";
-        if (body == null || body.trim().isEmpty() || body.trim().equalsIgnoreCase("{}") || !body.trim().contains(":")) {
-            return decryptBody;
-        }
-        Map<String, Object> map = JSON.parseObject(body, new TypeReference<Map<String, Object>>() {
-        });
-        if (map == null || map.size() == 0) {
-            return decryptBody;
-        }
-        Map<String, Object> decryptMap = new HashMap<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            String key = entry.getKey();
-            if (key == null || key.trim().equalsIgnoreCase(DECRYPT_PARAM_NAME)) {
-                continue;
-            }
-            Object value = entry.getValue();
-            String valueStr = String.valueOf(value);
-            if (valueStr == null || valueStr.trim().isEmpty() || valueStr.trim().equalsIgnoreCase("null")) {
-                valueStr = null;
-            }
-            decryptMap.put(key, decryptParam(valueStr, decryptType));
-        }
-        decryptBody = JSON.toJSONString(decryptMap);
-        System.out.println("ParamsFilter:发送的请求参数:" + decryptBody);
-        return decryptBody;
-    }
-
     @Override
     public void destroy() {
 

eitc-patient-app/src/main/java/com/eitc/patient/controller/ApiAppController.java

@@ -7,6 +7,7 @@ import com.eitc.common.annotation.Log;
 import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.enums.BusinessType;
+import com.eitc.common.utils.CryptoUtil;
 import com.eitc.common.utils.InterfaceVerificationUtil;
 import com.eitc.patient.domain.AppUser;
 import com.eitc.patient.domain.ProtocolTemplate;
@@ -81,7 +82,7 @@ public class ApiAppController extends BaseController {
         String saSignStr = InterfaceVerificationUtil.getSaSignStr(new HashMap<>());
         String url = fileUrl + "api/sys/clinict/appGetClinictList?" + saSignStr;
         String object = restTemplate.getForObject(url, String.class);
-        return JSONObject.parseObject(object, AjaxResult.class);
+        return JSONObject.parseObject(CryptoUtil.decrypt(object), AjaxResult.class);
     }
 
     /**