diff --git a/config/default_config/qq.yaml b/config/default_config/qq.yaml index b15e562..6745bac 100644 --- a/config/default_config/qq.yaml +++ b/config/default_config/qq.yaml @@ -2,5 +2,5 @@ qq: # 密码,为空则用扫码登录,扫码登录现在仅能在同一ip下进行 pwd: -# 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad +# 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad 、 6:old_Android platform: 5 \ No newline at end of file diff --git a/lib/config/init.js b/lib/config/init.js index c59a04f..9c7047d 100644 --- a/lib/config/init.js +++ b/lib/config/init.js @@ -25,6 +25,9 @@ if (qq) { break case 5: title += ' iPad' + break + case 6: + title += ' old_Android' } } diff --git a/lib/config/qq.js b/lib/config/qq.js index 7896a71..36fa306 100644 --- a/lib/config/qq.js +++ b/lib/config/qq.js @@ -32,16 +32,17 @@ export default async function createQQ () { type: 'list', message: '请选择登录端口:', name: 'platform', - default: '5', - choices: ['iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'], + default: '6', + choices: ['old_Android', 'iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'], filter: (val) => { switch (val) { + case 'old_Android':return 6 case 'iPad':return 5 case 'MacOS':return 4 case '安卓手机':return 1 case '安卓手表':return 3 case 'aPad':return 2 - default:return 5 + default:return 6 } } } @@ -69,7 +70,7 @@ export default async function createQQ () { qq = qq.replace(/qq:/g, 'qq: ' + ret.QQ) qq = qq.replace(/pwd:/g, `pwd: '${ret.pwd}'`) - qq = qq.replace(/platform: [1-5]/g, 'platform: ' + Number(ret.platform)) + qq = qq.replace(/platform: [1-6]/g, 'platform: ' + Number(ret.platform)) fs.writeFileSync(`${file}qq.yaml`, qq, 'utf8') let bot = fs.readFileSync(`${fileDef}bot.yaml`, 'utf8') diff --git a/package.json b/package.json index 42f5361..218b917 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "chalk": "^5.2.0", "chokidar": "^3.5.3", "https-proxy-agent": "5.0.1", - "icqq": "^0.2.3", + "icqq": "^0.3.1", "image-size": "^1.0.2", "inquirer": "^8.2.5", "lodash": "^4.17.21", @@ -30,14 +30,14 @@ "moment": "^2.29.4", "node-fetch": "^3.3.1", "node-schedule": "^2.1.1", - "node-xlsx": "^0.21.0", + "node-xlsx": "^0.21.2", "oicq": "^2.3.1", "pm2": "^5.3.0", - "puppeteer": "^19.10.1", + "puppeteer": "^19.11.0", "redis": "^4.6.5", "sequelize": "^6.31.0", "sqlite3": "^5.1.6", - "yaml": "^2.2.1" + "yaml": "^2.2.2" }, "devDependencies": { "eslint": "^8.39.0", diff --git a/plugins/other/update.js b/plugins/other/update.js index 36b4f55..d27572a 100644 --- a/plugins/other/update.js +++ b/plugins/other/update.js @@ -34,7 +34,7 @@ export class update extends plugin { ] }) - this.typeName = 'Yunzai-Bot' + this.typeName = 'Miao-Yunzai' } async update () { @@ -256,7 +256,7 @@ export class update extends plugin { let end = '' - log = await this.makeForwardMsg(`${plugin || 'Yunzai-Bot'}更新日志,共${line}条`, log, end) + log = await this.makeForwardMsg(`${plugin || 'Miao-Yunzai'}更新日志,共${line}条`, log, end) return log }