集成服务端

.gitignore

@@ -4,6 +4,10 @@ node_modules
 /dist_electron
 *.local
 target
+
+# 服务端API
+/NMApi
+/NMApi.asar 
  
 # local env files
 .env.local

electron/electron.js

@@ -1,9 +1,18 @@
 // electron/electron.js
 const path = require('path');
 const { app, BrowserWindow } = require('electron');
+let exec = require('child_process').exec;   
 
 const isDev = process.env.IS_DEV == "true" ? true : false;
 
+//计算NMApi路径
+let NMApiPath = isDev ? '../NMApi.asar' : path.join(process.resourcesPath, 'NMApi.asar')
+let p = require('path').join(NMApiPath + '/node_modules');
+require('module').globalPaths.unshift(p); //加入到module的路径列表
+
+console.log(process.resourcesPath, NMApiPath)
+const svc = require(NMApiPath + '/app.js')
+
 function createWindow() {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
@@ -19,7 +28,7 @@ function createWindow() {
   // win.loadFile("index.html");
   mainWindow.loadURL(
     isDev
-      ? 'http://localhost:3000'
+      ? 'http://localhost:3301'
       : `file://${path.join(__dirname, '../dist/index.html')}`
   );
   // Open the DevTools.

package.json

@@ -4,11 +4,12 @@
   "author": "zlyum",
   "main": "electron/electron.js",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --port 3301",
     "build": "vite build",
     "serve": "vite preview",
     "vite-tauri": "vite-tauri",
-    "electron": "wait-on tcp:3000 && cross-env IS_DEV=true electron .",
+    "svr": "node ./NMApi/app.js",
+    "electron": "wait-on tcp:3301 && cross-env IS_DEV=true electron .",
     "electron:pack": "electron-builder --dir",
     "electron:dev": "concurrently -k \"cross-env BROWSER=none yarn dev\" \"yarn electron\"",
     "electron:builder": "electron-builder",
@@ -71,6 +72,12 @@
       "dist/**/*",
       "electron/**/*"
     ],
+    "extraResources": [
+      {
+        "from": "NMApi.asar",
+        "to": ""
+      }
+    ],
     "directories": {
       "buildResources": "assets",
       "output": "dist_electron"

src/views/common/SongCtrl.vue

@@ -135,11 +135,12 @@ const pause = () => {
 
 const resume = async () => {
   if (audioEl.value.readyState) {
-    //如果暂停过了5分钟，需要再次载入歌曲
+    //如果暂停过了10分钟，需要再次载入歌曲
     // console.log(Date.now() - lastPause);
-    if (Date.now() - lastPause > 1000 * 60 * 5) {
+    if (Date.now() - lastPause > 1000 * 10 * 5) {
-      console.log("暂停过了5分钟，再次载入歌曲");
+      console.log("暂停过了10分钟，再次载入歌曲");
       await play(store.state.settings.songId, false);
+      // console.log(currentTime);
       audioEl.value.currentTime = currentTime;
     }
     audioEl.value.play();

src/views/common/ZPlayingList.vue

@@ -284,6 +284,9 @@ export default {};
     .ar {
       // width: 120px;
       flex: 2;
+      // color: #999;
+      margin-top: 1px;
+      font-size: 12px;
       .text-el-line-normal();
     }
     .al {