更新 .drone.yml

.drone.yml

@@ -56,8 +56,8 @@ steps: # 定义管道的执行步骤
         from_secret: docker_passwd
       dockerfile: Dockerfile
       mirror: https://fpswa5tm.mirror.aliyuncs.com
-      registry: https://git.liliyamol.cn:8081
-      repo: git.liliyamol.cn:8081/mol/mol-robot
+      registry: https://git.liliyamol.cn
+      repo: git.liliyamol.cn/mol/mol-robot
 
   - name: rebuild cache   # 构建缓存
     image: drillster/drone-volume-cache
@@ -97,11 +97,11 @@ steps:
       secrets: [docker_username, docker_passwd]
       script:
         - echo ==-----==开始部署==-----==
-        - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWD git.liliyamol.cn:8081
-        - docker pull git.liliyamol.cn:8081/mol/mol-robot:latest
+        - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWD git.liliyamol.cn
+        - docker pull git.liliyamol.cn/mol/mol-robot:latest
         - 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
         # 过滤出dockerImages的id, 删除none镜像
-        - 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 run -d  -p 16808:8080 --restart=always --name=mol-robot_${DRONE_BUILD_NUMBER} --env-file /mnt/data/opt/mol-robot/.env git.liliyamol.cn/mol/mol-robot:latest
         # - docker rmi $(docker images | grep "none" | awk '{print $3}')
         - echo ==-----==部署成功==-----==

bot/index.js

@@ -20,23 +20,23 @@ export default class CreateBot {
     });
   }
 
-  async sendMessageToFriend(qq, message) {
+  sendMessageToFriend(qq, message) {
     logger(`发送好友[${qq}]消息进入消息队列`);
     return this.queue
       .addMethod(this.bot.sendMessage.bind(this.bot, { friend: qq, message }))
       .then(
         (res) => {
           logger(`发送好友[${qq}]消息成功 ${res}`);
-          return res;
+          return ['success', res];
         },
         (e) => {
           logger.warning(`发送好友[${qq}]消息失败,错误信息${e}`);
-          return Promise.reject(e);
+          return ['failed', e];
         },
       );
   }
 
-  async sendMessageToGroup(groupId, message) {
+  sendMessageToGroup(groupId, message) {
     logger(`发送群[${groupId}]消息进入消息队列`);
     return this.queue
       .addMethod(
@@ -45,11 +45,11 @@ export default class CreateBot {
       .then(
         (res) => {
           logger(`发送群[${groupId}]消息成功 ${res}`);
-          return res;
+          return ['success', res];
         },
         (e) => {
           logger.warning(`发送群[${groupId}]消息失败,错误信息${e}`);
-          return Promise.reject(e);
+          return ['failed', e];
         },
       );
   }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mirai-middle-server",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mirai-middle-server",
-      "version": "1.2.1",
+      "version": "1.2.2",
       "dependencies": {
         "dayjs": "^1.11.7",
         "mirai-js": "^2.8.11",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirai-middle-server",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "使用miraijs开发,用于连接kuginn等外部服务与mirai通信的中转服务器",
   "author": "mol",
   "main": "app.js",