Bump version to 3.11.10

electron-builder.json

@@ -48,6 +48,7 @@
   "win": {
     "icon": "./static/images/icon.png",
     "artifactName": "XBYDriver-${version}-win-${arch}.${ext}",
+    "requestedExecutionLevel": "asInvoker",
     "extraResources": [
       { "from": "./static/engine/win32/${arch}", "to": "./engine"},
       { "from": "./static/engine/aria2.conf", "to": "./engine/aria2.conf"},

package.json

@@ -1,7 +1,7 @@
 {
   "name": "xbyyunpan",
   "description": "小白羊云盘",
-  "version": "3.11.9",
+  "version": "3.11.10",
   "main": "dist/electron/main/index.js",
   "author": {
     "name": "gaozhangmin",

src/aliapi/server.tsx

@@ -9,7 +9,7 @@ import { getAppNewPath, getResourcesPath, getUserDataPath, openExternal } from '
 import ShareDAL from '../share/share/ShareDAL'
 import DebugLog from '../utils/debuglog'
 import { writeFileSync, rmSync, existsSync, readFileSync } from 'fs'
-import { execFile, spawn, SpawnOptions } from 'child_process'
+import { ChildProcess, execFile, spawn, SpawnOptions } from 'child_process'
 import path from 'path'
 
 const { shell } = require('electron')
@@ -157,7 +157,7 @@ export default class ServerHttp {
         if (tagName) {
           let configVer = Config.appVersion.replaceAll('v', '').trim()
           if (process.platform !== 'linux') {
-            let localVersion = getUserDataPath('localVersion')
+            let localVersion = getResourcesPath('localVersion')
             if (localVersion && existsSync(localVersion)) {
               configVer = readFileSync(localVersion, 'utf-8').replaceAll('v', '').trim()
             }
@@ -336,17 +336,31 @@ export default class ServerHttp {
       })
   }
 
-  static async autoInstallNewVersion(resourcesPath: string) {
+  static autoInstallNewVersion(resourcesPath: string) {
     // 自动安装
-    const options = { shell: true, windowsVerbatimArguments: true }
-    const subProcess = await execFile(`${resourcesPath}`, options)
-    if (subProcess.pid && process.kill(subProcess.pid, 0)) {
-      await this.Sleep(1000)
-      window.WebToElectron({ cmd: 'exit' })
-    } else {
-      message.info('安装失败，请前往文件夹手动安装', 5)
-      const resources = getResourcesPath('')
-      shell.openPath(path.join(resources, '/'))
+    const options: SpawnOptions = { shell: true, windowsVerbatimArguments: true }
+    if (process.platform === 'win32' || process.platform === 'linux') {
+      execFile('\"' + resourcesPath + '\"', options, error => {
+        if(error) {
+          message.info('安装失败，请前往文件夹手动安装', 5)
+          const resources = getResourcesPath('')
+          shell.openPath(path.join(resources, '/'))
+        } else {
+          message.info('安装成功，请重新打开', 5)
+          window.WebToElectron({ cmd: 'exit' })
+        }
+      })
+    } else if (process.platform === 'darwin') {
+      execFile('open ' + '\"' + resourcesPath + '\"', options, error => {
+        if(error) {
+          message.info('安装失败，请前往文件夹手动安装', 5)
+          const resources = getResourcesPath('')
+          shell.openPath(path.join(resources, '/'))
+        } else {
+          message.info('请手动移动到应用程序目录，完成安装', 5)
+          window.WebToElectron({ cmd: 'exit' })
+        }
+      })
     }
   }
 }

src/utils/config.ts

@@ -1,5 +1,5 @@
 export default class Config {
-  static appVersion = '3.11.8'
+  static appVersion = '3.11.10'
   static referer = 'https://www.aliyundrive.com/'
   static downAgent = 'okhttp/4.2.2'
   static userAgent = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) aDrive/4.1.0 Chrome/108.0.5359.215 Electron/22.3.1 Safari/537.36'