From 5f18184362c0b495b52500c3354fcd2279a8c0b9 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Wed, 12 Aug 2020 16:36:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8D=95=E8=8E=B7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/socket/aspect/ClientExceptionAspect.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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..ea81982 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,16 @@ 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.stereotype.Component; import javax.annotation.Resource; -import java.sql.SQLSyntaxErrorException; /** * @ClassName: ApiLogAspect @@ -44,8 +41,7 @@ public class ClientExceptionAspect { result = proceedingJoinPoint.proceed(); } catch (Throwable e) { boolean exceptionFlag = e instanceof SystemException - || e instanceof SQLSyntaxErrorException - || e instanceof InsufficientAuthenticationException; + || e instanceof AuthenticationException; if (!exceptionFlag) { new Thread(() -> { exceptionServiceImpl.writeThrowable(e); From 7c2cf7e5701857993b1261c54d7edb7669b92f3c Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Wed, 12 Aug 2020 16:42:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8D=E6=8D=95?= =?UTF-8?q?=E8=8E=B7=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/client/socket/aspect/ClientExceptionAspect.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 ea81982..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 @@ -8,6 +8,8 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.springframework.core.annotation.Order; 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; @@ -41,7 +43,9 @@ public class ClientExceptionAspect { result = proceedingJoinPoint.proceed(); } catch (Throwable e) { boolean exceptionFlag = e instanceof SystemException - || e instanceof AuthenticationException; + || e instanceof AuthenticationException + || e instanceof OAuth2Exception + || e instanceof ClientRegistrationException; if (!exceptionFlag) { new Thread(() -> { exceptionServiceImpl.writeThrowable(e); From cb0830421e6317c83d63c4a10ed290f0788014e6 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Thu, 13 Aug 2020 20:09:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/clientexception/list-clientexception.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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') {