chenweida %!s(int64=6) %!d(string=hai) anos
pai
achega
a71665c1bd

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/HibernateFilter.java

@ -31,7 +31,7 @@ public class HibernateFilter extends EmptyInterceptor {
    private EventBuffer eventBuffer;
    @Autowired
    private AdminClientProperties adminClientProperties;
    @Value("${spring.application.name}")
    @Value("${spring.application.name:unknow}")
    private String spanrName;

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/HttpAdvice.java

@ -43,7 +43,7 @@ public class HttpAdvice {
    private EventBuffer eventBuffer;
    @Autowired
    private AdminClientProperties adminClientProperties;
    @Value("${spring.application.name}")
    @Value("${spring.application.name:unknow}")
    private String spanrName;
    private Logger logger = LoggerFactory.getLogger(HttpAdvice.class);

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/SQLTimeAdvice.java

@ -32,7 +32,7 @@ public class SQLTimeAdvice {
    private AdminClientProperties adminClientProperties;
    private Logger logger = LoggerFactory.getLogger(SQLTimeAdvice.class);
    @Value("${spring.application.name}")
    @Value("${spring.application.name:unknow}")
    private String spanrName;

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/ZuulPostFilter.java

@ -29,7 +29,7 @@ public class ZuulPostFilter extends ZuulFilter {
    private EventBuffer eventBuffer;
    @Autowired
    private AdminClientProperties adminClientProperties;
    @Value("${spring.application.name}")
    @Value("${spring.application.name:unknow}")
    private String spanrName;
    @Override

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/ZuulPreFilter.java

@ -39,7 +39,7 @@ public class ZuulPreFilter extends ZuulFilter {
    private EventBuffer eventBuffer;
    @Autowired
    private AdminClientProperties adminClientProperties;
    @Value("${spring.application.name}")
    @Value("${spring.application.name:unknow}")
    private String spanrName;
    @Autowired
    private ProxyRequestHelper helper;

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/ZuulRouteFilter.java

@ -42,7 +42,7 @@ public class ZuulRouteFilter extends ZuulFilter {
    private EventBuffer eventBuffer;
    @Autowired
    private AdminClientProperties adminClientProperties;
    @Value("${spring.application.name}")
    @Value("${spring.application.name:unknow}")
    private String spanrName;
    @Autowired
    private ProxyRequestHelper helper;

+ 16 - 3
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/sender/SimpleEventSender.java

@ -7,8 +7,11 @@ import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.lang.reflect.Method;
import java.util.ArrayList;
@ -21,15 +24,25 @@ import java.util.List;
@Component
public class SimpleEventSender implements EventSender {
    private Logger logger = LoggerFactory.getLogger(SimpleEventSender.class);
    @Autowired
    private SocketClient socketClient;
    private Tracer tracer;
    @Value("${spring.application.name:unknow}")
    private String spanrName;
    @Autowired
    private EventBuffer eventBuffer;
    public Boolean send(IEvent event) {
        try {
            if (StringUtils.isEmpty(event.getTraceId())) {
                event.setTraceId(tracer.getCurrentSpan().traceIdString());
            }
            if (StringUtils.isEmpty(event.getSpanId())) {
                event.setSpanId(tracer.getCurrentSpan().getSpanId() + "");
            }
            if (StringUtils.isEmpty(event.getSpanName())) {
                event.setSpanName(spanrName);
            }
            JSONObject jsonObject = new JSONObject();
            Method[] methods = event.getClass().getMethods();
            for (Method method : methods) {
@ -54,7 +67,7 @@ public class SimpleEventSender implements EventSender {
                    }
                }
            }
            socketClient.getCurrentClient().send(jsonObject.toString());
            eventBuffer.addEvent(event);
            return true;
        } catch (Exception e) {
            logger.error(e.getMessage());