diff --git a/cloud-central-control-client/src/main/java/com/cm/central/control/client/socket/aspect/ClientExceptionAspect.java b/cloud-central-control-client/src/main/java/com/cm/central/control/client/socket/aspect/ClientExceptionAspect.java index 4e66159..e77f1c0 100644 --- a/cloud-central-control-client/src/main/java/com/cm/central/control/client/socket/aspect/ClientExceptionAspect.java +++ b/cloud-central-control-client/src/main/java/com/cm/central/control/client/socket/aspect/ClientExceptionAspect.java @@ -1,19 +1,18 @@ package com.cm.central.control.client.socket.aspect; -import com.cm.central.control.client.socket.service.socket.BaseSocketService; import com.cm.central.control.client.socket.service.socket.exception.ExceptionServiceImpl; import com.cm.common.exception.base.SystemException; -import com.cm.socket.service.ISocketService; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.springframework.core.annotation.Order; -import org.springframework.security.authentication.InsufficientAuthenticationException; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; +import org.springframework.security.oauth2.provider.ClientRegistrationException; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.sql.SQLSyntaxErrorException; /** * @ClassName: ApiLogAspect @@ -44,8 +43,9 @@ public class ClientExceptionAspect { result = proceedingJoinPoint.proceed(); } catch (Throwable e) { boolean exceptionFlag = e instanceof SystemException - || e instanceof SQLSyntaxErrorException - || e instanceof InsufficientAuthenticationException; + || e instanceof AuthenticationException + || e instanceof OAuth2Exception + || e instanceof ClientRegistrationException; if (!exceptionFlag) { new Thread(() -> { exceptionServiceImpl.writeThrowable(e); diff --git a/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html b/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html index cc1b381..e09411d 100644 --- a/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html +++ b/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html @@ -218,8 +218,8 @@ top.dialog.open({ url: top.restAjax.path('route/clientexception/getclientexception?clientExceptionId={clientExceptionId}', [data.clientExceptionId]), title: '查看异常', - width: '1000px', - height: '500px', + width: '90%', + height: '90%', onClose: function() {} }); } else if(layEvent === 'handleEvent') {