diff --git a/.drone.yml b/.drone.yml index fc32923..81ebc5c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,16 +13,10 @@ steps: # 定义管道的执行步骤 # - npm config set registry https://registry.npm.taobao.org # - npm i - - name: build-tags - image: yxs970707/drone-web-tags - depends_on: [clone] - settings: - tags: - - latest - - name: cache # 加载缓存 image: drillster/drone-volume-cache - depends_on: [build-tags] + pull: if-not-exists + depends_on: [clone] volumes: - name: cache path: /cache @@ -32,9 +26,18 @@ steps: # 定义管道的执行步骤 - ./node_modules - ./nugetpackages + - name: build-tags + image: yxs970707/drone-web-tags + pull: if-not-exists + depends_on: [cache] + settings: + tags: + - latest + - name: build-image image: plugins/docker - depends_on: [cache] + pull: if-not-exists + depends_on: [build-tags] settings: username: from_secret: docker_username @@ -47,6 +50,7 @@ steps: # 定义管道的执行步骤 - name: rebuild cache # 构建缓存 image: drillster/drone-volume-cache + pull: if-not-exists depends_on: [build-image] volumes: - name: cache diff --git a/app.js b/app.js index 219aff7..34c47f0 100644 --- a/app.js +++ b/app.js @@ -2,6 +2,7 @@ import CreateBot from '#root/bot/index.js'; import CreateWebhookServer from '#root/http/index.js'; import logger from '#root/utils/logger.js'; import handlers from './handlers/index.js'; +import plugins from '#root/plugins/index.js'; let retryCount = 0; @@ -32,6 +33,8 @@ let retryCount = 0; }); logger('bot 连接成功!!'); + bot.mountPlugin(plugins); + logger('开启 webhook 服务器'); const webhook = new CreateWebhookServer(); diff --git a/bot/index.js b/bot/index.js index 69448bc..4c4aa56 100644 --- a/bot/index.js +++ b/bot/index.js @@ -1,7 +1,6 @@ import pkg from 'mirai-js'; import Queue from '#root/utils/queue.js'; import logger from '#root/utils/logger.js'; -import plugins from '#root/plugins/index.js'; const { Bot } = pkg; @@ -19,8 +18,6 @@ export default class CreateBot { verifyKey: config.verifyKey, qq: config.qq, }); - - this.mountPlugin(plugins); } async sendMessageToFriend(qq, message) { diff --git a/plugins/cook/index.js b/plugins/cook/index.js index a2b63c9..08600f9 100644 --- a/plugins/cook/index.js +++ b/plugins/cook/index.js @@ -37,6 +37,7 @@ function cookInit() { 'FriendMessage', new Middleware().friendFilter(cookSubs.users).done(dealCommon), ); + Bot.sendMessageToFriend(752753679, '测试'); logger('cook 初始化完成') }