liuyu преди 5 години
родител
ревизия
1b7cfcb7a7
променени са 4 файла, в които са добавени 15 реда и са изтрити 15 реда
  1. 1 1
      app/controller/personchat.js
  2. 3 3
      app/model/personchat.js
  3. 1 1
      app/model/personroom.js
  4. 10 10
      app/service/personchat.js

+ 1 - 1
app/controller/personchat.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // const _ = require('lodash');
-const meta = require("./.personchat.js");
+const meta = require('./.personchat.js');
 const Controller = require('egg').Controller;
 const { CrudController } = require('naf-framework-mongoose/lib/controller');
 

+ 3 - 3
app/model/personchat.js

@@ -5,9 +5,9 @@ const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
 const Personchat = {
   sender_id: { type: String, required: true, maxLength: 200 }, // 发送人id
   receiver_id: { type: String, required: true, maxLength: 200 }, // 接收人id
-  personroom_id: { type: String, required: true, maxLength: 200 }, //聊天房间id
+  personroom_id: { type: String, required: true, maxLength: 200 }, // 聊天房间id
   content: { type: String, required: true, maxLength: 1000 }, // 发言内容
-  status: { type: String, required: false, maxLength: 100, default: "0" }, // 状态,0-未读,1-已读
+  status: { type: String, required: false, maxLength: 100, default: '0' }, // 状态,0-未读,1-已读
 };
 const schema = new Schema(Personchat, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });
@@ -15,5 +15,5 @@ schema.plugin(metaPlugin);
 
 module.exports = app => {
   const { mongoose } = app;
-  return mongoose.model("Personchat", schema, "person_chat");
+  return mongoose.model('Personchat', schema, 'person_chat');
 };

+ 1 - 1
app/model/personroom.js

@@ -15,5 +15,5 @@ schema.plugin(metaPlugin);
 
 module.exports = app => {
   const { mongoose } = app;
-  return mongoose.model("personroom", schema, "person_room");
+  return mongoose.model('Personroom', schema, 'person_room');
 };

+ 10 - 10
app/service/personchat.js

@@ -8,14 +8,14 @@ const { CrudService } = require('naf-framework-mongoose/lib/service');
 const moment = require('moment');
 class PersonchatService extends CrudService {
   constructor(ctx) {
-    super(ctx, "chat");
-    this.model = this.ctx.model.Chat;
+    super(ctx, 'chat');
+    this.model = this.ctx.model.Personchat;
   }
   async create(query, { sender_id, receiver_id, content, personroom_id }) {
-    assert(sender_id, "缺少发送人信息");
-    assert(content, "缺少发言内容");
-    assert(receiver_id, "缺少接收人信息");
-    assert(personroom_id, "缺少聊天房间信息");
+    assert(sender_id, '缺少发送人信息');
+    assert(content, '缺少发言内容');
+    assert(receiver_id, '缺少接收人信息');
+    assert(personroom_id, '缺少聊天房间信息');
     const res = await this.model.create({
       sender_id,
       receiver_id,
@@ -25,17 +25,17 @@ class PersonchatService extends CrudService {
     // TODO MQ
     const { mq } = this.ctx;
     if (mq) {
-      const exchange = "person_chat";
+      const exchange = 'person_chat';
       const parm = {
         durable: true,
         headers: {
-          sender_id: sender_id,
-          receiver_id: receiver_id,
+          sender_id,
+          receiver_id,
         },
       };
       await mq.topic(
         exchange,
-        personroom_id + "_" + receiver_id,
+        personroom_id + '_' + receiver_id,
         JSON.stringify(res),
         parm
       );