diff --git a/src/main/modules/userApi/main.js b/src/main/modules/userApi/main.js index 463743e9..89d0af4a 100644 --- a/src/main/modules/userApi/main.js +++ b/src/main/modules/userApi/main.js @@ -67,11 +67,10 @@ exports.createWindow = async userApi => { event.preventDefault() }) } - global.modules.userApiWindow.webContents.session.setPermissionRequestHandler((webContents, permission, callback) => { - if (webContents === global.modules.mainWindow.webContents) return callback(true) + global.modules.userApiWindow.webContents.session.setPermissionRequestHandler((webContents, permission, resolve) => { + if (webContents === global.modules.mainWindow.webContents) return resolve(true) - // eslint-disable-next-line node/no-callback-literal - callback(false) + resolve(false) }) global.modules.userApiWindow.webContents.setWindowOpenHandler(() => { return { action: 'deny' } diff --git a/src/main/modules/userApi/renderer/preload.js b/src/main/modules/userApi/renderer/preload.js index 18e2c3f5..31bfbc5f 100644 --- a/src/main/modules/userApi/renderer/preload.js +++ b/src/main/modules/userApi/renderer/preload.js @@ -165,7 +165,7 @@ contextBridge.exposeInMainWorld('lx', { headers: resp.headers, bytes: resp.bytes, raw: resp.raw, - body: body, + body, }, body) }).request @@ -212,7 +212,7 @@ contextBridge.exposeInMainWorld('lx', { }, rsaEncrypt(buffer, key) { buffer = Buffer.concat([Buffer.alloc(128 - buffer.length), buffer]) - return publicEncrypt({ key: key, padding: constants.RSA_NO_PADDING }, buffer) + return publicEncrypt({ key, padding: constants.RSA_NO_PADDING }, buffer) }, randomBytes(size) { return randomBytes(size) diff --git a/src/renderer/components/core/PlayBar/ControlBtns.vue b/src/renderer/components/core/PlayBar/ControlBtns.vue index e99abafb..0d60388f 100644 --- a/src/renderer/components/core/PlayBar/ControlBtns.vue +++ b/src/renderer/components/core/PlayBar/ControlBtns.vue @@ -68,7 +68,7 @@ export default { } return { - setting: setting, + setting, isShowAddMusicTo, nextTogglePlayName, toggleNextPlayMode, diff --git a/src/renderer/core/useApp/useInitUserApi.js b/src/renderer/core/useApp/useInitUserApi.js index beb0dd0f..9ee768a1 100644 --- a/src/renderer/core/useApp/useInitUserApi.js +++ b/src/renderer/core/useApp/useInitUserApi.js @@ -39,7 +39,7 @@ export default ({ setting }) => { promise: userApiRequest({ requestKey, data: { - source: source, + source, action: 'musicUrl', info: { type, diff --git a/src/renderer/utils/music/bd/musicSearch.js b/src/renderer/utils/music/bd/musicSearch.js index 726e6bd6..241eb230 100644 --- a/src/renderer/utils/music/bd/musicSearch.js +++ b/src/renderer/utils/music/bd/musicSearch.js @@ -81,7 +81,7 @@ export default { return Promise.resolve({ list, allPage: this.allPage, - limit: limit, + limit, total: this.total, source: 'bd', }) diff --git a/src/renderer/utils/music/bd/songList.js b/src/renderer/utils/music/bd/songList.js index a0c80aa7..ba8279e3 100644 --- a/src/renderer/utils/music/bd/songList.js +++ b/src/renderer/utils/music/bd/songList.js @@ -66,7 +66,7 @@ export default { }, } let encrypted = CryptoJS.AES.encrypt(strData, key, { - iv: iv, + iv, blockSize: 16, mode: CryptoJS.mode.CBC, format: JsonFormatter, @@ -74,9 +74,9 @@ export default { let ciphertext = encrypted.toString().ct let sign = toMD5('baidu_taihe_music' + ciphertext + timestamp) let jsonRet = { - timestamp: timestamp, + timestamp, param: ciphertext, - sign: sign, + sign, } return jsonRet }, diff --git a/src/renderer/utils/music/wy/utils/crypto.js b/src/renderer/utils/music/wy/utils/crypto.js index 85a35ac8..e79ca1bc 100644 --- a/src/renderer/utils/music/wy/utils/crypto.js +++ b/src/renderer/utils/music/wy/utils/crypto.js @@ -19,7 +19,7 @@ const aesDecrypt = function(cipherBuffer, mode, key, iv) { const rsaEncrypt = (buffer, key) => { buffer = Buffer.concat([Buffer.alloc(128 - buffer.length), buffer]) - return publicEncrypt({ key: key, padding: constants.RSA_NO_PADDING }, buffer) + return publicEncrypt({ key, padding: constants.RSA_NO_PADDING }, buffer) } export const weapi = object => { diff --git a/src/renderer/utils/tools.js b/src/renderer/utils/tools.js index eb7dd4d3..e9167383 100644 --- a/src/renderer/utils/tools.js +++ b/src/renderer/utils/tools.js @@ -27,7 +27,7 @@ export const setAllowShowUserApiUpdateAlert = (id, enable) => { export const saveMyList = data => { rendererSend(NAMES.mainWindow.save_playlist, { type: 'myList', - data: data, + data, }) } export const saveDownloadList = list => {