bugfix：一对一关联字典获取

orange-admin-service/common/common-core/src/main/java/com/orange/admin/common/core/base/service/BaseService.java

@@ -1,13 +1,14 @@
-package com.orange.admin.common.core.base.service;
+package com.demo.single.common.core.base.service;
 
-import com.orange.admin.common.core.annotation.*;
+import com.demo.single.common.core.annotation.*;
-import com.orange.admin.common.core.base.dao.BaseDaoMapper;
+import com.demo.single.common.core.base.dao.BaseDaoMapper;
-import com.orange.admin.common.core.constant.AggregationType;
+import com.demo.single.common.core.constant.AggregationType;
-import com.orange.admin.common.core.constant.GlobalDeletedFlag;
+import com.demo.single.common.core.constant.GlobalDeletedFlag;
-import com.orange.admin.common.core.exception.MyRuntimeException;
+import com.demo.single.common.core.exception.MyRuntimeException;
-import com.orange.admin.common.core.object.*;
+import com.demo.single.common.core.object.*;
-import com.orange.admin.common.core.util.ApplicationContextHolder;
+import com.demo.single.common.core.util.AopTargetUtil;
-import com.orange.admin.common.core.util.MyModelUtil;
+import com.demo.single.common.core.util.ApplicationContextHolder;
+import com.demo.single.common.core.util.MyModelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -33,7 +34,7 @@ import static java.util.stream.Collectors.*;
  * @param <M> Model对象的类型。
  * @param <K> Model对象主键的类型。
  * @author Stephen.Liu
- * @date 2020-05-24
+ * @date 2020-05-22
  */
 @Slf4j
 public abstract class BaseService<M, K> {
@@ -784,10 +785,13 @@ public abstract class BaseService<M, K> {
                 // 仅仅当需要加载从表字典关联时，才去加载。
                 if (withDict && relationStruct.relationOneToOne.loadSlaveDict()
                         && CollectionUtils.isNotEmpty(relationList)) {
+                    @SuppressWarnings("unchecked")
+                    BaseService<Object, Object> proxyTarget =
+                            (BaseService<Object, Object>) AopTargetUtil.getTarget(relationService);
                     // 关联本地字典。
-                    relationService.buildDictForDataList(relationList, false);
+                    proxyTarget.buildDictForDataList(relationList, false);
                     // 关联常量字典
-                    relationService.buildConstDictForDataList(relationList);
+                    proxyTarget.buildConstDictForDataList(relationList);
                 }
             }
         }
@@ -811,10 +815,13 @@ public abstract class BaseService<M, K> {
                 ReflectUtil.setFieldValue(dataObject, relationStruct.relationField, relationObject);
                 // 仅仅当需要加载从表字典关联时，才去加载。
                 if (withDict && relationStruct.relationOneToOne.loadSlaveDict() && relationObject != null) {
+                    @SuppressWarnings("unchecked")
+                    BaseService<Object, Object> proxyTarget =
+                            (BaseService<Object, Object>) AopTargetUtil.getTarget(relationService);
                     // 关联本地字典
-                    relationService.buildDictForData(relationObject, false);
+                    proxyTarget.buildDictForData(relationObject, false);
                     // 关联常量字典
-                    relationService.buildConstDictForData(relationObject);
+                    proxyTarget.buildConstDictForData(relationObject);
                 }
             }
         }

orange-admin-service/common/common-core/src/main/java/com/orange/admin/common/core/util/AopTargetUtil.java

@@ -0,0 +1,57 @@
+package com.demo.single.common.core.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AdvisedSupport;
+import org.springframework.aop.framework.AopProxy;
+import org.springframework.aop.support.AopUtils;
+
+import java.lang.reflect.Field;
+
+/**
+ * 获取JDK动态代理/CGLIB代理对象代理的目标对象的工具类。
+ *
+ * @author Stephen.Liu
+ * @date 2020-05-22
+ */
+@Slf4j
+public class AopTargetUtil {
+    /**
+     * 获取 目标对象
+     *
+     * @param proxy 代理对象
+     * @return 代理的target对象。
+     */
+    public static Object getTarget(Object proxy) {
+        if (!AopUtils.isAopProxy(proxy)) {
+            return proxy;
+        }
+        try {
+            if (AopUtils.isJdkDynamicProxy(proxy)) {
+                return getJdkDynamicProxyTargetObject(proxy);
+            } else {
+                return getCglibProxyTargetObject(proxy);
+            }
+        } catch (Exception e) {
+            log.error("Failed to call getJdkDynamicProxyTargetObject or getCglibProxyTargetObject", e);
+            return null;
+        }
+    }
+
+    private static Object getCglibProxyTargetObject(Object proxy) throws Exception {
+        Field h = proxy.getClass().getDeclaredField("CGLIB$CALLBACK_0");
+        h.setAccessible(true);
+        Object dynamicAdvisedInterceptor = h.get(proxy);
+        Field advised = dynamicAdvisedInterceptor.getClass().getDeclaredField("advised");
+        advised.setAccessible(true);
+        return ((AdvisedSupport) advised.get(dynamicAdvisedInterceptor)).getTargetSource().getTarget();
+    }
+
+    private static Object getJdkDynamicProxyTargetObject(Object proxy) throws Exception {
+        Field h = proxy.getClass().getSuperclass().getDeclaredField("h");
+        h.setAccessible(true);
+        AopProxy aopProxy = (AopProxy) h.get(proxy);
+        Field advised = aopProxy.getClass().getDeclaredField("advised");
+        advised.setAccessible(true);
+        return ((AdvisedSupport) advised.get(aopProxy)).getTargetSource().getTarget();
+    }
+}