Procházet zdrojové kódy

update 优化 encrypt 加解密模块语法 简化代码消除警告

疯狂的狮子li před 3 roky
rodič
revize
6dad73d9de

+ 3 - 3
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java

@@ -55,11 +55,11 @@ public class MybatisDecryptInterceptor implements Interceptor {
      * @param sourceObject 待加密对象
      */
     private void decryptHandler(Object sourceObject) {
-        if (sourceObject instanceof Map) {
-            ((Map<?, Object>) sourceObject).values().forEach(this::decryptHandler);
+        if (sourceObject instanceof Map<?, ?>) {
+            ((Map<?, ?>) sourceObject).values().forEach(this::decryptHandler);
             return;
         }
-        if (sourceObject instanceof List) {
+        if (sourceObject instanceof List<?>) {
             // 判断第一个元素是否含有注解。如果没有直接返回,提高效率
             Object firstItem = ((List<?>) sourceObject).get(0);
             if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) {

+ 3 - 4
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java

@@ -65,13 +65,12 @@ public class MybatisEncryptInterceptor implements Interceptor {
      *
      * @param sourceObject 待加密对象
      */
-    @SuppressWarnings("unchecked cast")
     private void encryptHandler(Object sourceObject) {
-        if (sourceObject instanceof Map) {
-            ((Map<?, Object>) sourceObject).values().forEach(this::encryptHandler);
+        if (sourceObject instanceof Map<?, ?>) {
+            ((Map<?, ?>) sourceObject).values().forEach(this::encryptHandler);
             return;
         }
-        if (sourceObject instanceof List) {
+        if (sourceObject instanceof List<?>) {
             // 判断第一个元素是否含有注解。如果没有直接返回,提高效率
             Object firstItem = ((List<?>) sourceObject).get(0);
             if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) {