Tenlion/cm-cloud
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wenc000 2020-08-14 09:22:32 +08:00
commit 62f0d92e4a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cloud-central-control-client/src/main/java/com/cm/central/control/client/socket/aspect/ClientExceptionAspect.java
View File

@ -1,19 +1,18 @@
package com.cm.central.control.client.socket.aspect; 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.central.control.client.socket.service.socket.exception.ExceptionServiceImpl;
import com.cm.common.exception.base.SystemException; import com.cm.common.exception.base.SystemException;
import com.cm.socket.service.ISocketService;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.springframework.core.annotation.Order; 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 org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.sql.SQLSyntaxErrorException;
/** /**
* @ClassName: ApiLogAspect * @ClassName: ApiLogAspect
@ -44,8 +43,9 @@ public class ClientExceptionAspect {
result = proceedingJoinPoint.proceed(); result = proceedingJoinPoint.proceed();
} catch (Throwable e) { } catch (Throwable e) {
boolean exceptionFlag = e instanceof SystemException boolean exceptionFlag = e instanceof SystemException
|| e instanceof SQLSyntaxErrorException || e instanceof AuthenticationException
|| e instanceof InsufficientAuthenticationException; || e instanceof OAuth2Exception
|| e instanceof ClientRegistrationException;
if (!exceptionFlag) { if (!exceptionFlag) {
new Thread(() -> { new Thread(() -> {
exceptionServiceImpl.writeThrowable(e); exceptionServiceImpl.writeThrowable(e);

4
cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html
View File

@ -218,8 +218,8 @@
top.dialog.open({ top.dialog.open({
url: top.restAjax.path('route/clientexception/getclientexception?clientExceptionId={clientExceptionId}', [data.clientExceptionId]), url: top.restAjax.path('route/clientexception/getclientexception?clientExceptionId={clientExceptionId}', [data.clientExceptionId]),
title: '查看异常', title: '查看异常',
width: '1000px', width: '90%',
height: '500px', height: '90%',
onClose: function() {} onClose: function() {}
}); });
} else if(layEvent === 'handleEvent') { } else if(layEvent === 'handleEvent') {