Merge pull request #101 from LOG1997/94-添加软件打包tauri

94 添加软件打包tauri

.github/workflows/node.js.yml

@@ -5,7 +5,7 @@ name: Node.js CI
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: [main]
 
 jobs:
   build:
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-                  cache: 'pnpm'
+          cache: pnpm
       - run: pnpm install
       - run: pnpm build
       - name: Copy and Rename index.html to dist
@@ -40,5 +40,3 @@ jobs:
           build_dir: dist
         env:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-              
-

.github/workflows/release.yml

@@ -6,9 +6,8 @@ on:
       - 'v*'
 
 jobs:
-  build-and-release:
+  build-web:
     runs-on: ubuntu-latest
-    
     permissions:
       contents: write
 
@@ -26,18 +25,18 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '22.x'
+          node-version: 22.x
-          cache: 'pnpm'
+          cache: pnpm
 
       - name: Install dependencies
         run: pnpm install
 
+      - name: Install dependency fast-glob
+        run: pnpm add fast-glob -D
+
       - name: Build for production
         run: pnpm build
 
-      - name: Build for file protocol
-        run: pnpm build:file
-
       - name: Prepare directories
         run: |
           mv dist dist-prod
@@ -45,18 +44,78 @@ jobs:
 
       - name: Create production build archive
         run: |
-          tar -czf dist.tar.gz dist-prod
+          zip -r dist.zip dist-prod
 
-      - name: Create file protocol build archive
+      - name: Upload web build artifact
-        run: |
+        uses: actions/upload-artifact@v4
-          tar -czf dist-file.tar.gz dist-file
+        with:
+          name: web-build
+          path: dist.zip
 
-      - name: Release
+  publish-tauri:
+    permissions:
+      contents: write
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: ./src-tauri -> target
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 22.x
+          cache: pnpm
+
+      - name: Install frontend dependencies
+        run: pnpm install
+
+      - name: Install dependency fast-glob
+        run: pnpm add fast-glob -D
+
+      - name: Build the app
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tagName: ${{ github.ref_name }}
+          releaseName: 'Release ${{ github.ref_name }}'
+          releaseBody: See the assets to download this version and install.
+          releaseDraft: true
+          prerelease: false
+          run: pnpm tauri build
+
+  release:
+    needs: [build-web, publish-tauri]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download web build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: web-build
+
+      - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            dist.tar.gz
+            dist.zip
-            dist-file.tar.gz
+          name: 'Release ${{ github.ref_name }}'
           draft: true
           prerelease: false
           generate_release_notes: true

.gitignore

@@ -35,6 +35,8 @@ bower_components
 # node-waf configuration
 .lock-wscript
 
+pnpm-lock.yaml
+
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 

build/syncVersion.js

@@ -0,0 +1,22 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// 读取 package.json 版本号
+const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'));
+const version = packageJson.version;
+
+// 读取并更新 tauri.conf.json
+const tauriConfPath = path.join(__dirname, '..', 'src-tauri', 'tauri.conf.json');
+const tauriConf = JSON.parse(fs.readFileSync(tauriConfPath, 'utf8'));
+
+// 更新版本号
+tauriConf.version = version;
+
+// 写回 tauri.conf.json
+fs.writeFileSync(tauriConfPath, JSON.stringify(tauriConf, null, 2));
+
+console.log(`Tauri 配置版本号已同步至: ${version}`);

eslint.config.js

@@ -2,7 +2,7 @@ import antfu from '@antfu/eslint-config'
 
 export default antfu(
     {
-        ignores: ['**/node_modules', '**/public', '**/dist', '**/package.json', '**/*.yaml', '**/.gitignore', '**/.env*', '**/tsconfig*', '**/*.config.js'],
+        ignores: ['**/node_modules', '**/build', '**/public', '**/dist', '**/package.json', '**/*.yaml', '**/.gitignore', '**/.env*', '**/tsconfig*', '**/*.config.js'],
     },
     {
         rules: {

package.json

@@ -9,6 +9,7 @@
         "build": "vue-tsc --noEmit && vite build",
         "build:pre": "vue-tsc --noEmit && vite build --mode prebuild",
         "build:file": "vue-tsc --noEmit && vite build --mode file",
+        "tauri":"node ./build/syncVersion.js && tauri",
         "test": "vitest",
         "test:ui": "vitest --ui",
         "preview": "vite preview",
@@ -30,8 +31,8 @@
         "pinia": "^3.0.3",
         "pinia-plugin-persist": "^1.0.0",
         "sparticles": "^1.3.1",
-        "three": "^0.166.0",
+        "three": "0.166.0",
-        "three-css3d": "^1.0.6",
+        "three-css3d": "1.0.6",
         "uuid": "^13.0.0",
         "vue": "^3.5.13",
         "vue-dompurify-html": "^5.2.0",
@@ -57,7 +58,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/markdown-it": "^14.1.2",
         "@types/node": "^24.10.2",
-        "@types/three": "^0.166.0",
+        "@types/three": "0.166.0",
         "@typescript-eslint/eslint-plugin": "^8.49.0",
         "@typescript-eslint/parser": "^8.49.0",
         "@vitejs/plugin-legacy": "^7.2.1",

pnpm-lock.yaml

@@ -51,10 +51,10 @@ importers:
         specifier: ^1.3.1
         version: 1.3.1
       three:
-        specifier: ^0.166.0
+        specifier: 0.166.0
         version: 0.166.0
       three-css3d:
-        specifier: ^1.0.6
+        specifier: 1.0.6
         version: 1.0.6(three@0.166.0)
       uuid:
         specifier: ^13.0.0
@@ -127,7 +127,7 @@ importers:
         specifier: ^24.10.2
         version: 24.10.2
       '@types/three':
-        specifier: ^0.166.0
+        specifier: 0.166.0
         version: 0.166.0
       '@typescript-eslint/eslint-plugin':
         specifier: ^8.49.0
@@ -1394,36 +1394,42 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.0':
     resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.0':
     resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.0':
     resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.0':
     resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.0':
     resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.0':
     resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
@@ -1494,56 +1500,67 @@ packages:
     resolution: {integrity: sha512-aL6hRwu0k7MTUESgkg7QHY6CoqPgr6gdQXRJI1/VbFlUMwsSzPGSR7sG5d+MCbYnJmJwThc2ol3nixj1fvI/zQ==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.52.0':
     resolution: {integrity: sha512-BTs0M5s1EJejgIBJhCeiFo7GZZ2IXWkFGcyZhxX4+8usnIo5Mti57108vjXFIQmmJaRyDwmV59Tw64Ap1dkwMw==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.52.0':
     resolution: {integrity: sha512-uj672IVOU9m08DBGvoPKPi/J8jlVgjh12C9GmjjBxCTQc3XtVmRkRKyeHSmIKQpvJ7fIm1EJieBUcnGSzDVFyw==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.52.0':
     resolution: {integrity: sha512-/+IVbeDMDCtB/HP/wiWsSzduD10SEGzIZX2945KSgZRNi4TSkjHqRJtNTVtVb8IRwhJ65ssI56krlLik+zFWkw==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.52.0':
     resolution: {integrity: sha512-U1vVzvSWtSMWKKrGoROPBXMh3Vwn93TA9V35PldokHGqiUbF6erSzox/5qrSMKp6SzakvyjcPiVF8yB1xKr9Pg==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-gnu@4.52.0':
     resolution: {integrity: sha512-X/4WfuBAdQRH8cK3DYl8zC00XEE6aM472W+QCycpQJeLWVnHfkv7RyBFVaTqNUMsTgIX8ihMjCvFF9OUgeABzw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.52.0':
     resolution: {integrity: sha512-xIRYc58HfWDBZoLmWfWXg2Sq8VCa2iJ32B7mqfWnkx5mekekl0tMe7FHpY8I72RXEcUkaWawRvl3qA55og+cwQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.52.0':
     resolution: {integrity: sha512-mbsoUey05WJIOz8U1WzNdf+6UMYGwE3fZZnQqsM22FZ3wh1N887HT6jAOjXs6CNEK3Ntu2OBsyQDXfIjouI4dw==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.52.0':
     resolution: {integrity: sha512-qP6aP970bucEi5KKKR4AuPFd8aTx9EF6BvutvYxmZuWLJHmnq4LvBfp0U+yFDMGwJ+AIJEH5sIP+SNypauMWzg==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.52.0':
     resolution: {integrity: sha512-nmSVN+F2i1yKZ7rJNKO3G7ZzmxJgoQBQZ/6c4MuS553Grmr7WqR7LLDcYG53Z2m9409z3JLt4sCOhLdbKQ3HmA==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.52.0':
     resolution: {integrity: sha512-2d0qRo33G6TfQVjaMR71P+yJVGODrt5V6+T0BDYH4EMfGgdC/2HWDVjSSFw888GSzAZUwuska3+zxNUCDco6rQ==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openharmony-arm64@4.52.0':
     resolution: {integrity: sha512-A1JalX4MOaFAAyGgpO7XP5khquv/7xKzLIyLmhNrbiCxWpMlnsTYr8dnsWM7sEeotNmxvSOEL7F65j0HXFcFsw==}
@@ -1628,24 +1645,28 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-arm64-musl@4.1.13':
     resolution: {integrity: sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-linux-x64-gnu@4.1.13':
     resolution: {integrity: sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-x64-musl@4.1.13':
     resolution: {integrity: sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-wasm32-wasi@4.1.13':
     resolution: {integrity: sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA==}
@@ -1708,30 +1729,35 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@tauri-apps/cli-linux-arm64-musl@2.9.5':
     resolution: {integrity: sha512-/gRBMnphS9E8riZ0LIbBhZ9Oy16A2rx/g3DGR0DcDBvUtkLfbL0lMu4s+sY85nkn9An15+cZ1ZK6d7AIqWahLA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@tauri-apps/cli-linux-riscv64-gnu@2.9.5':
     resolution: {integrity: sha512-NOzjPF9YIBodjdkFcJmqINT0k3YDoR5ANM/jg6Z6s3Zmk8ScN6inI60jTxcfgfWyITiKsPy7GJyYou3Cm2XNzw==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@tauri-apps/cli-linux-x64-gnu@2.9.5':
     resolution: {integrity: sha512-SfGbwgvTphM5y+J91NyU/psleMUlyyPkZyDCFg8WU1HX8DpKUT3Vwhb/W1xpUBGb56tJgGCO46FCVkr8w4Areg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@tauri-apps/cli-linux-x64-musl@2.9.5':
     resolution: {integrity: sha512-ZfeoiASAOGDzyvN+TDAg8A1pCeS082h4uc0vZKvtWUN+9QBIMfz0yJwltAv+SN/afap6NS6DVkbPV3UVuI9V5A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@tauri-apps/cli-win32-arm64-msvc@2.9.5':
     resolution: {integrity: sha512-ulg7irow+ekjaK4inFHVq7m1KQebDSYNb17DFKV+h+x7qnLZymz2gHK7df2u4YyEjqvzwRd3AJpU3HNxRurSFQ==}
@@ -3886,24 +3912,28 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.30.1:
     resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.30.1:
     resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.30.1:
     resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-win32-arm64-msvc@1.30.1:
     resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==}

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "log-lottery",
-  "version": "0.1.0",
+  "version": "0.0.4",
   "identifier": "to2026.xyz",
   "build": {
     "frontendDist": "../dist",

src/locales/en.ts

@@ -92,7 +92,7 @@ export default {
         dialogResetAllData: 'This operation will reset all data. Do you want to continue?',
         dialogSingleDrawLimit: 'Only 10 characters can be extracted in a single draw',
         dialogLatestBrowser: 'Please use the latest version of Chrome or Edge browser',
-    tipResetPrize: 'Performing operations may reset data, please proceed with caution',
+        tipResetPrize: 'Performing operations may reset data and cant recover, please proceed with caution',
     },
     tooltip: {
         settingConfiguration: 'Setting/Configuration',

src/locales/zhCn.ts

@@ -59,7 +59,7 @@ export default {
         detail: '详细信息',
         noneData: '暂无数据',
         // prize configuration
-    fullParticipation: '全员参加',
+        fullParticipation: '可重复',
         numberParticipants: '抽奖人数',
         isDone: '已抽取',
         image: '图片',
@@ -92,7 +92,7 @@ export default {
         dialogResetAllData: '该操作会重置所有数据，是否继续？',
         dialogSingleDrawLimit: '单次抽取只能抽取10位',
         dialogLatestBrowser: '请使用最新版Chrome或者Edge浏览器',
-    tipResetPrize: '进行操作可能会重置数据，请谨慎操作',
+        tipResetPrize: '进行操作可能会重置数据并不可恢复，请谨慎操作',
     },
     tooltip: {
         settingConfiguration: '设置/配置',

src/views/Config/Global/FaceConfig/index.vue

@@ -1,9 +1,9 @@
 <script setup lang='ts'>
-import localforage from 'localforage'
 import { storeToRefs } from 'pinia'
 import { onMounted, ref, watch } from 'vue'
 import { ColorPicker } from 'vue3-colorpicker'
 import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
 import { z as zod } from 'zod'
 import { daisyuiThemes } from '@/constant/theme'
 import i18n, { languageList } from '@/locales/i18n'
@@ -13,6 +13,7 @@ import { clearAllDbStore } from '@/utils/localforage'
 import PatternSetting from './components/PatternSetting.vue'
 import 'vue3-colorpicker/style.css'
 
+const router = useRouter()
 const { t } = useI18n()
 const globalConfig = useStore().globalConfig
 const personConfig = useStore().personConfig
@@ -315,7 +316,11 @@ onMounted(() => {
               <span class="truncate w-option-xs">{{ item.name }}</span>
             </option>
           </select>
-          <span class="label">请先前往图片管理上传图片</span>
+          <span class="label">请先前往
+            <a class="link link-info" @click="() => { router.push('image') }">
+              图片管理
+            </a>
+            上传图片</span>
         </div>
         <div class="grid w-full grid-cols-2 gap-4">
           <div class="flex flex-col items-center max-w-xs gap-1 form-control">

src/views/Config/Readme/index.vue

@@ -1,18 +1,36 @@
 <script setup lang='ts'>
 import markdownit from 'markdown-it'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
+import readmeEn from '@/../public/readme-en.md?raw'
+import readmeZh from '@/../public/readme-zhCn.md?raw'
 import i18n from '@/locales/i18n'
 
 const md = markdownit()
 const readmeHtml = ref('')
-function readMd() {
-  fetch(`/log-lottery/${i18n.global.t('data.readmeName')}`)
-    .then(res => res.text())
-    .then((res) => {
-      readmeHtml.value = md.render(res)
-    })
-}
 
+function getReadmeContent() {
+  const locale = i18n.global.locale.value
+  if (locale === 'zhCn') {
+    return readmeZh
+  }
+  else {
+    return readmeEn
+  }
+}
+function readMd() {
+  try {
+    const content = getReadmeContent()
+    readmeHtml.value = md.render(content)
+  }
+  catch (error) {
+    console.error('Failed to load readme:', error)
+    readmeHtml.value = '<p>Failed to load README content.</p>'
+  }
+}
+// 监听语言变化
+watch(() => i18n.global.locale.value, () => {
+  readMd()
+})
 onMounted(() => {
   readMd()
 })