diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java index 1d3cca44df..53109c5b2d 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java @@ -24,8 +24,7 @@ import java.util.Map; @Service public class PanelLinkService { - @Value("${public-link-url:http://localhost:9528/link.html?link=}") - private String baseUrl; + private static final String baseUrl = "/link.html?link="; @Value("${public-link-salt:DataEaseLinkSalt}") private String salt; diff --git a/frontend/src/views/link/generate/index.vue b/frontend/src/views/link/generate/index.vue index 27de4c9cdf..83a53eb9cd 100644 --- a/frontend/src/views/link/generate/index.vue +++ b/frontend/src/views/link/generate/index.vue @@ -66,6 +66,11 @@ export default { defaultForm: { enablePwd: false, pwd: null, uri: null } } }, + computed: { + origin() { + return window.location.origin + } + }, created() { this.form = this.defaultForm this.currentGenerate() @@ -76,7 +81,7 @@ export default { const { valid, enablePwd, pwd, uri } = res.data this.valid = valid this.form.enablePwd = enablePwd - this.form.uri = uri + this.form.uri = uri ? (this.origin + uri) : uri // 返回的密码是共钥加密后的 所以展示需要私钥解密一波 pwd && (this.form.pwd = decrypt(pwd)) })