修改一些字符串,Yunzai-Bot >> Miao-Yunzai (#3)
This commit is contained in:
parent
1c0991a343
commit
816b6711ac
|
@ -6,7 +6,7 @@ import { checkRun } from './check.js'
|
||||||
import fs from 'fs'
|
import fs from 'fs'
|
||||||
|
|
||||||
/** 设置标题 */
|
/** 设置标题 */
|
||||||
process.title = 'Yunzai-Bot'
|
process.title = 'Miao-Yunzai'
|
||||||
/** 设置时区 */
|
/** 设置时区 */
|
||||||
process.env.TZ = 'Asia/Shanghai'
|
process.env.TZ = 'Asia/Shanghai'
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ async function checkInit () {
|
||||||
/** 日志设置 */
|
/** 日志设置 */
|
||||||
setLog()
|
setLog()
|
||||||
|
|
||||||
logger.mark('Yunzai-Bot 启动中...')
|
logger.mark('Miao-Yunzai 启动中...')
|
||||||
|
|
||||||
await redisInit()
|
await redisInit()
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,11 @@ export default async function createQQ () {
|
||||||
if (cfg.qq && !process.argv.includes('login')) {
|
if (cfg.qq && !process.argv.includes('login')) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log(`欢迎使用${chalk.green('Yunzai-Bot v' + cfg.package.version)}\n请按提示输入完成QQ配置`)
|
console.log(`欢迎使用${chalk.green('Miao-Yunzai v' + cfg.package.version)}\n请按提示输入完成QQ配置`)
|
||||||
let propmtList = [
|
let propmtList = [
|
||||||
{
|
{
|
||||||
type: 'Input',
|
type: 'Input',
|
||||||
message: '请输入机器人QQ号(请用小号):',
|
message: '请输入机器人QQ号(建议用小号):',
|
||||||
name: 'QQ',
|
name: 'QQ',
|
||||||
validate (value) {
|
validate (value) {
|
||||||
if (/^[1-9][0-9]{4,14}$/.test(value)) return true
|
if (/^[1-9][0-9]{4,14}$/.test(value)) return true
|
||||||
|
@ -83,7 +83,7 @@ export default async function createQQ () {
|
||||||
|
|
||||||
fs.writeFileSync(`${file}bot.yaml`, bot, 'utf8')
|
fs.writeFileSync(`${file}bot.yaml`, bot, 'utf8')
|
||||||
|
|
||||||
console.log(`\nQQ配置完成,正在登录\n后续修改账号可以运行命令: ${chalk.green('npm run login')}\n`)
|
console.log(`\nQQ配置完成,正在登录\n后续修改账号可以运行命令: ${chalk.green('node app login')}\n`)
|
||||||
|
|
||||||
await common.sleep(2000)
|
await common.sleep(2000)
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ const { exec } = require('child_process')
|
||||||
* 初始化全局redis客户端
|
* 初始化全局redis客户端
|
||||||
*/
|
*/
|
||||||
export default async function redisInit () {
|
export default async function redisInit () {
|
||||||
logger.mark('连接redis....')
|
logger.mark('正在连接 Redis...')
|
||||||
const file = './config/config/redis.yaml'
|
const file = './config/config/redis.yaml'
|
||||||
const cfg = YAML.parse(fs.readFileSync(file, 'utf8'))
|
const cfg = YAML.parse(fs.readFileSync(file, 'utf8'))
|
||||||
|
|
||||||
|
@ -31,14 +31,14 @@ export default async function redisInit () {
|
||||||
let err = error.toString()
|
let err = error.toString()
|
||||||
|
|
||||||
if (err != 'Error: connect ECONNREFUSED 127.0.0.1:6379') {
|
if (err != 'Error: connect ECONNREFUSED 127.0.0.1:6379') {
|
||||||
logger.error('redis链接失败!')
|
logger.error('连接 Redis 失败!')
|
||||||
process.exit()
|
process.exit()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** windows */
|
/** windows */
|
||||||
if (process.platform == 'win32') {
|
if (process.platform == 'win32') {
|
||||||
logger.error('请先开启Redis')
|
logger.error('请先启动 Redis')
|
||||||
logger.error('window系统:双击redis-server.exe启动')
|
logger.error('Window 系统:双击 redis-server.exe 启动')
|
||||||
process.exit()
|
process.exit()
|
||||||
} else {
|
} else {
|
||||||
let cmd = 'redis-server --save 900 1 --save 300 10 --daemonize yes'
|
let cmd = 'redis-server --save 900 1 --save 300 10 --daemonize yes'
|
||||||
|
@ -47,8 +47,8 @@ export default async function redisInit () {
|
||||||
if (arm) {
|
if (arm) {
|
||||||
client = await startRedis(`${cmd}${arm}`, client, redisUrl)
|
client = await startRedis(`${cmd}${arm}`, client, redisUrl)
|
||||||
} else {
|
} else {
|
||||||
logger.error('请先开启Redis')
|
logger.error('请先启动 Redis')
|
||||||
logger.error(`redis启动命令:${cmd} ${arm}`)
|
logger.error(`Redis 启动命令:${cmd} ${arm}`)
|
||||||
process.exit()
|
process.exit()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,16 +59,16 @@ export default async function redisInit () {
|
||||||
if (typeof logger != 'undefined') log = logger
|
if (typeof logger != 'undefined') log = logger
|
||||||
if (err == 'Error: connect ECONNREFUSED 127.0.0.1:6379') {
|
if (err == 'Error: connect ECONNREFUSED 127.0.0.1:6379') {
|
||||||
if (process.platform == 'win32') {
|
if (process.platform == 'win32') {
|
||||||
log.error('请先开启Redis')
|
log.error('请先启动 Redis')
|
||||||
log.error('window系统:双击redis-server.exe启动')
|
log.error('Window 系统:双击 redis-server.exe 启动')
|
||||||
} else {
|
} else {
|
||||||
let cmd = 'redis-server --save 900 1 --save 300 10 --daemonize yes'
|
let cmd = 'redis-server --save 900 1 --save 300 10 --daemonize yes'
|
||||||
let arm = await aarch64()
|
let arm = await aarch64()
|
||||||
log.error('请先开启Redis')
|
log.error('请先启动 Redis')
|
||||||
log.error(`redis启动命令:${cmd} ${arm}`)
|
log.error(`Redis 启动命令:${cmd} ${arm}`)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.error(`redis错误:${err}`)
|
log.error(`Redis 错误:${err}`)
|
||||||
}
|
}
|
||||||
process.exit()
|
process.exit()
|
||||||
})
|
})
|
||||||
|
@ -77,7 +77,7 @@ export default async function redisInit () {
|
||||||
/** 全局变量 redis */
|
/** 全局变量 redis */
|
||||||
global.redis = client
|
global.redis = client
|
||||||
|
|
||||||
logger.mark('连接redis成功')
|
logger.mark('Redis 连接成功')
|
||||||
|
|
||||||
return client
|
return client
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ async function aarch64 () {
|
||||||
|
|
||||||
/** 尝试自动启动redis */
|
/** 尝试自动启动redis */
|
||||||
async function startRedis (cmd, client, redisUrl) {
|
async function startRedis (cmd, client, redisUrl) {
|
||||||
logger.mark('尝试启动redis')
|
logger.mark('正在尝试启动 Redis...')
|
||||||
await execSync(cmd)
|
await execSync(cmd)
|
||||||
await common.sleep(500)
|
await common.sleep(500)
|
||||||
try {
|
try {
|
||||||
|
@ -111,8 +111,8 @@ async function startRedis (cmd, client, redisUrl) {
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
let err = error.toString()
|
let err = error.toString()
|
||||||
logger.mark(err)
|
logger.mark(err)
|
||||||
logger.error('请先开启Redis')
|
logger.error('请先启动 Redis')
|
||||||
logger.error(`redis启动命令:${cmd}`)
|
logger.error(`Redis 启动命令:${cmd}`)
|
||||||
process.exit()
|
process.exit()
|
||||||
}
|
}
|
||||||
return client
|
return client
|
||||||
|
|
|
@ -22,7 +22,7 @@ export default class loginEvent extends EventListener {
|
||||||
|
|
||||||
/** 扫码登录现在仅能在同一ip下进行 */
|
/** 扫码登录现在仅能在同一ip下进行 */
|
||||||
async qrcode (event) {
|
async qrcode (event) {
|
||||||
logger.mark(`请使用登录当前QQ的手机${logger.green('扫码')}完成登录,如果显示二维码过期,可以按${logger.green('回车键(Enter)')}刷新,重新输入密码请执行命令:${logger.green('npm run login')}`)
|
logger.mark(`请使用登录当前QQ的手机${logger.green('扫码')}完成登录,如果显示二维码过期,可以按${logger.green('回车键(Enter)')}刷新,重新输入密码请执行命令:${logger.green('node app login')}`)
|
||||||
// logger.info('等待扫码中...')
|
// logger.info('等待扫码中...')
|
||||||
|
|
||||||
/** 获取扫码结果 */
|
/** 获取扫码结果 */
|
||||||
|
@ -32,7 +32,7 @@ export default class loginEvent extends EventListener {
|
||||||
let res = await this.client.queryQrcodeResult()
|
let res = await this.client.queryQrcodeResult()
|
||||||
if (res.retcode === 0) {
|
if (res.retcode === 0) {
|
||||||
console.log('\n')
|
console.log('\n')
|
||||||
logger.info(logger.green('扫码成功,开始登录..'))
|
logger.info(logger.green('扫码成功,开始登录...'))
|
||||||
console.log('\n')
|
console.log('\n')
|
||||||
await common.sleep(1000)
|
await common.sleep(1000)
|
||||||
this.client.qrcodeLogin()
|
this.client.qrcodeLogin()
|
||||||
|
@ -172,7 +172,7 @@ export default class loginEvent extends EventListener {
|
||||||
|
|
||||||
/** 登录错误 */
|
/** 登录错误 */
|
||||||
error (event) {
|
error (event) {
|
||||||
if (Number(event.code) === 1) logger.error('QQ密码错误,运行命令重新登录:npm run login')
|
if (Number(event.code) === 1) logger.error('QQ密码错误,运行命令重新登录:node app login')
|
||||||
if (global.inputTicket && event.code == 237) {
|
if (global.inputTicket && event.code == 237) {
|
||||||
logger.error(`${logger.red('ticket')}输入错误或者已失效,已停止运行,请重新登录验证`)
|
logger.error(`${logger.red('ticket')}输入错误或者已失效,已停止运行,请重新登录验证`)
|
||||||
} else if (event?.message.includes('冻结')) {
|
} else if (event?.message.includes('冻结')) {
|
||||||
|
|
|
@ -16,8 +16,8 @@ export default class onlineEvent extends EventListener {
|
||||||
/** 默认方法 */
|
/** 默认方法 */
|
||||||
async execute (e) {
|
async execute (e) {
|
||||||
logger.mark('----^_^----')
|
logger.mark('----^_^----')
|
||||||
logger.mark(logger.green(`Yunzai-Bot 上线成功 版本v${cfg.package.version}`))
|
logger.mark(logger.green(`Miao-Yunzai 上线成功 版本v${cfg.package.version}`))
|
||||||
logger.mark(logger.green('https://github.com/Le-niao/Yunzai-Bot'))
|
logger.mark(logger.green('https://github.com/yoimiya-kokomi/Miao-Yunzai'))
|
||||||
// logger.mark('-----------')
|
// logger.mark('-----------')
|
||||||
/** 加载插件 */
|
/** 加载插件 */
|
||||||
await this.plugins.load()
|
await this.plugins.load()
|
||||||
|
@ -33,7 +33,7 @@ export default class onlineEvent extends EventListener {
|
||||||
|
|
||||||
if (await redis.get(key)) return
|
if (await redis.get(key)) return
|
||||||
|
|
||||||
let msg = `欢迎使用【Yunzai-Bot v${cfg.package.version}】\n【#帮助】查看指令说明\n【#状态】查看运行状态\n【#日志】查看运行日志\n【#更新】拉取github更新\n【#全部更新】更新全部插件\n【#更新日志】查看更新日志\n【#重启】重新启动\n【#配置ck】配置公共查询cookie`
|
let msg = `欢迎使用【Miao-Yunzai v${cfg.package.version}】\n【#帮助】查看指令说明\n【#状态】查看运行状态\n【#日志】查看运行日志\n【#更新】拉取 Github 更新\n【#全部更新】更新全部插件\n【#更新日志】查看更新日志\n【#重启】重新启动\n【#配置ck】配置公共查询 Cookie`
|
||||||
|
|
||||||
redis.set(key, '1', { EX: cfg.bot.online_msg_exp })
|
redis.set(key, '1', { EX: cfg.bot.online_msg_exp })
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue