diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/pojo/MilogLogStoreDO.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/pojo/MilogLogStoreDO.java index 95cdfa21..1455c770 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/pojo/MilogLogStoreDO.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/pojo/MilogLogStoreDO.java @@ -79,7 +79,7 @@ public class MilogLogStoreDO extends BaseCommon { @Column(value = "is_matrix_app") @ColDefine(type = ColType.BOOLEAN) @Default("false") - private Boolean isMatrixApp; + private Boolean usePlatformResource; @Column(value = "es_index") @ColDefine(type = ColType.VARCHAR, width = 256) @@ -99,18 +99,18 @@ public class MilogLogStoreDO extends BaseCommon { public MilogLogStoreDO() { } - public MilogLogStoreDO(Long spaceId, String logstoreName, Integer storePeriod, Integer shardCnt, String keyList, Integer logType, Boolean isMatrixApp) { + public MilogLogStoreDO(Long spaceId, String logstoreName, Integer storePeriod, Integer shardCnt, String keyList, Integer logType, Boolean usePlatformResource) { this.logstoreName = logstoreName; this.spaceId = spaceId; this.storePeriod = storePeriod; this.shardCnt = shardCnt; this.keyList = keyList; this.logType = logType; - this.isMatrixApp = isMatrixApp; + this.usePlatformResource = usePlatformResource; } - public boolean isMatrixAppStore() { - return this.isMatrixApp == null ? false : this.isMatrixApp; + public boolean isPlatformResourceStore() { + return this.usePlatformResource == null ? false : this.usePlatformResource; } } diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogStoreParam.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogStoreParam.java index c580ec66..cba25034 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogStoreParam.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogStoreParam.java @@ -39,7 +39,7 @@ public class LogStoreParam { * 1. Service application logs */ private Integer logType; - private Boolean isMatrixApp; + private Boolean usePlatformResource; private String esIndex; private String machineRoom; /** @@ -55,7 +55,7 @@ public class LogStoreParam { private Boolean nameSameStatus = Boolean.FALSE; - public boolean isMatrixAppStore() { - return this.isMatrixApp == null ? false : this.isMatrixApp; + public boolean isPlatformResourceStore() { + return this.usePlatformResource == null ? false : this.usePlatformResource; } } diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java index f2017ae9..c4441175 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java @@ -653,7 +653,7 @@ private MilogLogTailDo logTailParam2Do(LogTailParam logTailParam, MilogLogStoreD } tailExtensionService.logTailDoExtraFiled(milogLogtailDo, logStoreDO, logTailParam); milogLogtailDo.setDeployWay(logTailParam.getDeployWay()); - if (logStoreDO.isMatrixAppStore()) { + if (logStoreDO.isPlatformResourceStore()) { milogLogtailDo.setDeploySpace((StringUtils.isNotEmpty(logTailParam.getDeploySpace()) ? logTailParam.getDeploySpace().trim() : "")); } milogLogtailDo.setFirstLineReg((StringUtils.isNotEmpty(logTailParam.getFirstLineReg()) ? logTailParam.getFirstLineReg() : ""));