diff --git a/api/handler/short_link.go b/api/handler/short_link.go index 0969b29..650b052 100644 --- a/api/handler/short_link.go +++ b/api/handler/short_link.go @@ -32,16 +32,41 @@ func GenerateLinkHandler(c *gin.Context) { return } - hash, err := generateUniqueHash() - if err != nil { - respondWithError(c, http.StatusInternalServerError, "生成短链接失败") - return + var hash string + var password string + var err error + + if params.CustomID != "" { + // 检查自定义ID是否已存在 + exists, err := database.CheckShortLinkHashExists(params.CustomID) + if err != nil { + respondWithError(c, http.StatusInternalServerError, "数据库错误") + return + } + if exists { + respondWithError(c, http.StatusBadRequest, "短链已存在") + return + } + hash = params.CustomID + password = params.Password + } else { + // 自动生成短链ID和密码 + hash, err = generateUniqueHash() + if err != nil { + respondWithError(c, http.StatusInternalServerError, "生成短链接失败") + return + } + if params.Password == "" { + password = common.RandomString(8) // 生成8位随机密码 + } else { + password = params.Password + } } shortLink := model.ShortLink{ Hash: hash, Url: params.Url, - Password: params.Password, + Password: password, } if err := database.SaveShortLink(&shortLink); err != nil { @@ -49,10 +74,12 @@ func GenerateLinkHandler(c *gin.Context) { return } - if params.Password != "" { - hash += "?password=" + params.Password + // 返回生成的短链ID和密码 + response := map[string]string{ + "hash": hash, + "password": password, } - c.String(http.StatusOK, hash) + c.JSON(http.StatusOK, response) } func generateUniqueHash() (string, error) { @@ -74,11 +101,27 @@ func UpdateLinkHandler(c *gin.Context) { respondWithError(c, http.StatusBadRequest, "参数错误: "+err.Error()) return } + + // 先获取原有的短链接 + existingLink, err := database.FindShortLinkByHash(params.Hash) + if err != nil { + respondWithError(c, http.StatusNotFound, "未找到短链接") + return + } + + // 验证密码 + if existingLink.Password != params.Password { + respondWithError(c, http.StatusUnauthorized, "密码错误") + return + } + + // 更新URL，但保持原密码不变 shortLink := model.ShortLink{ Hash: params.Hash, Url: params.Url, - Password: params.Password, + Password: existingLink.Password, // 保持原密码不变 } + if err := database.SaveShortLink(&shortLink); err != nil { respondWithError(c, http.StatusInternalServerError, "数据库错误") return diff --git a/api/static/index.html b/api/static/index.html index 5f6fe49..3bb78f4 100644 --- a/api/static/index.html +++ b/api/static/index.html @@ -79,7 +79,7 @@
+ placeholder="用于获取订阅的http请求中的user-agent标识(可选)" rows="3">
@@ -147,24 +147,27 @@
- +
-
- - +
+ + -
+
+ + +
diff --git a/api/static/index.js b/api/static/index.js index fc64113..6ce9c1d 100644 --- a/api/static/index.js +++ b/api/static/index.js @@ -1,3 +1,15 @@ +function setInputReadOnly(input, readonly) { + if (readonly) { + input.readOnly = true; + input.classList.add('bg-light'); + input.style.cursor = 'not-allowed'; + } else { + input.readOnly = false; + input.classList.remove('bg-light'); + input.style.cursor = 'auto'; + } +} + function clearExistingValues() { // 清除简单输入框和复选框的值 document.getElementById("endpoint").value = "clash"; @@ -12,7 +24,23 @@ function clearExistingValues() { document.getElementById("remove").value = ""; document.getElementById("apiLink").value = ""; document.getElementById("apiShortLink").value = ""; - document.getElementById("password").value = ""; + + // 恢复短链ID和密码输入框状态 + const customIdInput = document.getElementById("customId"); + const passwordInput = document.getElementById("password"); + const generateButton = document.querySelector('button[onclick="generateShortLink()"]'); + + customIdInput.value = ""; + setInputReadOnly(customIdInput, false); + + passwordInput.value = ""; + setInputReadOnly(passwordInput, false); + + // 恢复生成短链按钮状态 + generateButton.disabled = false; + generateButton.classList.remove('btn-secondary'); + generateButton.classList.add('btn-primary'); + document.getElementById("nodeList").checked = false; // 清除由 createRuleProvider, createReplace, 和 createRule 创建的所有额外输入组 @@ -188,8 +216,32 @@ async function parseInputURL() { try { const response = await axios.get("./short?" + q.toString()); url = new URL(window.location.href + response.data); - document.querySelector("#apiShortLink").value = inputURL; - document.querySelector("#password").value = password; + + // 回显配置链接 + const apiLinkInput = document.querySelector("#apiLink"); + apiLinkInput.value = `${window.location.origin}${window.location.pathname}${response.data}`; + setInputReadOnly(apiLinkInput, true); + + // 回显短链相关信息 + const apiShortLinkInput = document.querySelector("#apiShortLink"); + apiShortLinkInput.value = inputURL; + setInputReadOnly(apiShortLinkInput, true); + + // 设置短链ID和密码，并设置为只读 + const customIdInput = document.querySelector("#customId"); + const passwordInput = document.querySelector("#password"); + const generateButton = document.querySelector('button[onclick="generateShortLink()"]'); + + customIdInput.value = hash; + setInputReadOnly(customIdInput, true); + + passwordInput.value = password; + setInputReadOnly(passwordInput, true); + + // 禁用生成短链按钮 + generateButton.disabled = true; + generateButton.classList.add('btn-secondary'); + generateButton.classList.remove('btn-primary'); } catch (error) { console.log(error); alert("获取短链失败，请检查密码！"); @@ -255,6 +307,17 @@ async function parseInputURL() { ); } + if (params.has("userAgent")) { + document.getElementById("user-agent").value = decodeURIComponent( + params.get("userAgent") + ); + } + + if (params.has("ignoreCountryGroup")) { + document.getElementById("igcg").checked = + params.get("ignoreCountryGroup") === "true"; + } + if (params.has("replace")) { parseAndFillReplaceParams(decodeURIComponent(params.get("replace"))); } @@ -428,21 +491,25 @@ function generateURL() { return; } apiLink.value = `${window.location.origin}${window.location.pathname}${uri}`; + setInputReadOnly(apiLink, true); } function generateShortLink() { const apiShortLink = document.getElementById("apiShortLink"); const password = document.getElementById("password"); + const customId = document.getElementById("customId"); let uri = generateURI(); if (uri === "") { return; } + axios .post( "./short", { url: uri, password: password.value.trim(), + customId: customId.value.trim() }, { headers: { @@ -451,11 +518,20 @@ function generateShortLink() { } ) .then((response) => { - apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`; + // 设置返回的短链ID和密码 + customId.value = response.data.hash; + password.value = response.data.password; + // 生成完整的短链接 + const shortLink = `${window.location.origin}${window.location.pathname}s/${response.data.hash}?password=${response.data.password}`; + apiShortLink.value = shortLink; }) .catch((error) => { console.log(error); - alert("生成短链失败，请重试！"); + if (error.response && error.response.data) { + alert(error.response.data); + } else { + alert("生成短链失败，请重试！"); + } }); } @@ -468,7 +544,7 @@ function updateShortLink() { hash = u.pathname.substring(u.pathname.lastIndexOf("/s/") + 3); } if (password.value.trim() === "") { - alert("请输入密码！"); + alert("请输入原密码进行验证！"); return; } let uri = generateURI(); @@ -490,11 +566,17 @@ function updateShortLink() { } ) .then((response) => { - alert("更新短链成功！"); + alert(`短链 ${hash} 更新成功！`); }) .catch((error) => { console.log(error); - alert(error.response.data); + if (error.response && error.response.status === 401) { + alert("密码错误，请输入正确的原密码！"); + } else if (error.response && error.response.data) { + alert(error.response.data); + } else { + alert("更新短链失败，请重试！"); + } }); } diff --git a/validator/short_link.go b/validator/short_link.go index 4d7f436..f09c7b1 100644 --- a/validator/short_link.go +++ b/validator/short_link.go @@ -3,6 +3,7 @@ package validator type ShortLinkGenValidator struct { Url string `form:"url" binding:"required"` Password string `form:"password"` + CustomID string `form:"customId"` } type GetUrlValidator struct {