🚀 v0.3.1 版本更新

.github/workflows/build.yml

@@ -42,8 +42,8 @@ jobs:
       - uses: tauri-apps/tauri-action@dev
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+        #          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        #          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
         with:
           tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
           releaseName: v__VERSION__-beta

CHANGELOG.md

@@ -2,12 +2,34 @@
 Author: 目棃
 Date: 2023-09-08
 Description: CHANGELOG
-Update: 2023-09-08
+Update: 2023-09-15
 ---
 
 > 本文档 [`Front-matter`](https://github.com/BTMuli/Mucli#FrontMatter) 由 [MuCli](https://github.com/BTMuli/Mucli) 自动生成于 `2023-09-08 09:45:17 `
 >
-> 更新于 `2023-09-08 09:45:17`
+> 更新于 `2023-09-15 19:43:50`
+
+## [0.3.1](https://github.com/BTMuli/TeyvatGuide/releases/v0.3.1) (2023-09-15)
+
+### Feat
+
+- 正式上架微软商店 <a href="https://apps.microsoft.com/store/detail/9NLBNNNBNSJN?launch=true&cid=BTMuli&mode=mini">
+  <img src="https://get.microsoft.com/images/zh-cn%20dark.svg" alt="download"/>
+  </a>
+- 首页：检测到版本更新时，会弹出更新页面
+
+### Fix
+
+- 修复祈愿记录获取失败的问题 [`#38`](https://github.com/BTMuli/TeyvatGuide/issues/38)
+- 修复应用初始化加载数据库失败的问题 [`#40`](https://github.com/BTMuli/TeyvatGuide/issues/40)
+- 修复 Github action 构建失败的问题
+
+### Change
+
+- 应用：关闭 Tauri 自带的自动更新功能，依赖微软商店的更新机制
+- 应用：更改应用名称，`Tauri.Genshin` -> `Teyvat Guide`
+
+FullCommits: [`v0.3.0...v0.3.1`](https://github.com/BTMuli/TeyvatGuide/compare/v0.3.0...v0.3.1)
 
 ## [0.3.0](https://github.com/BTMuli/Tauri.Genshin/releases/v0.3.0) (2023-09-08)
 

README.md

@@ -1,20 +1,19 @@
 ---
 Author: 目棃
-Date: 2023-03-05
 Description: 说明文档
-Update: 2023-09-08
+Date: 2023-03-05
+Update: 2023-09-15
 ---
 
-> 本文档 [`Front-matter`](https://github.com/BTMuli/Mucli#FrontMatter) 由 [MuCli](https://github.com/BTMuli/Mucli) 自动生成于 `undefined`
+> 本文档 [`Frontmatter`](https://github.com/BTMuli/MuCli#Frontmatter) 由 [MuCli](https://github.com/BTMuli/Mucli) 自动生成于 `2023-03-05 14:41:55`
 >
-> 更新于 `2023-09-08 09:44:24`
+> 更新于 `2023-09-15 19:07:25`
-> 更新于 `2023-08-31 11:14:51`
 
-![](https://img.shields.io/github/last-commit/BTMuli/Tauri.Genshin?style=for-the-badge) ![](https://img.shields.io/github/commits-since/BTMuli/Tauri.Genshin/latest?include_prereleases&style=for-the-badge)
+![](https://img.shields.io/github/last-commit/BTMuli/TeyvatGuide?style=for-the-badge) ![](https://img.shields.io/github/commits-since/BTMuli/TeyvatGuide/latest?include_prereleases&style=for-the-badge)
 
-![](https://img.shields.io/badge/UIAF-v1.1-orange?style=for-the-badge) ![](https://img.shields.io/badge/UIGF-v2.3-red?style=for-the-badge) ![](https://img.shields.io/github/license/BTMuli/Tauri.Genshin?style=for-the-badge)
+![](https://img.shields.io/badge/UIAF-v1.1-orange?style=for-the-badge) ![](https://img.shields.io/badge/UIGF-v2.3-red?style=for-the-badge) ![](https://img.shields.io/github/license/BTMuli/TeyvatGuide?style=for-the-badge)
 
-# Tauri.Genshin
+# Teyvat Guide
 
 基于 Tauri 的原神助手应用。
 
@@ -36,9 +35,15 @@ A Genshin Impact assistant app based on Tauri.
 
 ## 下载 / Download
 
-应用仅支持 Windows x64 平台，如需其他平台请自行编译。
+> 程序已经通过微软商店审核，可以直接在商店下载。
 
-[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/BTMuli/Tauri.Genshin?include_prereleases&style=for-the-badge)](https://github.com/BTMuli/Tauri.Genshin/releases/latest)
+<a href="https://apps.microsoft.com/store/detail/9NLBNNNBNSJN?launch=true&cid=BTMuli&mode=mini">
+	<img src="https://get.microsoft.com/images/zh-cn%20dark.svg" alt="download"/>
+</a>
+
+> 不推荐通过 GitHub Release 下载，但仍保留了该功能。
+
+[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/BTMuli/TeyvatGuide?include_prereleases&style=for-the-badge)](https://github.com/BTMuli/TeyvatGuide/releases/latest)
 
 ## 技术栈 / Tech Stack
 

latest.json

@@ -1,11 +0,0 @@
-{
-  "version": "0.2.3",
-  "notes": "https://github.com/BTMuli/Tauri.Genshin/releases/tag/v0.2.3",
-  "pub_date": "2023-08-31T03:45:54.050Z",
-  "platforms": {
-    "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWkdzekNNZjh1aGpiYTMxZkxtaU1HQzRRcFJQWngyaTdzZUpBMjZrak5QZ3JTbXBOV1JySG1FcmlQTDVlM2kwK08xeEZRYVZLZUdMWlRNaXFJdXVsSEloTm8rMjBxUUFnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjkzNDUzNTM4CWZpbGU6dGF1cmktZ2Vuc2hpbl8wLjIuM194NjRfemgtQ04ubXNpLnppcApZZzZMSDlRZDlMZ3VWd1BORUlOL2l3WXBKd2JSajFtVzVwR01Wd2NFUHJ1OUkwT2JVYi9NVFFTQ0x0NDlvUkxXejFhZTVZdUhuM0lSSXZkbGpaVExDdz09Cg==",
-      "url": "https://github.com/BTMuli/Tauri.Genshin/releases/download/v0.2.3/tauri-genshin_0.2.3_x64_zh-CN.msi.zip"
-    }
-  }
-}

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "tauri-genshin",
+  "name": "TeyvatGuide",
   "description": "A Genshin Tool build with Tauri",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": "BTMuli <bt-muli@outlook.com>",
-  "packageManager": "pnpm@8.7.4",
+  "packageManager": "pnpm@8.7.5",
   "scripts": {
     "build": "tauri build",
     "debug": "tauri build --debug",
@@ -17,6 +17,7 @@
     "lint:style:fix": "pnpm lint:style --fix",
     "prettier": "prettier . --write",
     "tauri": "tauri",
+    "tauri:icon": "tauri icon ./public/icon.png",
     "vite:dev": "vite dev",
     "vite:build": "vite build",
     "prepare": "husky install"
@@ -27,12 +28,12 @@
     "*.{ts,vue,css,yml,json,md}": "prettier --write"
   },
   "bugs": {
-    "url": "https://github.com/BTMuli/Tauri.Genshin/issues"
+    "url": "https://github.com/BTMuli/TeyvatGuide/issues"
   },
   "directories": {
     "doc": "docs"
   },
-  "homepage": "https://github.com/BTMuli/Tauri.Genshin#readme",
+  "homepage": "https://github.com/BTMuli/TeyvatGuide#readme",
   "keywords": [
     "Tauri",
     "Node",
@@ -44,7 +45,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/BTMuli/Tauri.Genshin.git"
+    "url": "https://github.com/BTMuli/TeyvatGuide.git"
   },
   "dependencies": {
     "@mdi/font": "7.2.96",
@@ -57,7 +58,7 @@
     "pinia": "^2.1.6",
     "pinia-plugin-persistedstate": "^3.2.0",
     "qrcode.vue": "^3.4.1",
-    "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql#v1",
+    "tauri-plugin-sql-api": "https://github.com/tauri-apps/tauri-plugin-sql#v1",
     "vue": "^3.3.4",
     "vue-echarts": "^6.6.1",
     "vue-json-viewer": "^3.0.4",

src-tauri/Cargo.lock

@@ -2,6 +2,17 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "TeyvatGuide"
+version = "0.3.1"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-sql",
+]
+
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -2069,12 +2080,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -3964,7 +3969,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e"
 dependencies = [
  "anyhow",
- "base64 0.21.3",
  "bytes",
  "cocoa",
  "dirs-next",
@@ -3978,7 +3982,6 @@ dependencies = [
  "heck 0.4.1",
  "http",
  "ignore",
- "minisign-verify",
  "notify-rust",
  "objc",
  "once_cell",
@@ -4006,14 +4009,12 @@ dependencies = [
  "tauri-utils",
  "tempfile",
  "thiserror",
- "time",
  "tokio",
  "url",
  "uuid",
  "webkit2gtk",
  "webview2-com",
  "windows 0.39.0",
- "zip",
 ]
 
 [[package]]
@@ -4059,17 +4060,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "tauri-genshin"
-version = "0.3.0"
-dependencies = [
- "serde",
- "serde_json",
- "tauri",
- "tauri-build",
- "tauri-plugin-sql",
-]
-
 [[package]]
 name = "tauri-macros"
 version = "1.4.0"
@@ -5314,17 +5304,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "zvariant"
 version = "3.15.0"

src-tauri/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "tauri-genshin"
+name = "TeyvatGuide"
-version = "0.3.0"
+version = "0.3.1"
 description = "A Genshin Tool build with Tauri"
 authors = ["BTMuli<bt-muli@outlook.com>"]
 license = "MIT"
-repository = "https://github.com/BTMuli/Tauri.Genshin"
+repository = "https://github.com/BTMuli/TeyvatGuide"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,7 +13,7 @@ edition = "2021"
 tauri-build = { version = "1.4", features = [] }
 
 [dependencies]
-tauri = { version = "1.4", features = ["api-all", "updater"] }
+tauri = { version = "1.4", features = ["api-all"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 

src-tauri/src/main.rs

@@ -7,7 +7,7 @@ fn main() {
     tauri::Builder::default()
         .plugin(tauri_plugin_sql::Builder::default().build())
         .setup(|_app| {
-            let _window = _app.get_window("tauri-genshin").unwrap();
+            let _window = _app.get_window("TeyvatGuide").unwrap();
             #[cfg(debug_assertions)] // only include this code on debug builds
                 _window.open_devtools(); // open the devtools on startup
             Ok(())

src-tauri/tauri.conf.json

@@ -7,8 +7,8 @@
     "withGlobalTauri": true
   },
   "package": {
-    "productName": "tauri-genshin",
+    "productName": "TeyvatGuide",
-    "version": "0.3.0"
+    "version": "0.3.1"
   },
   "tauri": {
     "allowlist": {
@@ -46,8 +46,26 @@
     },
     "bundle": {
       "active": true,
-      "icon": ["icons/icon.png", "icons/icon.ico"],
+      "icon": [
-      "identifier": "tauri-genshin",
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico",
+        "icons/icon.png",
+        "icons/Square30x30Logo.png",
+        "icons/Square44x44Logo.png",
+        "icons/Square71x71Logo.png",
+        "icons/Square89x89Logo.png",
+        "icons/Square107x107Logo.png",
+        "icons/Square142x142Logo.png",
+        "icons/Square150x150Logo.png",
+        "icons/Square284x284Logo.png",
+        "icons/Square310x310Logo.png",
+        "icons/StoreLogo.png"
+      ],
+      "identifier": "TeyvatGuide",
+      "targets": ["msi"],
       "windows": {
         "wix": {
           "language": "zh-CN"
@@ -58,11 +76,11 @@
       "csp": null
     },
     "updater": {
-      "active": true,
+      "active": false,
       "dialog": true,
       "endpoints": [
-        "https://raw.fastgit.org/BTMuli/Tauri.Genshin/master/latest.json",
+        "https://raw.fastgit.org/BTMuli/TeyvatGuide/master/latest.json",
-        "https://raw.kgithub.com/BTMuli/Tauri.Genshin/master/latest.json"
+        "https://raw.kgithub.com/BTMuli/TeyvatGuide/master/latest.json"
       ],
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDg2MkVGRjMxQzJDQzFBNTkKUldSWkdzekNNZjh1aHJGRXBEOGtwbUxLaU1wdWNVeUJaeGhoV2ZlZ3VlYmQ0b2tYZWQwODdnTHkK"
     },
@@ -70,8 +88,8 @@
       {
         "fullscreen": false,
         "resizable": true,
-        "title": "Tauri.Genshin",
+        "title": "Teyvat Guide",
-        "label": "tauri-genshin",
+        "label": "TeyvatGuide",
         "width": 1600,
         "height": 900,
         "center": true,

src/App.vue

@@ -22,6 +22,7 @@ import { useAppStore } from "./store/modules/app";
 // utils
 import { getEmojis } from "./plugins/Mys/request/getEmojis";
 import showSnackbar from "./components/func/snackbar";
+import TGSqlite from "./plugins/Sqlite";
 
 const appStore = useAppStore();
 const isMain = ref<boolean>(false);
@@ -30,9 +31,9 @@ const theme = ref<string>(appStore.theme);
 onBeforeMount(async () => {
   // 获取当前窗口
   const win = window.getCurrent();
-  isMain.value = win.label === "tauri-genshin";
+  isMain.value = win.label === "TeyvatGuide";
   if (isMain.value) {
-    const title = "Tauri.Genshin v" + (await app.getVersion()) + " Beta";
+    const title = "Teyvat Guide v" + (await app.getVersion()) + " Beta";
     await win.setTitle(title);
     await emojiLoad();
     await checkLoad();
@@ -76,6 +77,7 @@ async function checkLoad(): Promise<void> {
     return;
   }
   await createDataDir();
+  await initData();
   appStore.loading = true;
   console.info("数据加载完成！");
 }
@@ -89,6 +91,14 @@ async function createDataDir(): Promise<void> {
   }
   console.info("数据文件夹创建完成！");
 }
+
+// 初始化数据库
+async function initData(): Promise<void> {
+  await TGSqlite.reset();
+  showSnackbar({
+    text: "已成功初始化数据库！",
+  });
+}
 </script>
 <style lang="css">
 .app-container {

src/pages/User/Gacha.vue

@@ -139,14 +139,18 @@ async function confirmRefresh(): Promise<void> {
   loadingTitle.value = "数据获取完成，即将刷新页面";
   loadingSub.value = "";
   loading.value = false;
-  setTimeout(() => {
+  await new Promise((resolve) => {
-    window.location.reload();
+    setTimeout(() => {
-  }, 1000);
+      resolve("");
+    }, 1000);
+  });
+  window.location.reload();
 }
 
 // 获取祈愿数据并写入数据库
 async function getGachaLogs(pool: string, endId: string = "0"): Promise<void> {
   const gachaRes = await TGRequest.User.getGachaLog(authkey.value, pool, endId);
+  console.log(pool, endId, gachaRes);
   if (Array.isArray(gachaRes)) {
     const uigfList: TGApp.Plugins.UIGF.GachaItem[] = [];
     gachaRes.forEach((item) => {
@@ -173,8 +177,18 @@ async function getGachaLogs(pool: string, endId: string = "0"): Promise<void> {
     });
     await TGSqlite.mergeUIGF(account.gameUid, uigfList);
     if (gachaRes.length === 20) {
+      await new Promise((resolve) => {
+        setTimeout(() => {
+          resolve("");
+        }, 1000);
+      });
       await getGachaLogs(pool, gachaRes[gachaRes.length - 1].id);
     }
+  } else {
+    showSnackbar({
+      color: "error",
+      text: `[${pool}][${gachaRes.retcode}] ${gachaRes.message}`,
+    });
   }
 }
 

src/pages/common/Achievements.vue

@@ -51,7 +51,6 @@
           margin: '10px',
           borderRadius: '10px 50px 50px 10px',
           border: '1px solid var(--common-shadow-2)',
-          color: 'var(--tgc-dark-6)',
           fontFamily: 'var(--font-title)',
           cursor: 'pointer',
           position: 'relative',

src/pages/common/Config.vue

@@ -21,7 +21,7 @@
         <v-btn
           size="small"
           variant="outlined"
-          @click="toOuter('https://github.com/BTMuli/Tauri.Genshin/releases/latest')"
+          @click="toOuter('https://github.com/BTMuli/TeyvatGuide/releases/latest')"
         >
           BETA
         </v-btn>
@@ -221,7 +221,14 @@ onMounted(async () => {
   loadingSub.value = "正在获取系统版本";
   osVersion.value = await os.version();
   loadingSub.value = "正在获取数据库信息";
-  dbInfo.value = await TGSqlite.getAppData();
+  try {
+    dbInfo.value = await TGSqlite.getAppData();
+  } catch (e) {
+    showSnackbar({
+      text: "加载数据库错误，请重置数据库!",
+      color: "error",
+    });
+  }
   loadingSub.value = "";
   loading.value = false;
 });
@@ -385,6 +392,7 @@ async function confirmRestore(): Promise<void> {
   }
   loadingSub.value = "正在恢复祈愿数据";
   res = await restoreCookieData();
+  userStore.cookie = await TGSqlite.getCookie();
   if (!res) {
     fail.push("Cookie");
   }

src/pages/common/Home.vue

@@ -17,6 +17,7 @@ import { useHomeStore } from "../../store/modules/home";
 import { useAppStore } from "../../store/modules/app";
 // utils
 import { getBuildTime } from "../../utils/TGBuild";
+import showConfirm from "../../components/func/confirm";
 
 // store
 const appStore = useAppStore();
@@ -54,7 +55,6 @@ onMounted(async () => {
   if (!appStore.devEnv && appStore.devMode) {
     appStore.devMode = false;
   }
-  appStore.buildTime = getBuildTime();
   const showItems = homeStore.getShowValue();
   await Promise.allSettled(
     showItems.map((item) => {
@@ -71,6 +71,16 @@ onMounted(async () => {
     }),
   );
   timer.value = setInterval(readLoading, 100);
+  if (appStore.buildTime !== getBuildTime() && !appStore.devEnv) {
+    const confirm = await showConfirm({
+      title: "检测到版本更新",
+      text: "请到设置页手动更新版本，即将弹出更新说明子页面",
+    });
+    if (confirm) {
+      appStore.buildTime = getBuildTime();
+    }
+    window.open("https://app.btmuli.ink/docs/Changelogs.html");
+  }
 });
 
 function setItemRef(item: any): void {

src/plugins/Sqlite/index.ts

@@ -2,7 +2,7 @@
  * @file plugins Sqlite index.ts
  * @description Sqlite 数据库操作类
  * @author BTMuli<bt-muli@outlook.com>
- * @since Beta v0.3.0
+ * @since Beta v0.3.1
  */
 
 // tauri
@@ -27,7 +27,7 @@ class Sqlite {
    * @since Alpha v0.2.0
    * @private
    */
-  private readonly dbPath: string = "sqlite:tauri-genshin.db";
+  private readonly dbPath: string = "sqlite:TeyvatGuide.db";
   /**
    * @description 数据库包含的表
    * @since Alpha v0.2.3

src/store/modules/app.ts

@@ -2,7 +2,7 @@
  * @file store modules app.ts
  * @description App store module
  * @author BTMuli <bt-muli@outlook.com>
- * @since Beta v0.3.0
+ * @since Beta v0.3.1
  */
 
 // vue
@@ -15,7 +15,7 @@ import { path } from "@tauri-apps/api";
 // 用于存储用户数据的路径
 const userDataDir = `${await path.appLocalDataDir()}userData`;
 // 用于存放数据库的路径
-const dbDataPath = `${await path.appConfigDir()}tauri-genshin.db`;
+const dbDataPath = `${await path.appConfigDir()}TeyvatGuide.db`;
 
 export const useAppStore = defineStore(
   "app",