diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5b88a71ad..4d50f61c5 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -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:
diff --git a/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/properties/ShortLinkProperties.java b/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/properties/ShortLinkProperties.java
index 0d96f886a..de618b337 100644
--- a/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/properties/ShortLinkProperties.java
+++ b/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/properties/ShortLinkProperties.java
@@ -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";
 
 }
diff --git a/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/utils/ShortLinkUtils.java b/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/utils/ShortLinkUtils.java
index 7c31a5fd4..d3850939d 100644
--- a/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/utils/ShortLinkUtils.java
+++ b/ruoyi-common/ruoyi-common-shortlink/src/main/java/org/dromara/common/shortlink/utils/ShortLinkUtils.java
@@ -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());
     }
 
     /**