[*] 配置结构调整

This commit is contained in:
acgist
2022-12-02 22:46:38 +08:00
parent b1ed244d4d
commit 18cc4e536d
25 changed files with 127 additions and 54 deletions

View File

@@ -48,6 +48,11 @@ import org.springframework.web.servlet.NoHandlerFoundException;
import com.acgist.taoyao.boot.controller.TaoyaoControllerAdvice;
import com.acgist.taoyao.boot.controller.TaoyaoErrorController;
import com.acgist.taoyao.boot.model.MessageCode;
import com.acgist.taoyao.boot.property.IdProperties;
import com.acgist.taoyao.boot.property.MediaProperties;
import com.acgist.taoyao.boot.property.SecurityProperties;
import com.acgist.taoyao.boot.property.TaoyaoProperties;
import com.acgist.taoyao.boot.property.WebrtcProperties;
import com.acgist.taoyao.boot.service.IdService;
import com.acgist.taoyao.boot.service.impl.IdServiceImpl;
import com.acgist.taoyao.boot.utils.ErrorUtils;

View File

@@ -1,29 +0,0 @@
package com.acgist.taoyao.boot.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
/**
* 媒体配置
*
* @author acgist
*/
@Getter
@Setter
@Schema(title = "媒体配置", description = "媒体配置")
@ConfigurationProperties(prefix = "taoyao.media")
public class MediaProperties {
/**
* 音频配置
*/
private MediaAudioProperties audio;
/**
* 视频配置
*/
private MediaVideoProperties video;
}

View File

@@ -11,6 +11,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import com.acgist.taoyao.boot.property.SecurityProperties;
import com.acgist.taoyao.boot.property.TaoyaoProperties;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Contact;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import com.fasterxml.jackson.annotation.JsonIgnore;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;

View File

@@ -0,0 +1,46 @@
package com.acgist.taoyao.boot.property;
import org.springframework.boot.context.properties.ConfigurationProperties;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
/**
* 媒体配置
*
* @author acgist
*/
@Getter
@Setter
@Schema(title = "媒体配置", description = "媒体配置")
@ConfigurationProperties(prefix = "taoyao.media")
public class MediaProperties {
/**
* 音频配置
*/
@Schema(title = "音频配置", description = "音频配置")
private MediaAudioProperties audio;
/**
* 视频配置
*/
@Schema(title = "视频配置", description = "视频配置")
private MediaVideoProperties video;
/**
* 高清视频
*/
@Schema(title = "高清视频", description = "高清视频")
private MediaVideoProperties highVideo;
/**
* 标清视频
*/
@Schema(title = "标清视频", description = "标清视频")
private MediaVideoProperties normVideo;
/**
* 流畅视频
*/
@Schema(title = "流畅视频", description = "流畅视频")
private MediaVideoProperties flowVideo;
}

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;

View File

@@ -0,0 +1,23 @@
package com.acgist.taoyao.boot.property;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
/**
* Moon架构配置
*
* @author acgist
*/
@Getter
@Setter
@Schema(title = "Moon架构配置", description = "Moon架构配置")
public class MoonProperties {
/**
* 是否混音
*/
@Schema(title = "是否混音", description = "是否混音")
private Boolean audioMix;
}

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.boot.config;
package com.acgist.taoyao.boot.property;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -65,6 +65,11 @@ public class WebrtcProperties {
*/
@Schema(title = "KMS配置", description = "KMS配置")
private KmsProperties kms;
/**
* Moon架构配置
*/
@Schema(title = "Moon架构配置", description = "Moon架构配置")
private MoonProperties moon;
/**
* 信令配置
*/

View File

@@ -4,7 +4,7 @@ import java.time.LocalDateTime;
import org.springframework.beans.factory.annotation.Autowired;
import com.acgist.taoyao.boot.config.IdProperties;
import com.acgist.taoyao.boot.property.IdProperties;
import com.acgist.taoyao.boot.service.IdService;
public class IdServiceImpl implements IdService {