Merge branch 'dev-new' into dev-new-rabbitmq

jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java

@@ -1,5 +1,6 @@
 package com.jsowell.common.config;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -31,6 +32,16 @@ public class AliyunOssConfig {
      */
     private String filehost;
 
+    /**
+     * 蓝牙小程序文件路径
+     */
+    private String bluetoothFileHost;
+
+    /**
+     * 访问域名(上传蓝牙固件时用)
+     */
+    private String interviewUrl;
+
     /**
      * 访问域名
      */
@@ -76,6 +87,22 @@ public class AliyunOssConfig {
         this.filehost = filehost;
     }
 
+    public String getBluetoothFileHost() {
+        return bluetoothFileHost;
+    }
+
+    public void setBluetoothFileHost(String bluetoothFileHost) {
+        this.bluetoothFileHost = bluetoothFileHost;
+    }
+
+    public String getInterviewUrl() {
+        return interviewUrl;
+    }
+
+    public void setInterviewUrl(String interviewUrl) {
+        this.interviewUrl = interviewUrl;
+    }
+
     public String getUrl() {
         return url;
     }
@@ -86,13 +113,15 @@ public class AliyunOssConfig {
 
     @Override
     public String toString() {
-        return "AliyunOssConfig{" +
-                "endpoint='" + endpoint + '\'' +
-                ", accessKeyId='" + accessKeyId + '\'' +
-                ", accessKeySecret='" + accessKeySecret + '\'' +
-                ", bucketName='" + bucketName + '\'' +
-                ", filehost='" + filehost + '\'' +
-                ", url='" + url + '\'' +
-                '}';
+        return new ToStringBuilder(this)
+                .append("endpoint", endpoint)
+                .append("accessKeyId", accessKeyId)
+                .append("accessKeySecret", accessKeySecret)
+                .append("bucketName", bucketName)
+                .append("filehost", filehost)
+                .append("bluetoothFileHost", bluetoothFileHost)
+                .append("interviewUrl", interviewUrl)
+                .append("url", url)
+                .toString();
     }
 }