Merge pull request #624 from terwer/dev

feat: change ip

apps/siyuan/src/app.config.ts

@@ -38,10 +38,10 @@ interface AppConfig {
 
 export const AppConfig = {
   lang: "zh_CN",
-  siteUrl: "https://siyuan.wiki",
+  siteUrl: "",
   siteTitle: "在线分享",
-  siteSlogan: "随时随便分享您的思源笔记",
-  siteDescription: "致力于做 obsidian.publish 国内替代品，notion 发布国内替代品",
+  siteSlogan: "您的自部署 notion 替代品",
+  siteDescription: "您的自部署 notion 替代品",
   homePageId: "",
   header: "",
   footer: "",

apps/siyuan/src/pages/Share.vue

@@ -136,10 +136,31 @@ const copyWebLink = () => {
   })
 }
 
+const getSiteIp = (): string => {
+  let siteIp: string = ""
+  try {
+    siteIp = new URL(formData.setting.siteUrl).hostname
+  } catch (e) {
+    logger.warn("getSiteURL error", e)
+  }
+  return siteIp
+}
+
 const handleIpChange = () => {
-  const url = new URL(formData.shareLink)
-  url.hostname = formData.ip
-  formData.shareLink = url.toString()
+  const siteIp = getSiteIp()
+  if (!StrUtil.isEmptyString(siteIp) && siteIp === formData.ip) {
+    const url = new URL(formData.shareLink)
+    const siteUrl = new URL(formData.setting.siteUrl)
+    url.hostname = siteUrl.hostname
+    url.port = siteUrl.port
+    formData.shareLink = url.toString()
+  } else {
+    const url = new URL(formData.shareLink)
+    const originUrl = new URL(window.location.origin)
+    url.hostname = formData.ip
+    url.port = originUrl.port
+    formData.shareLink = url.toString()
+  }
 }
 
 const handleSetHome = () => {
@@ -195,6 +216,15 @@ onBeforeMount(async () => {
   formData.ipList = ips.map((ip: string) => {
     return {value: ip, label: ip}
   })
+  // 自定义的也加进去
+  const siteIp = getSiteIp()
+  if (!StrUtil.isEmptyString(siteIp) && !ips.includes(siteIp)) {
+    formData.ip = siteIp
+    formData.ipList.push({
+      value: siteIp,
+      label: siteIp,
+    })
+  }
 })
 logger.debug("share inited", props)
 </script>