opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化短链接生成工具类

Browse Source
This commit is contained in:
AprilWind 2024-04-12 13:42:17 +08:00
parent ddc78eb548
commit 1e8264a30f
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -194,8 +194,10 @@ sms:
signature: 您的短信签名
sdk-app-id: 您的sdkAppId
short:
host: http://localhost/dev-api/resource/short/link?shortUrl=
shortlink:
enabled: false
address: http://localhost/dev-api/resource/short/link?shortUrl=
errorAddress: http://localhost/error
--- # 三方授权
justauth:

9
ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/properties/ShortLinkProperties.java
View File

@ -12,14 +12,19 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "shortlink")
public class ShortLinkProperties {
/**
* 客户端使用租户域名生成链接
*/
private Boolean enabled = false;
/**
* 短链接主机名或域名
*/
private String host;
private String address;
/**
* 错误页面的主机名或域名
*/
private String erroHost;
private String errorAddress="/error";
}

10
ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/utils/ShortLinkUtils.java
View File

@ -32,20 +32,20 @@ public class ShortLinkUtils {
* @return 带有默认主机名（或域名）的完整短链接
*/
public static String generateShortUrl(String longUrl, ValidityType validityType) {
return generateShortUrl(SHORT_LINK_PROPERTIES.getHost(), longUrl, validityType);
return generateShortUrl(SHORT_LINK_PROPERTIES.getAddress(), longUrl, validityType);
}
/**
* 根据指定主机名（或域名）生成完整短链接
*
* @param host 主机名（或域名）
* @param address 主机名（或域名）
* @param longUrl 完整的长链接
* @param validityType 有效期类型枚举
* @return 带有指定主机名（或域名）的完整短链接
*/
public static String generateShortUrl(String host, String longUrl, ValidityType validityType) {
public static String generateShortUrl(String address, String longUrl, ValidityType validityType) {
String url = generateShortLinkIdentifier(longUrl, validityType);
return host + url;
return address + url;
}
/**
@ -82,7 +82,7 @@ public class ShortLinkUtils {
* @return 对应的完整长链接，如果未找到则返回错误链接
*/
public static String getLongLink(String shortUrl) {
return getLongLink(shortUrl, SHORT_LINK_PROPERTIES.getErroHost());
return getLongLink(shortUrl, SHORT_LINK_PROPERTIES.getErrorAddress());
}
/**