From 191882376c25b781890e65b64882815dc6d94265 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Wed, 8 Dec 2021 20:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../properties/FileMediaMaxDurationProperties.java    |  3 ---
 .../ink/wgink/properties/FileMinIoProperties.java     |  8 --------
 .../java/ink/wgink/properties/FileProperties.java     | 11 -----------
 .../properties/websocket/WebSocketProperties.java     |  9 +++++++++
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/basic-properties/src/main/java/ink/wgink/properties/FileMediaMaxDurationProperties.java b/basic-properties/src/main/java/ink/wgink/properties/FileMediaMaxDurationProperties.java
index fd3d384a..ce9ddff0 100644
--- a/basic-properties/src/main/java/ink/wgink/properties/FileMediaMaxDurationProperties.java
+++ b/basic-properties/src/main/java/ink/wgink/properties/FileMediaMaxDurationProperties.java
@@ -1,8 +1,5 @@
 package ink.wgink.properties;
 
-import ink.wgink.properties.FileMediaAppMaxDurationProperties;
-import ink.wgink.properties.FileMediaBackendMaxDurationProperties;
-
 /**
  * When you feel like quitting. Think about why you started
  * 当你想要放弃的时候，想想当初你为何开始
diff --git a/basic-properties/src/main/java/ink/wgink/properties/FileMinIoProperties.java b/basic-properties/src/main/java/ink/wgink/properties/FileMinIoProperties.java
index e3e4e901..e83d2939 100644
--- a/basic-properties/src/main/java/ink/wgink/properties/FileMinIoProperties.java
+++ b/basic-properties/src/main/java/ink/wgink/properties/FileMinIoProperties.java
@@ -12,7 +12,6 @@ public class FileMinIoProperties {
     private String endpoint;
     private String accessKey;
     private String secretKey;
-    private Boolean secure;
 
     public String getEndpoint() {
         return endpoint == null ? "" : endpoint.trim();
@@ -38,11 +37,4 @@ public class FileMinIoProperties {
         this.secretKey = secretKey;
     }
 
-    public Boolean getSecure() {
-        return secure == null ? false : secure;
-    }
-
-    public void setSecure(Boolean secure) {
-        this.secure = secure;
-    }
 }
diff --git a/basic-properties/src/main/java/ink/wgink/properties/FileProperties.java b/basic-properties/src/main/java/ink/wgink/properties/FileProperties.java
index 2a7b0dc4..4762ecfa 100644
--- a/basic-properties/src/main/java/ink/wgink/properties/FileProperties.java
+++ b/basic-properties/src/main/java/ink/wgink/properties/FileProperties.java
@@ -21,7 +21,6 @@ public class FileProperties {
     private String fileTypes;
     private Integer maxFileCount;
     private Double imageOutputQuality;
-    private FileMediaMaxDurationProperties mediaMaxDuration;
     private Boolean useMinIo;
     private FileMinIoProperties minIo;
 
@@ -81,14 +80,6 @@ public class FileProperties {
         this.imageOutputQuality = imageOutputQuality;
     }
 
-    public FileMediaMaxDurationProperties getMediaMaxDuration() {
-        return mediaMaxDuration;
-    }
-
-    public void setMediaMaxDuration(FileMediaMaxDurationProperties mediaMaxDuration) {
-        this.mediaMaxDuration = mediaMaxDuration;
-    }
-
     public Boolean getUseMinIo() {
         return useMinIo == null ? false : useMinIo;
     }
@@ -122,8 +113,6 @@ public class FileProperties {
                 .append(maxFileCount);
         sb.append(",\"imageOutputQuality\":")
                 .append(imageOutputQuality);
-        sb.append(",\"mediaMaxDuration\":")
-                .append(mediaMaxDuration);
         sb.append(",\"useMinIo\":")
                 .append(useMinIo);
         sb.append(",\"minIo\":")
diff --git a/basic-properties/src/main/java/ink/wgink/properties/websocket/WebSocketProperties.java b/basic-properties/src/main/java/ink/wgink/properties/websocket/WebSocketProperties.java
index 01a440aa..a9ba3b63 100644
--- a/basic-properties/src/main/java/ink/wgink/properties/websocket/WebSocketProperties.java
+++ b/basic-properties/src/main/java/ink/wgink/properties/websocket/WebSocketProperties.java
@@ -19,6 +19,7 @@ public class WebSocketProperties {
     private Integer port;
     private String context;
     private Boolean isEncrypt;
+    private String aesKey;
 
     public String getScheme() {
         return scheme == null ? "ws" : scheme.trim();
@@ -59,4 +60,12 @@ public class WebSocketProperties {
     public void setEncrypt(Boolean encrypt) {
         isEncrypt = encrypt;
     }
+
+    public String getAesKey() {
+        return aesKey == null ? "" : aesKey.trim();
+    }
+
+    public void setAesKey(String aesKey) {
+        this.aesKey = aesKey;
+    }
 }