From b88b57ae628847f6730531912d41af47babf6c0b Mon Sep 17 00:00:00 2001
From: mio <10892119+biuuu@users.noreply.github.com>
Date: Wed, 3 May 2023 13:26:51 +0800
Subject: [PATCH] fix: the error message for authkey timeout is not displayed

---
 src/main/getData.js    | 14 ++++----------
 src/renderer/App.vue   | 17 +++++++++++++----
 src/renderer/index.css |  6 ++++++
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/main/getData.js b/src/main/getData.js
index 2c8f600..1ca5b1a 100644
--- a/src/main/getData.js
+++ b/src/main/getData.js
@@ -238,7 +238,6 @@ const tryGetUid = async (queryString) => {
   try {
     for (let [key] of defaultTypeMap) {
       const res = await request(`${url}&gacha_type=${key}&page=1&size=6`)
-      checkResStatus(res)
       if (res.data.list && res.data.list.length) {
         return res.data.list[0].uid
       }
@@ -336,10 +335,7 @@ const tryRequest = async (url, retry = false) => {
   const gachaTypeUrl = `${apiDomain}/common/gacha_record/api/getGachaLog?${queryString}&page=1&size=5&gacha_type=1&end_id=0`
   try {
     const res = await request(gachaTypeUrl)
-    if (res.retcode !== 0) {
-      return false
-    }
-    return true
+    checkResStatus(res)
   } catch (e) {
     if (e.code === 'ERR_PROXY_CONNECTION_FAILED' && !retry) {
       await disableProxy()
@@ -354,11 +350,6 @@ const getUrl = async () => {
   let url = await readLog()
   if (!url && config.proxyMode) {
     url = await useProxy()
-  } else if (url) {
-    const result = await tryRequest(url)
-    if (!result && config.proxyMode) {
-      url = await useProxy()
-    }
   }
   return url
 }
@@ -375,6 +366,9 @@ const fetchData = async (urlOverride) => {
     sendMsg(message)
     throw new Error(message)
   }
+
+  await tryRequest(url)
+
   const searchParams = getQuerystring(url)
   if (!searchParams) {
     const message = text.url.incorrect
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 1335d01..5586f57 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -55,10 +55,12 @@
       </template>
     </el-dialog>
 
-    <el-dialog :title="ui.button.solution" v-model="state.showCacheCleanDlg" width="90%" custom-class="max-w-md">
-      <el-button plain icon="folder" type="primary" @click="openCacheFolder">{{ui.button.cacheFolder}}</el-button>
-      <p class="my-4 leading-2 text-gray-600 text-sm whitespace-pre-line">{{ui.extra.cacheClean}}</p>
-      <p class="my-2 text-gray-400 text-xs">{{ui.extra.findCacheFolder}}</p>
+    <el-dialog :title="ui.button.solution" v-model="state.showCacheCleanDlg" width="90%" custom-class="max-w-md cache-clean-dialog">
+      <el-button plain icon="folder" type="success" @click="openCacheFolder">{{ui.button.cacheFolder}}</el-button>
+      <p class="my-2 flex flex-col text-teal-800 text-[13px]">
+        <span class="my-1" v-for="txt of cacheCleanTextList">{{ txt }}</span>
+      </p>
+      <p class="my-2 text-gray-500 text-xs">{{ui.extra.findCacheFolder}}</p>
       <template #footer>
         <div class="dialog-footer text-center">
           <el-button  type="primary" @click="state.showCacheCleanDlg = false" class="focus:outline-none">{{ui.common.ok}}</el-button>
@@ -99,6 +101,13 @@ const ui = computed(() => {
   }
 })
 
+const cacheCleanTextList = computed(() => {
+  if (ui.value) {
+    return ui.value.extra?.cacheClean?.split('\n')
+  }
+  return []
+})
+
 const gachaData = computed(() => {
   return state.dataMap.get(state.current)
 })
diff --git a/src/renderer/index.css b/src/renderer/index.css
index ef2eb3c..b6ea05e 100644
--- a/src/renderer/index.css
+++ b/src/renderer/index.css
@@ -13,4 +13,10 @@
   body::-webkit-scrollbar-thumb {
     @apply rounded-full bg-gray-300;
   }
+}
+
+@layer utilities {
+  .cache-clean-dialog .el-dialog__body {
+    padding: 0 20px;
+  }
 }
\ No newline at end of file