diff --git a/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java b/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java index 1ee6acc..08909d0 100644 --- a/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java +++ b/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java @@ -5,6 +5,7 @@ import io.wdd.common.beans.response.R; import io.wdd.common.beans.response.ResultStat; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.validation.BindException; @@ -100,12 +101,18 @@ public class GlobalExceptionHandler { @ExceptionHandler(value = {HttpRequestMethodNotSupportedException.class}) public void methodNotMatchHandler(HttpRequestMethodNotSupportedException httpRequestMethodNotSupportedException) { - log.debug( + log.error( httpRequestMethodNotSupportedException.getMessage() ); } + @ExceptionHandler(value = {ListenerExecutionFailedException.class}) + public void listenerExecutionFailedExceptionHandler(ListenerExecutionFailedException e) { + log.error(e.getMessage()); + } + + /** * 拦截数据库异常 * diff --git a/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java b/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java index 36f2359..9968c44 100644 --- a/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java +++ b/server/src/main/java/io/wdd/func/xray/persisit/XrayDBOperator.java @@ -4,8 +4,8 @@ import io.wdd.func.xray.beans.node.ProxyNode; import io.wdd.func.xray.beans.node.ProxyNodeType; import io.wdd.func.xray.beans.node.XrayConfigInfo; import io.wdd.server.beans.vo.ServerInfoVO; +import io.wdd.server.coreService.CoreAppService; import io.wdd.server.coreService.CoreServerService; -import io.wdd.server.service.AppInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,6 +20,7 @@ import static io.wdd.rpc.init.AcceptAgentInitInfo.ALL_SERVER_CITY_INDEX; /** * 为Xray Config信息 操作数据库而创建 + * todo 初期只需要记录构建过的路径(MySQL), 后期如此复杂的网路可以考虑上图数据库Neo4j */ @Service @Slf4j @@ -29,7 +30,7 @@ public class XrayDBOperator { CoreServerService coreServerService; @Resource - AppInfoService appInfoService; + CoreAppService coreAppService; @PostConstruct public void cache() { diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh index 1f4f3eb..34e43dc 100644 --- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh +++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh @@ -320,7 +320,7 @@ else machineNumber=99 fi cat >/etc/environment.d/octopus-agent.conf <