Merge branch 'feature' into 'release'

单账号登录限制再补充

See merge request !611

src/main/java/com/zhiwei/brandkbs2/exception/ExceptionCatch.java

@@ -32,6 +32,11 @@ public class ExceptionCatch {
     public ResponseResult customException(CustomException customException) {
         ResultCode resultCode = customException.getResultCode();
         Exception exception = customException.getException();
+        // 登录过期/异地登录log为info
+        if (1010 == resultCode.code() || 1011 == resultCode.code()){
+            log.info("登录信息:{}", customException.getErrorMessage(), customException);
+            return new ResponseResult(resultCode, Collections.EMPTY_LIST);
+        }
         //记录日志
         if (null == exception) {
             log.error("catch exception-custom:{}", customException.getErrorMessage(), customException);