test
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
mol
2023-12-13 23:59:35 +08:00
parent c0a732ae55
commit 3cec0cad64
5 changed files with 11 additions and 10 deletions

View File

@ -64,6 +64,6 @@ steps:
- list=$(docker ps -a | grep mol-robot* | awk '{print $1}') - list=$(docker ps -a | grep mol-robot* | awk '{print $1}')
- test "$list" = "" && echo "none mol-robot containers running" || docker stop $list && docker container rm $list - test "$list" = "" && echo "none mol-robot containers running" || docker stop $list && docker container rm $list
# 过滤出dockerImages的id, 删除none镜像 # 过滤出dockerImages的id, 删除none镜像
- docker run -d -p 16808:8080 --name=mirai_robot_${DRONE_BUILD_NUMBER} --env-file /mnt/data/opt/mol-robot/.env git.liliyamol.cn:8081/mol/mol-robot:latest - docker run -d -p 16808:8080 --name=mol-robot_${DRONE_BUILD_NUMBER} --env-file /mnt/data/opt/mol-robot/.env git.liliyamol.cn:8081/mol/mol-robot:latest
- docker rmi $(docker images | grep "none" | awk '{print $3}') - docker rmi $(docker images | grep "none" | awk '{print $3}')
- echo ==-----==部署成功==-----== - echo ==-----==部署成功==-----==

2
app.js
View File

@ -1,5 +1,3 @@
import fs from 'fs';
import { join } from 'path';
import CreateBot from '#root/bot/index.js'; import CreateBot from '#root/bot/index.js';
import CreateWebhookServer from '#root/http/index.js'; import CreateWebhookServer from '#root/http/index.js';
import logger from '#root/utils/logger.js'; import logger from '#root/utils/logger.js';

View File

@ -1,6 +1,7 @@
import { Message } from 'mirai-js'; import pkg from 'mirai-js';
import { defaultSubs } from '#root/config/index.js'; import { defaultSubs } from '#root/config/index.js';
import logger from '#root/utils/logger.js'; import logger from '#root/utils/logger.js';
const { Message } = pkg
export default function sendForwardMessage(bot, data) { export default function sendForwardMessage(bot, data) {
logger('开始执行handler: sendForwardMessage'); logger('开始执行handler: sendForwardMessage');
@ -23,8 +24,8 @@ export default function sendForwardMessage(bot, data) {
if (imgUrls) { if (imgUrls) {
Array.isArray(imgUrls) Array.isArray(imgUrls)
? imgUrls ? imgUrls
.slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1) .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
.forEach((url) => msgContent.addImageUrl(url)) .forEach((url) => msgContent.addImageUrl(url))
: msgContent.addImageUrl(imgUrls); : msgContent.addImageUrl(imgUrls);
} }
// 添加来源地址 // 添加来源地址

View File

@ -1,6 +1,7 @@
import { Message } from 'mirai-js'; import pkg from 'mirai-js';
import { defaultSubs } from '#root/config/index.js'; import { defaultSubs } from '#root/config/index.js';
import logger from '#root/utils/logger.js'; import logger from '#root/utils/logger.js';
const { Message } = pkg
// 方法已废弃 // 方法已废弃
export default function sendMessage(bot, data) { export default function sendMessage(bot, data) {

View File

@ -1,6 +1,7 @@
import { Message } from 'mirai-js'; import pkg from 'mirai-js';
import { defaultSubs } from '#root/config/index.js'; import { defaultSubs } from '#root/config/index.js';
import logger from '#root/utils/logger.js'; import logger from '#root/utils/logger.js';
const { Message } = pkg
export default function sendMessage2(bot, data) { export default function sendMessage2(bot, data) {
logger('开始执行handler: sendMessage2'); logger('开始执行handler: sendMessage2');
@ -30,8 +31,8 @@ export default function sendMessage2(bot, data) {
if (imgUrls) { if (imgUrls) {
Array.isArray(imgUrls) Array.isArray(imgUrls)
? imgUrls ? imgUrls
.slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1) .slice(0, process.env.IMG_NUMBER_IN_ONE_MESSAGE || 1)
.forEach((url) => msgContent.addImageUrl(url)) .forEach((url) => msgContent.addImageUrl(url))
: msgContent.addImageUrl(imgUrls); : msgContent.addImageUrl(imgUrls);
} }
// 添加来源地址 // 添加来源地址