From e9f2adb9ddc511c62e1628fbd527ba7cda8294d4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 09 五月 2025 14:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
index 0d26044..64a0249 100644
--- a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.utils.spring;
+import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -120,7 +121,12 @@
@SuppressWarnings("unchecked")
public static <T> T getAopProxy(T invoker)
{
- return (T) AopContext.currentProxy();
+ Object proxy = AopContext.currentProxy();
+ if (((Advised) proxy).getTargetSource().getTargetClass() == invoker.getClass())
+ {
+ return (T) proxy;
+ }
+ return invoker;
}
/**
@@ -143,4 +149,16 @@
final String[] activeProfiles = getActiveProfiles();
return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
}
+
+ /**
+ * 鑾峰彇閰嶇疆鏂囦欢涓殑鍊�
+ *
+ * @param key 閰嶇疆鏂囦欢鐨刱ey
+ * @return 褰撳墠鐨勯厤缃枃浠剁殑鍊�
+ *
+ */
+ public static String getRequiredProperty(String key)
+ {
+ return applicationContext.getEnvironment().getRequiredProperty(key);
+ }
}
--
Gitblit v1.9.3