# Conflicts: # ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java # ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/MailServiceImpl.java