diff --git a/build.gradle b/build.gradle index fdbc627..3914dbc 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "run.halo.plugin.devtools" version "0.6.2" } -group 'run.halo.sharelink' +group 'io.github.shirainbown.sharelink' java { toolchain { diff --git a/gradle.properties b/gradle.properties index de652db..ef0464d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.1.0 +version=1.1.1 diff --git a/src/main/java/run/halo/sharelink/SharelinkPlugin.java b/src/main/java/io/github/shirainbown/sharelink/SharelinkPlugin.java similarity index 89% rename from src/main/java/run/halo/sharelink/SharelinkPlugin.java rename to src/main/java/io/github/shirainbown/sharelink/SharelinkPlugin.java index 4fb56df..76595cf 100644 --- a/src/main/java/run/halo/sharelink/SharelinkPlugin.java +++ b/src/main/java/io/github/shirainbown/sharelink/SharelinkPlugin.java @@ -1,4 +1,4 @@ -package run.halo.sharelink; +package io.github.shirainbown.sharelink; import static run.halo.app.extension.index.IndexAttributeFactory.simpleAttribute; @@ -8,9 +8,9 @@ import run.halo.app.extension.SchemeManager; import run.halo.app.extension.index.IndexSpec; import run.halo.app.plugin.BasePlugin; import run.halo.app.plugin.PluginContext; -import run.halo.sharelink.model.DownloadRecord; -import run.halo.sharelink.model.DownloadResource; -import run.halo.sharelink.model.VerifiedDownloader; +import io.github.shirainbown.sharelink.model.DownloadRecord; +import io.github.shirainbown.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.model.VerifiedDownloader; @Component public class SharelinkPlugin extends BasePlugin { diff --git a/src/main/java/run/halo/sharelink/SharelinkSettingConfigGetter.java b/src/main/java/io/github/shirainbown/sharelink/SharelinkSettingConfigGetter.java similarity index 97% rename from src/main/java/run/halo/sharelink/SharelinkSettingConfigGetter.java rename to src/main/java/io/github/shirainbown/sharelink/SharelinkSettingConfigGetter.java index f629dd4..af7c0cd 100644 --- a/src/main/java/run/halo/sharelink/SharelinkSettingConfigGetter.java +++ b/src/main/java/io/github/shirainbown/sharelink/SharelinkSettingConfigGetter.java @@ -1,4 +1,4 @@ -package run.halo.sharelink; +package io.github.shirainbown.sharelink; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/run/halo/sharelink/console/ConsoleEndpoint.java b/src/main/java/io/github/shirainbown/sharelink/console/ConsoleEndpoint.java similarity index 98% rename from src/main/java/run/halo/sharelink/console/ConsoleEndpoint.java rename to src/main/java/io/github/shirainbown/sharelink/console/ConsoleEndpoint.java index 6eabf00..1841cb9 100644 --- a/src/main/java/run/halo/sharelink/console/ConsoleEndpoint.java +++ b/src/main/java/io/github/shirainbown/sharelink/console/ConsoleEndpoint.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.console; +package io.github.shirainbown.sharelink.console; import java.nio.charset.StandardCharsets; import java.time.Instant; @@ -32,10 +32,10 @@ import run.halo.app.extension.Metadata; import run.halo.app.extension.PageRequestImpl; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.index.query.QueryFactory; -import run.halo.sharelink.model.DownloadRecord; -import run.halo.sharelink.model.DownloadResource; -import run.halo.sharelink.protect.UploadProtectFilter; -import run.halo.sharelink.reference.PostReferenceService; +import io.github.shirainbown.sharelink.model.DownloadRecord; +import io.github.shirainbown.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.protect.UploadProtectFilter; +import io.github.shirainbown.sharelink.reference.PostReferenceService; /** * Console endpoints for download resource administration, mounted under diff --git a/src/main/java/run/halo/sharelink/download/DownloadPageRenderer.java b/src/main/java/io/github/shirainbown/sharelink/download/DownloadPageRenderer.java similarity index 99% rename from src/main/java/run/halo/sharelink/download/DownloadPageRenderer.java rename to src/main/java/io/github/shirainbown/sharelink/download/DownloadPageRenderer.java index 75fac99..b52dfa4 100644 --- a/src/main/java/run/halo/sharelink/download/DownloadPageRenderer.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/DownloadPageRenderer.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; /** * Renders the self-contained HTML pages for the public download flow (no external CSS/JS diff --git a/src/main/java/run/halo/sharelink/download/DownloadResourceService.java b/src/main/java/io/github/shirainbown/sharelink/download/DownloadResourceService.java similarity index 88% rename from src/main/java/run/halo/sharelink/download/DownloadResourceService.java rename to src/main/java/io/github/shirainbown/sharelink/download/DownloadResourceService.java index e227b9d..e8660ca 100644 --- a/src/main/java/run/halo/sharelink/download/DownloadResourceService.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/DownloadResourceService.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Sort; @@ -7,7 +7,7 @@ import reactor.core.publisher.Mono; import run.halo.app.extension.ListOptions; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.index.query.QueryFactory; -import run.halo.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.model.DownloadResource; /** * Shared lookup helpers for {@link DownloadResource}. diff --git a/src/main/java/run/halo/sharelink/download/DownloadTokenEndpoint.java b/src/main/java/io/github/shirainbown/sharelink/download/DownloadTokenEndpoint.java similarity index 93% rename from src/main/java/run/halo/sharelink/download/DownloadTokenEndpoint.java rename to src/main/java/io/github/shirainbown/sharelink/download/DownloadTokenEndpoint.java index fb72395..3718664 100644 --- a/src/main/java/run/halo/sharelink/download/DownloadTokenEndpoint.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/DownloadTokenEndpoint.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,12 +18,12 @@ import run.halo.app.extension.GroupVersion; import run.halo.app.extension.ListOptions; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.index.query.QueryFactory; -import run.halo.sharelink.SharelinkSettingConfigGetter; -import run.halo.sharelink.emailcode.EmailCodeManager; -import run.halo.sharelink.model.DownloadResource; -import run.halo.sharelink.util.EmailUtils; -import run.halo.sharelink.util.IpUtils; -import run.halo.sharelink.verify.VerifiedEmailService; +import io.github.shirainbown.sharelink.SharelinkSettingConfigGetter; +import io.github.shirainbown.sharelink.emailcode.EmailCodeManager; +import io.github.shirainbown.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.util.EmailUtils; +import io.github.shirainbown.sharelink.util.IpUtils; +import io.github.shirainbown.sharelink.verify.VerifiedEmailService; /** * Public endpoint exchanging a (possibly verified) identity for a one-time download diff --git a/src/main/java/run/halo/sharelink/download/DownloadTokenManager.java b/src/main/java/io/github/shirainbown/sharelink/download/DownloadTokenManager.java similarity index 97% rename from src/main/java/run/halo/sharelink/download/DownloadTokenManager.java rename to src/main/java/io/github/shirainbown/sharelink/download/DownloadTokenManager.java index 0973270..51c9d3f 100644 --- a/src/main/java/run/halo/sharelink/download/DownloadTokenManager.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/DownloadTokenManager.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; import java.time.Duration; import java.time.Instant; diff --git a/src/main/java/run/halo/sharelink/download/DownloadWebRouter.java b/src/main/java/io/github/shirainbown/sharelink/download/DownloadWebRouter.java similarity index 96% rename from src/main/java/run/halo/sharelink/download/DownloadWebRouter.java rename to src/main/java/io/github/shirainbown/sharelink/download/DownloadWebRouter.java index 91a9b1c..feed081 100644 --- a/src/main/java/run/halo/sharelink/download/DownloadWebRouter.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/DownloadWebRouter.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; import java.net.URI; import java.nio.charset.StandardCharsets; @@ -27,10 +27,10 @@ import run.halo.app.extension.ListOptions; import run.halo.app.extension.Metadata; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.index.query.QueryFactory; -import run.halo.sharelink.SharelinkSettingConfigGetter; -import run.halo.sharelink.model.DownloadRecord; -import run.halo.sharelink.model.DownloadResource; -import run.halo.sharelink.util.IpUtils; +import io.github.shirainbown.sharelink.SharelinkSettingConfigGetter; +import io.github.shirainbown.sharelink.model.DownloadRecord; +import io.github.shirainbown.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.util.IpUtils; /** * Public download routes, registered as {@link RouterFunction} beans which Halo collects diff --git a/src/main/java/run/halo/sharelink/download/FileStreamer.java b/src/main/java/io/github/shirainbown/sharelink/download/FileStreamer.java similarity index 98% rename from src/main/java/run/halo/sharelink/download/FileStreamer.java rename to src/main/java/io/github/shirainbown/sharelink/download/FileStreamer.java index 1ed7158..4a8b91a 100644 --- a/src/main/java/run/halo/sharelink/download/FileStreamer.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/FileStreamer.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; import java.net.URI; import java.net.URISyntaxException; @@ -29,7 +29,7 @@ import run.halo.app.core.extension.attachment.Constant; import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.infra.ExternalUrlSupplier; -import run.halo.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.model.DownloadResource; /** * Streams the attachment bytes of a download resource to the visitor. diff --git a/src/main/java/run/halo/sharelink/download/InternalRequestSecret.java b/src/main/java/io/github/shirainbown/sharelink/download/InternalRequestSecret.java similarity index 94% rename from src/main/java/run/halo/sharelink/download/InternalRequestSecret.java rename to src/main/java/io/github/shirainbown/sharelink/download/InternalRequestSecret.java index e58b974..f90f7ac 100644 --- a/src/main/java/run/halo/sharelink/download/InternalRequestSecret.java +++ b/src/main/java/io/github/shirainbown/sharelink/download/InternalRequestSecret.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.download; +package io.github.shirainbown.sharelink.download; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/src/main/java/run/halo/sharelink/emailcode/EmailCodeManager.java b/src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeManager.java similarity index 93% rename from src/main/java/run/halo/sharelink/emailcode/EmailCodeManager.java rename to src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeManager.java index 9019208..e2220a0 100644 --- a/src/main/java/run/halo/sharelink/emailcode/EmailCodeManager.java +++ b/src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeManager.java @@ -1,10 +1,10 @@ -package run.halo.sharelink.emailcode; +package io.github.shirainbown.sharelink.emailcode; import java.net.URI; import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Mono; -import run.halo.sharelink.SharelinkSettingConfigGetter; +import io.github.shirainbown.sharelink.SharelinkSettingConfigGetter; public interface EmailCodeManager { diff --git a/src/main/java/run/halo/sharelink/emailcode/EmailCodeManagerImpl.java b/src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeManagerImpl.java similarity index 98% rename from src/main/java/run/halo/sharelink/emailcode/EmailCodeManagerImpl.java rename to src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeManagerImpl.java index 79c6534..8963ef9 100644 --- a/src/main/java/run/halo/sharelink/emailcode/EmailCodeManagerImpl.java +++ b/src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeManagerImpl.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.emailcode; +package io.github.shirainbown.sharelink.emailcode; import java.security.MessageDigest; import java.security.SecureRandom; @@ -13,7 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; -import run.halo.sharelink.SharelinkSettingConfigGetter; +import io.github.shirainbown.sharelink.SharelinkSettingConfigGetter; /** * In-memory verification code store: one active code per email, one-time use, resend / diff --git a/src/main/java/run/halo/sharelink/emailcode/EmailCodeNotificationSender.java b/src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeNotificationSender.java similarity index 98% rename from src/main/java/run/halo/sharelink/emailcode/EmailCodeNotificationSender.java rename to src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeNotificationSender.java index ccbeead..9cf7beb 100644 --- a/src/main/java/run/halo/sharelink/emailcode/EmailCodeNotificationSender.java +++ b/src/main/java/io/github/shirainbown/sharelink/emailcode/EmailCodeNotificationSender.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.emailcode; +package io.github.shirainbown.sharelink.emailcode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/run/halo/sharelink/model/DownloadRecord.java b/src/main/java/io/github/shirainbown/sharelink/model/DownloadRecord.java similarity index 95% rename from src/main/java/run/halo/sharelink/model/DownloadRecord.java rename to src/main/java/io/github/shirainbown/sharelink/model/DownloadRecord.java index c805633..1f7b830 100644 --- a/src/main/java/run/halo/sharelink/model/DownloadRecord.java +++ b/src/main/java/io/github/shirainbown/sharelink/model/DownloadRecord.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.model; +package io.github.shirainbown.sharelink.model; import java.time.Instant; import lombok.Data; diff --git a/src/main/java/run/halo/sharelink/model/DownloadResource.java b/src/main/java/io/github/shirainbown/sharelink/model/DownloadResource.java similarity index 96% rename from src/main/java/run/halo/sharelink/model/DownloadResource.java rename to src/main/java/io/github/shirainbown/sharelink/model/DownloadResource.java index d8a18eb..fb1eeaf 100644 --- a/src/main/java/run/halo/sharelink/model/DownloadResource.java +++ b/src/main/java/io/github/shirainbown/sharelink/model/DownloadResource.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.model; +package io.github.shirainbown.sharelink.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/run/halo/sharelink/model/VerifiedDownloader.java b/src/main/java/io/github/shirainbown/sharelink/model/VerifiedDownloader.java similarity index 95% rename from src/main/java/run/halo/sharelink/model/VerifiedDownloader.java rename to src/main/java/io/github/shirainbown/sharelink/model/VerifiedDownloader.java index f5615ef..65b9633 100644 --- a/src/main/java/run/halo/sharelink/model/VerifiedDownloader.java +++ b/src/main/java/io/github/shirainbown/sharelink/model/VerifiedDownloader.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.model; +package io.github.shirainbown.sharelink.model; import java.time.Instant; import lombok.Data; diff --git a/src/main/java/run/halo/sharelink/protect/UploadProtectFilter.java b/src/main/java/io/github/shirainbown/sharelink/protect/UploadProtectFilter.java similarity index 96% rename from src/main/java/run/halo/sharelink/protect/UploadProtectFilter.java rename to src/main/java/io/github/shirainbown/sharelink/protect/UploadProtectFilter.java index b20fd95..a8f0da3 100644 --- a/src/main/java/run/halo/sharelink/protect/UploadProtectFilter.java +++ b/src/main/java/io/github/shirainbown/sharelink/protect/UploadProtectFilter.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.protect; +package io.github.shirainbown.sharelink.protect; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -24,8 +24,8 @@ import run.halo.app.core.extension.attachment.Attachment; import run.halo.app.extension.ListOptions; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.security.AdditionalWebFilter; -import run.halo.sharelink.download.InternalRequestSecret; -import run.halo.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.download.InternalRequestSecret; +import io.github.shirainbown.sharelink.model.DownloadResource; /** * Blocks direct access to {@code /upload/**} permalinks of attachments that are diff --git a/src/main/java/run/halo/sharelink/reference/PostReferenceService.java b/src/main/java/io/github/shirainbown/sharelink/reference/PostReferenceService.java similarity index 97% rename from src/main/java/run/halo/sharelink/reference/PostReferenceService.java rename to src/main/java/io/github/shirainbown/sharelink/reference/PostReferenceService.java index 19606f0..114439a 100644 --- a/src/main/java/run/halo/sharelink/reference/PostReferenceService.java +++ b/src/main/java/io/github/shirainbown/sharelink/reference/PostReferenceService.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.reference; +package io.github.shirainbown.sharelink.reference; import java.time.Duration; import java.util.ArrayList; @@ -18,7 +18,7 @@ import run.halo.app.core.extension.content.Post; import run.halo.app.core.extension.content.Snapshot; import run.halo.app.extension.ListOptions; import run.halo.app.extension.ReactiveExtensionClient; -import run.halo.sharelink.model.DownloadResource; +import io.github.shirainbown.sharelink.model.DownloadResource; /** * Scans published posts for occurrences of {@code /download/{slug}} and produces a diff --git a/src/main/java/run/halo/sharelink/util/EmailUtils.java b/src/main/java/io/github/shirainbown/sharelink/util/EmailUtils.java similarity index 97% rename from src/main/java/run/halo/sharelink/util/EmailUtils.java rename to src/main/java/io/github/shirainbown/sharelink/util/EmailUtils.java index d767fce..07d179f 100644 --- a/src/main/java/run/halo/sharelink/util/EmailUtils.java +++ b/src/main/java/io/github/shirainbown/sharelink/util/EmailUtils.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.util; +package io.github.shirainbown.sharelink.util; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/src/main/java/run/halo/sharelink/util/IpUtils.java b/src/main/java/io/github/shirainbown/sharelink/util/IpUtils.java similarity index 96% rename from src/main/java/run/halo/sharelink/util/IpUtils.java rename to src/main/java/io/github/shirainbown/sharelink/util/IpUtils.java index 3e139aa..af46200 100644 --- a/src/main/java/run/halo/sharelink/util/IpUtils.java +++ b/src/main/java/io/github/shirainbown/sharelink/util/IpUtils.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.util; +package io.github.shirainbown.sharelink.util; import org.apache.commons.lang3.StringUtils; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/src/main/java/run/halo/sharelink/verify/EmailVerifyEndpoint.java b/src/main/java/io/github/shirainbown/sharelink/verify/EmailVerifyEndpoint.java similarity index 92% rename from src/main/java/run/halo/sharelink/verify/EmailVerifyEndpoint.java rename to src/main/java/io/github/shirainbown/sharelink/verify/EmailVerifyEndpoint.java index 1389351..4fc107d 100644 --- a/src/main/java/run/halo/sharelink/verify/EmailVerifyEndpoint.java +++ b/src/main/java/io/github/shirainbown/sharelink/verify/EmailVerifyEndpoint.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.verify; +package io.github.shirainbown.sharelink.verify; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -11,10 +11,10 @@ import org.springframework.web.server.ServerWebInputException; import reactor.core.publisher.Mono; import run.halo.app.core.extension.endpoint.CustomEndpoint; import run.halo.app.extension.GroupVersion; -import run.halo.sharelink.SharelinkSettingConfigGetter; -import run.halo.sharelink.emailcode.EmailCodeManager; -import run.halo.sharelink.util.EmailUtils; -import run.halo.sharelink.util.IpUtils; +import io.github.shirainbown.sharelink.SharelinkSettingConfigGetter; +import io.github.shirainbown.sharelink.emailcode.EmailCodeManager; +import io.github.shirainbown.sharelink.util.EmailUtils; +import io.github.shirainbown.sharelink.util.IpUtils; /** * Public endpoints for the download email verification flow, mounted under diff --git a/src/main/java/run/halo/sharelink/verify/VerifiedEmailService.java b/src/main/java/io/github/shirainbown/sharelink/verify/VerifiedEmailService.java similarity index 94% rename from src/main/java/run/halo/sharelink/verify/VerifiedEmailService.java rename to src/main/java/io/github/shirainbown/sharelink/verify/VerifiedEmailService.java index 9c7a95a..036462d 100644 --- a/src/main/java/run/halo/sharelink/verify/VerifiedEmailService.java +++ b/src/main/java/io/github/shirainbown/sharelink/verify/VerifiedEmailService.java @@ -1,4 +1,4 @@ -package run.halo.sharelink.verify; +package io.github.shirainbown.sharelink.verify; import java.time.Instant; import lombok.RequiredArgsConstructor; @@ -8,9 +8,9 @@ import reactor.core.publisher.Mono; import run.halo.app.extension.GroupVersionKind; import run.halo.app.extension.Metadata; import run.halo.app.extension.ReactiveExtensionClient; -import run.halo.sharelink.SharelinkSettingConfigGetter; -import run.halo.sharelink.model.VerifiedDownloader; -import run.halo.sharelink.util.EmailUtils; +import io.github.shirainbown.sharelink.SharelinkSettingConfigGetter; +import io.github.shirainbown.sharelink.model.VerifiedDownloader; +import io.github.shirainbown.sharelink.util.EmailUtils; /** * Unified "is this email verified" check for the download flow. Looks up this plugin's