diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/model/Global.java b/magic-boot/src/main/java/org/ssssssss/magicboot/model/Global.java index bc3e88b..ce93cbe 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/model/Global.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/model/Global.java @@ -44,46 +44,4 @@ public class Global { return dir; } - public static String OSS_ENDPOINT; - - public static String OSS_ACCESS_KEY_ID; - - public static String OSS_ACCESS_KEY_SECRET; - - public static String OSS_BUCKET_NAME; - - public static String OSS_TRANSPORT_PROTOCOL; - - @Value("${upload.oss.endpoint}") - public void setOssEndpoint(String ossEndpoint) { - OSS_ENDPOINT = ossEndpoint; - } - - @Value("${upload.oss.access-key-id}") - public void setOssAccessKeyId(String ossAccessKeyId) { - OSS_ACCESS_KEY_ID = ossAccessKeyId; - } - - @Value("${upload.oss.access-key-secret}") - public void setOssAccessKeySecret(String ossAccessKeySecret) { - OSS_ACCESS_KEY_SECRET = ossAccessKeySecret; - } - - @Value("${upload.oss.bucket-name}") - public void setOssBucketName(String ossBucketName) { - OSS_BUCKET_NAME = ossBucketName; - } - - @Value("${upload.oss.transport-protocol:https}") - public void setOssTransportProtocol(String ossTransportProtocol) { - OSS_TRANSPORT_PROTOCOL = ossTransportProtocol; - } - - public static String UPLOAD_TYPE; - - @Value("${upload.type}") - public void setUploadType(String uploadType) { - UPLOAD_TYPE = uploadType; - } - } diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java b/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java index 15aff55..7e98059 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java @@ -19,10 +19,7 @@ public class WebUtils { } public static String getUeditorPrefix(){ - if(Global.UPLOAD_TYPE.equals("oss")){ - return Global.OSS_TRANSPORT_PROTOCOL + "://" + Global.OSS_BUCKET_NAME + "." + Global.OSS_ENDPOINT + "/"; - } return getContextUrl(); } -} \ No newline at end of file +} diff --git a/magic-boot/src/main/resources/application-online.yml b/magic-boot/src/main/resources/application-online.yml index 37bbe8c..ef1b11c 100644 --- a/magic-boot/src/main/resources/application-online.yml +++ b/magic-boot/src/main/resources/application-online.yml @@ -1,3 +1,3 @@ -super-password: dangerous +super-password: magic-api: web: