Commit 2206b670 by huangfu

解决DDMP 重复web全局引用BUG

parent 735f7ed6
...@@ -5,6 +5,7 @@ import com.byit.rpc.remoting.invoker.impl.RpcSpringInvokerFactory; ...@@ -5,6 +5,7 @@ import com.byit.rpc.remoting.invoker.impl.RpcSpringInvokerFactory;
import com.byit.rpc.remoting.provider.impl.RpcSpringProviderFactory; import com.byit.rpc.remoting.provider.impl.RpcSpringProviderFactory;
import com.byit.rpc.util.RpcSpringUtil; import com.byit.rpc.util.RpcSpringUtil;
import com.byit.util.SpringUtil; import com.byit.util.SpringUtil;
import com.byit.utils.RpcPluginSpringUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
...@@ -74,4 +75,9 @@ public class AdminRegisterConfig { ...@@ -74,4 +75,9 @@ public class AdminRegisterConfig {
return new RpcSpringUtil(); return new RpcSpringUtil();
} }
@Bean
public RpcPluginSpringUtil rpcPluginSpringUtil(){
return new RpcPluginSpringUtil();
}
} }
...@@ -11,7 +11,7 @@ import java.util.Map; ...@@ -11,7 +11,7 @@ import java.util.Map;
* Spring工具类 * Spring工具类
* @author huangfu * @author huangfu
*/ */
@Component
public class SpringUtil implements ApplicationContextAware { public class SpringUtil implements ApplicationContextAware {
private static ApplicationContext applicationContext = null; private static ApplicationContext applicationContext = null;
......
...@@ -20,12 +20,6 @@ ...@@ -20,12 +20,6 @@
<version>1.3.2.RELEASE</version> <version>1.3.2.RELEASE</version>
</dependency> </dependency>
<dependency>
<groupId>myth-job</groupId>
<artifactId>myth-web-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
......
...@@ -8,7 +8,6 @@ import com.byit.param.PluginBeat; ...@@ -8,7 +8,6 @@ import com.byit.param.PluginBeat;
import com.byit.rpc.remoting.invoker.route.LoadBalance; import com.byit.rpc.remoting.invoker.route.LoadBalance;
import com.byit.rpc.util.RPCLogUtil; import com.byit.rpc.util.RPCLogUtil;
import com.byit.rpc.util.RpcException; import com.byit.rpc.util.RpcException;
import com.byit.util.SpringUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
...@@ -52,7 +51,7 @@ public class ClientRpcUtil { ...@@ -52,7 +51,7 @@ public class ClientRpcUtil {
*/ */
public static boolean retryRpcHost(PluginClient client, String host,String runKey, int retryTotalCount, int thisRetryCount) throws InterruptedException { public static boolean retryRpcHost(PluginClient client, String host,String runKey, int retryTotalCount, int thisRetryCount) throws InterruptedException {
//redis模板 //redis模板
StringRedisTemplate stringRedisTemplate = SpringUtil.getBean(StringRedisTemplate.class); StringRedisTemplate stringRedisTemplate = RpcPluginSpringUtil.getBean(StringRedisTemplate.class);
log.info("------当前plugin-rpc的请求的地址为:{}-------", host); log.info("------当前plugin-rpc的请求的地址为:{}-------", host);
try { try {
client.send(host, PluginBeat.PLUGIN_RPC_REQUEST_PACKET); client.send(host, PluginBeat.PLUGIN_RPC_REQUEST_PACKET);
......
package com.byit.utils;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
import java.util.Map;
/**
* Spring工具类
* @author huangfu
*/
public class RpcPluginSpringUtil implements ApplicationContextAware {
private static ApplicationContext applicationContext = null;
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
if(RpcPluginSpringUtil.applicationContext == null) {
RpcPluginSpringUtil.applicationContext = applicationContext;
}
}
/**
* 获取applicationContext
* @return 返回applicationContext
*/
public static ApplicationContext getApplicationContext() {
return applicationContext;
}
/**
* 通过name获取 Bean.
* @param name
* @return
*/
public static Object getBean(String name){
return getApplicationContext().getBean(name);
}
/**
* 通过class获取Bean.
* @param clazz
* @param <T>
* @return
*/
public static <T> T getBean(Class<T> clazz){
return getApplicationContext().getBean(clazz);
}
/**
* 通过name,以及Clazz返回指定的Bean
* @param name
* @param clazz
* @param <T>
* @return
*/
public static <T> T getBean(String name,Class<T> clazz){
return getApplicationContext().getBean(name, clazz);
}
/**
* 获取实现某个接口的类
* @param clazz
* @param <T>
* @return
*/
public static <T> Map<String,T> getBeansOfType(Class<T> clazz){
return getApplicationContext().getBeansOfType(clazz);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment