Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@@ -66,6 +66,7 @@ public class LogMsgSendFilter extends LevelFilter {
                 }
 
                 if (StringUtils.isNotBlank(activeEnv)) {
+                    stringBuilder.append("告警环境：").append(activeEnv);
                     stringBuilder.append("\n");
                 }
 
@@ -112,7 +113,6 @@ public class LogMsgSendFilter extends LevelFilter {
                 if (!flag) {
                     logger.warn("msgSender.sendMsg fail,param：{}", stringBuilder.toString());
                 }
-                stringBuilder.append("告警环境：").append(activeEnv);
             } catch (Exception e) {
                 logger.warn("decide exception", e);
             }

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/interceptor/ScanApiAuthInterceptor.java

@@ -33,7 +33,7 @@ public class ScanApiAuthInterceptor implements HandlerInterceptor {
 		String ip = IpUtils.getIpAddr(request);
 		SetOperations setOperations = redisTemplate.opsForSet();
 		if (!setOperations.isMember(RedisKeys.getWhiteList(), ip)) {
-			log.warn("preHandle ip:{} is not in whitelist", ip);
+			log.error("preHandle ip:{} 不在白名单内", ip);
 			String result = JSON.toJSONString(new Result<>().error(EpmetErrorCode.ERR401.getCode(), EpmetErrorCode.ERR401.getMsg()));
 			responseJson(response, result);
 			return false;