From f3d055c9bbd88d1c6a809ff6994b74b4b94c9de4 Mon Sep 17 00:00:00 2001
From: Cjsah <cjsah@cjsah.com>
Date: Sun, 16 Jun 2024 10:27:43 +0800
Subject: [PATCH 1/3] update set ip

---
 modules/web/src/api/axios.js             |  6 +-
 modules/web/src/api/index.js             | 13 ++--
 modules/web/src/auto-imports.d.ts        |  3 +-
 modules/web/src/components/BookItems.vue |  7 +--
 modules/web/src/store/bookStore.js       |  8 +++
 modules/web/src/utils/utils.js           |  3 +-
 modules/web/src/views/BookShelf.vue      | 76 ++++++++++++++++++++----
 7 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/modules/web/src/api/axios.js b/modules/web/src/api/axios.js
index cb2c50f6b..352ce6f60 100644
--- a/modules/web/src/api/axios.js
+++ b/modules/web/src/api/axios.js
@@ -2,8 +2,12 @@ import axios from "axios";
 
 const SECOND = 1000;
 
+export const baseUrl = () => {
+  return localStorage.getItem("remoteIp");
+};
+
 const ajax = axios.create({
-  baseURL: import.meta.env.VITE_API || location.origin,
+  // baseURL: import.meta.env.VITE_API || location.origin,
   timeout: 120 * SECOND,
 });
 
diff --git a/modules/web/src/api/index.js b/modules/web/src/api/index.js
index aeb9f1838..c71f876dd 100644
--- a/modules/web/src/api/index.js
+++ b/modules/web/src/api/index.js
@@ -1,10 +1,13 @@
-import ajax from "./axios";
+import ajax, { baseUrl } from "./axios";
 import { ElMessage } from "element-plus/es";
 
 /** https://github.com/gedoor/legado/tree/master/app/src/main/java/io/legado/app/api */
 /** https://github.com/gedoor/legado/tree/master/app/src/main/java/io/legado/app/web */
 
-const { hostname, port } = new URL(import.meta.env.VITE_API || location.origin);
+const getUrl = () => {
+  const { hostname, port } = new URL(baseUrl());
+  return `${hostname}:${Number(port) + 1}`;
+};
 
 const isSourecEditor = /source/i.test(location.href);
 const APIExceptionHandler = (error) => {
@@ -29,7 +32,7 @@ const saveBookProgressWithBeacon = (bookProgress) => {
   if (!bookProgress) return;
   // 常规请求可能会被取消 使用Fetch keep-alive 或者 navigator.sendBeacon
   navigator.sendBeacon(
-    `${import.meta.env.VITE_API || location.origin}/saveBookProgress`,
+    `${baseUrl()}/saveBookProgress`,
     JSON.stringify(bookProgress),
   );
 };
@@ -56,7 +59,7 @@ const search = (
   /** @type {() => void} */ onFinish,
 ) => {
   // webSocket
-  const url = `ws://${hostname}:${Number(port) + 1}/searchBook`;
+  const url = `ws://${getUrl()}/searchBook`;
   const socket = new WebSocket(url);
 
   socket.onopen = () => {
@@ -100,7 +103,7 @@ const debug = (
   /** @type {() => void} */ onFinish,
 ) => {
   // webSocket
-  const url = `ws://${hostname}:${Number(port) + 1}/${
+  const url = `ws://${getUrl()}/${
     isBookSource ? "bookSource" : "rssSource"
   }Debug`;
 
diff --git a/modules/web/src/auto-imports.d.ts b/modules/web/src/auto-imports.d.ts
index 964ac4fd0..567fdd4b1 100644
--- a/modules/web/src/auto-imports.d.ts
+++ b/modules/web/src/auto-imports.d.ts
@@ -82,5 +82,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  import('vue')
 }
diff --git a/modules/web/src/components/BookItems.vue b/modules/web/src/components/BookItems.vue
index 333d4a969..c8543882c 100644
--- a/modules/web/src/components/BookItems.vue
+++ b/modules/web/src/components/BookItems.vue
@@ -50,15 +50,14 @@
 </template>
 <script setup>
 import { dateFormat } from "../utils/utils";
+import { baseUrl } from "@/api/axios.js";
 const props = defineProps(["books", "isSearch"]);
 const emit = defineEmits(["bookClick"]);
 const handleClick = (book) => emit("bookClick", book);
 const getCover = (coverUrl) => {
   return /^data:/.test(coverUrl)
     ? coverUrl
-    : (import.meta.env.VITE_API || location.origin) +
-        "/cover?path=" +
-        encodeURIComponent(coverUrl);
+    : baseUrl() + "/cover?path=" + encodeURIComponent(coverUrl);
 };
 
 const subJustify = computed(() =>
@@ -105,7 +104,7 @@ const subJustify = computed(() =>
         margin-left: 20px;
         flex: 1;
         overflow: hidden;
-        
+
         .name {
           width: fit-content;
           font-size: 16px;
diff --git a/modules/web/src/store/bookStore.js b/modules/web/src/store/bookStore.js
index e41af486e..db03d7874 100644
--- a/modules/web/src/store/bookStore.js
+++ b/modules/web/src/store/bookStore.js
@@ -57,12 +57,20 @@ export const useBookStore = defineStore("book", {
     setConnectType(connectType) {
       this.connectType = connectType;
     },
+    resetConnect() {
+      this.connectStatus = "正在连接后端服务器……";
+      this.connectType = "";
+      this.clearBooks();
+    },
     setNewConnect(newConnect) {
       this.newConnect = newConnect;
     },
     addBooks(books) {
       this.shelf = books;
     },
+    clearBooks() {
+      this.shelf = [];
+    },
     setCatalog(catalog) {
       this.catalog = catalog;
     },
diff --git a/modules/web/src/utils/utils.js b/modules/web/src/utils/utils.js
index b2b1ccaad..42131b16b 100644
--- a/modules/web/src/utils/utils.js
+++ b/modules/web/src/utils/utils.js
@@ -1,4 +1,5 @@
 import { formatDate } from "@vueuse/shared";
+import { baseUrl } from "@/api/axios.js";
 
 export const isLegadoUrl = (/** @type {string} */ url) =>
   /,\s*\{/.test(url) ||
@@ -12,7 +13,7 @@ export const isLegadoUrl = (/** @type {string} */ url) =>
  */
 export function getImageFromLegado(src) {
   return (
-    (import.meta.env.VITE_API || location.origin) +
+    baseUrl() +
     "/image?path=" +
     encodeURIComponent(src) +
     "&url=" +
diff --git a/modules/web/src/views/BookShelf.vue b/modules/web/src/views/BookShelf.vue
index 9c3f27a0d..7c2fe2999 100644
--- a/modules/web/src/views/BookShelf.vue
+++ b/modules/web/src/views/BookShelf.vue
@@ -40,14 +40,24 @@
         </div>
         <div class="setting-wrapper">
           <div class="setting-title">基本设定</div>
-          <div class="setting-item">
+          <div class="setting-ip">
+            <el-input
+              class="setting-input"
+              size="small"
+              :disabled="ipInput.disable"
+              v-model="ipInput.ip"
+              @keydown.enter="setIP"
+            />
             <el-tag
-              :type="connectType"
-              size="large"
-              class="setting-connect"
-              :class="{ 'no-point': newConnect }"
-              @click="setIP"
+              type="primary"
+              class="setting-toggle"
+              @click="toggleIpConfig"
             >
+              {{ ipInput.disable ? "修改" : "取消" }}
+            </el-tag>
+          </div>
+          <div class="setting-item">
+            <el-tag :type="connectType" size="large" class="setting-connect">
               {{ connectStatus }}
             </el-tag>
           </div>
@@ -81,6 +91,7 @@ import githubUrl from "@/assets/imgs/github.png";
 import { useLoading } from "@/hooks/loading";
 import { Search } from "@element-plus/icons-vue";
 import API from "@api";
+import ajax from "@/api/axios.js";
 
 const store = useBookStore();
 const { connectStatus, connectType, newConnect, shelf } = storeToRefs(store);
@@ -136,7 +147,7 @@ const searchBook = () => {
       }
       try {
         store.setSearchBooks(JSON.parse(data));
-        books.value = store.searchBooks
+        books.value = store.searchBooks;
         //store.searchBooks.forEach((item) => books.value.push(item));
       } catch (e) {
         ElMessage.error("后端数据错误");
@@ -152,7 +163,19 @@ const searchBook = () => {
   );
 };
 
-const setIP = () => {};
+const ipInput = reactive({
+  ip: "",
+  disable: true,
+});
+const toggleIpConfig = () => {
+  ipInput.ip = localStorage.getItem("remoteIp");
+  ipInput.disable = !ipInput.disable;
+};
+const setIP = () => {
+  localStorage.setItem("remoteIp", ipInput.ip);
+  ipInput.disable = true;
+  loadShelf();
+};
 
 const router = useRouter();
 const handleBookClick = async (book) => {
@@ -189,19 +212,30 @@ const toDetail = (bookUrl, bookName, bookAuthor, chapterIndex, chapterPos) => {
 onMounted(() => {
   //获取最近阅读书籍
   let readingRecentStr = localStorage.getItem("readingRecent");
+  ipInput.ip = localStorage.getItem("remoteIp");
+  ajax.interceptors.request.use((config) => {
+    config.baseURL = ipInput.ip;
+    return config;
+  });
   if (readingRecentStr != null) {
     readingRecent.value = JSON.parse(readingRecentStr);
     if (typeof readingRecent.value.chapterIndex == "undefined") {
       readingRecent.value.chapterIndex = 0;
     }
   }
+  loadShelf();
+});
+
+const loadShelf = () => {
+  store.resetConnect();
   loadingWrapper(
     store
       .saveBookProgress()
       //确保各种网络情况下同步请求先完成
       .finally(fetchBookShelfData),
   );
-});
+};
+
 const fetchBookShelfData = () => {
   return API.getBookShelf()
     .then((response) => {
@@ -308,15 +342,31 @@ const fetchBookShelfData = () => {
         font-family: FZZCYSK;
       }
 
+      .setting-ip {
+        margin-top: 16px;
+        white-space: nowrap;
+      }
+
+      .setting-input {
+        width: 216px;
+        margin-right: 4px;
+      }
+
       .no-point {
         pointer-events: none;
       }
 
-      .setting-connect {
-        font-size: 8px;
-        margin-top: 16px;
-        // color: #6B7C87;
+      .setting-toggle {
+        font-size: 10px;
         cursor: pointer;
+        //margin-top: 4px;
+      }
+
+      .setting-connect {
+        font-size: 10px;
+        margin-top: 4px;
+        // color: #6B7C87;
+        //cursor: pointer;
       }
     }
 

From 96a3b6b802f7e23bfa4a6501c584061386827d1c Mon Sep 17 00:00:00 2001
From: Cjsah <cjsah@cjsah.com>
Date: Sun, 16 Jun 2024 10:39:37 +0800
Subject: [PATCH 2/3] remove .dev

---
 modules/web/.env.development | 1 -
 modules/web/.env.production  | 1 -
 modules/web/README.md        | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 modules/web/.env.development
 delete mode 100644 modules/web/.env.production

diff --git a/modules/web/.env.development b/modules/web/.env.development
deleted file mode 100644
index 03aca1a74..000000000
--- a/modules/web/.env.development
+++ /dev/null
@@ -1 +0,0 @@
-VITE_API=http://192.168.10.11:1122
diff --git a/modules/web/.env.production b/modules/web/.env.production
deleted file mode 100644
index b182964c3..000000000
--- a/modules/web/.env.production
+++ /dev/null
@@ -1 +0,0 @@
-VITE_API=
diff --git a/modules/web/README.md b/modules/web/README.md
index 02407cc80..91e5d7a7b 100644
--- a/modules/web/README.md
+++ b/modules/web/README.md
@@ -12,9 +12,8 @@
 | Edge ≥ 79                                                              | Firefox ≥ 78                                                                      | Chrome ≥ 64                                                                    | Safari ≥ 12                                                                    |
 
 ## 开发
-> 需要阅读app提供后端服务，开发前修改环境变量`VITE_API`为阅读web服务地址
+> 需要阅读app提供后端服务
 
 ```bash
-echo "VITE_API=http://<ip>:<port>" > .env.development
 pnpm dev
 ```

From 94aaee8d9b8451871a1d4b7bcb1746d55bca807a Mon Sep 17 00:00:00 2001
From: Cjsah <cjsah@cjsah.com>
Date: Sun, 16 Jun 2024 10:51:12 +0800
Subject: [PATCH 3/3] resolve refresh

---
 modules/web/src/api/axios.js        | 19 +++++++++++++++----
 modules/web/src/views/BookShelf.vue | 13 ++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/modules/web/src/api/axios.js b/modules/web/src/api/axios.js
index 352ce6f60..469deab9d 100644
--- a/modules/web/src/api/axios.js
+++ b/modules/web/src/api/axios.js
@@ -1,14 +1,25 @@
 import axios from "axios";
 
 const SECOND = 1000;
-
-export const baseUrl = () => {
-  return localStorage.getItem("remoteIp");
-};
+const remoteIp = ref(localStorage.getItem("remoteIp"));
 
 const ajax = axios.create({
   // baseURL: import.meta.env.VITE_API || location.origin,
   timeout: 120 * SECOND,
 });
 
+ajax.interceptors.request.use((config) => {
+  config.baseURL = remoteIp.value;
+  return config;
+});
+
 export default ajax;
+
+export const setRemoteIp = (ip) => {
+  remoteIp.value = ip;
+  localStorage.setItem("remoteIp", ip);
+};
+
+export const baseUrl = () => {
+  return remoteIp.value;
+};
diff --git a/modules/web/src/views/BookShelf.vue b/modules/web/src/views/BookShelf.vue
index 7c2fe2999..384c39e1d 100644
--- a/modules/web/src/views/BookShelf.vue
+++ b/modules/web/src/views/BookShelf.vue
@@ -91,7 +91,7 @@ import githubUrl from "@/assets/imgs/github.png";
 import { useLoading } from "@/hooks/loading";
 import { Search } from "@element-plus/icons-vue";
 import API from "@api";
-import ajax from "@/api/axios.js";
+import { baseUrl, setRemoteIp } from "@/api/axios.js";
 
 const store = useBookStore();
 const { connectStatus, connectType, newConnect, shelf } = storeToRefs(store);
@@ -164,15 +164,15 @@ const searchBook = () => {
 };
 
 const ipInput = reactive({
-  ip: "",
+  ip: baseUrl(),
   disable: true,
 });
 const toggleIpConfig = () => {
-  ipInput.ip = localStorage.getItem("remoteIp");
+  ipInput.ip = baseUrl();
   ipInput.disable = !ipInput.disable;
 };
 const setIP = () => {
-  localStorage.setItem("remoteIp", ipInput.ip);
+  setRemoteIp(ipInput.ip);
   ipInput.disable = true;
   loadShelf();
 };
@@ -212,11 +212,6 @@ const toDetail = (bookUrl, bookName, bookAuthor, chapterIndex, chapterPos) => {
 onMounted(() => {
   //获取最近阅读书籍
   let readingRecentStr = localStorage.getItem("readingRecent");
-  ipInput.ip = localStorage.getItem("remoteIp");
-  ajax.interceptors.request.use((config) => {
-    config.baseURL = ipInput.ip;
-    return config;
-  });
   if (readingRecentStr != null) {
     readingRecent.value = JSON.parse(readingRecentStr);
     if (typeof readingRecent.value.chapterIndex == "undefined") {