diff --git a/src/main/java/com/jmal/clouddisk/office/OfficeConfigService.java b/src/main/java/com/jmal/clouddisk/office/OfficeConfigService.java index 05355d36..c4d511a8 100644 --- a/src/main/java/com/jmal/clouddisk/office/OfficeConfigService.java +++ b/src/main/java/com/jmal/clouddisk/office/OfficeConfigService.java @@ -54,7 +54,11 @@ public String createOfficeToken(final Map payloadClaims) { } public OfficeConfigDTO getOfficeConfig() { - return getOfficeConfigCache(); + OfficeConfigDTO officeConfigDTO = getOfficeConfigCache(); + if (StrUtil.isNotBlank(officeConfigDTO.getSecret())) { + officeConfigDTO.setSecret(VO_KEY); + } + return officeConfigDTO; } public void setOfficeConfig(OfficeConfigDTO officeConfigDTO) { diff --git a/src/main/java/com/jmal/clouddisk/office/model/OfficeConfigDO.java b/src/main/java/com/jmal/clouddisk/office/model/OfficeConfigDO.java index 59e1ec9a..4516ce06 100644 --- a/src/main/java/com/jmal/clouddisk/office/model/OfficeConfigDO.java +++ b/src/main/java/com/jmal/clouddisk/office/model/OfficeConfigDO.java @@ -2,7 +2,6 @@ import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import cn.hutool.crypto.symmetric.SymmetricCrypto; -import com.jmal.clouddisk.office.OfficeConfigService; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -24,18 +23,6 @@ public class OfficeConfigDO { private List format; - public OfficeConfigDTO toOfficeConfigDTO() { - OfficeConfigDTO officeConfigDTO = new OfficeConfigDTO(); - officeConfigDTO.setDocumentServer(this.documentServer); - officeConfigDTO.setCallbackServer(this.callbackServer); - officeConfigDTO.setFormat(this.format); - officeConfigDTO.setTokenEnabled(this.tokenEnabled); - if (this.tokenEnabled) { - officeConfigDTO.setSecret(OfficeConfigService.VO_KEY); - } - return officeConfigDTO; - } - public OfficeConfigDTO toOfficeConfigCache() { OfficeConfigDTO officeConfigDTO = new OfficeConfigDTO(); officeConfigDTO.setDocumentServer(this.documentServer);