Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

api/app/lib/controllers/push/config.js

@@ -19,6 +19,7 @@ async function list (ctx) {
          where: {
             del: false
          },
+         order: [['id', 'desc']],
          include: [{
             model: models.ProjectCorrelation,
             where: projectCorrelationWhere,

api/app/lib/schedule/alarms_push.js

@@ -16,13 +16,14 @@ module.exports = function (app, opts) {
             const curMinOfYear = moment().diff(moment().startOf('year'), 'minutes')
             const configListRes = await models.AlarmPushConfig.findAll({
                where: {
-                  del: false
+                  del: false,
+                  disable: false
                },
                order: ['id'],
                include: [{
                   model: models.ProjectCorrelation,
                   where: {
-                     del: false
+                     del: false,
                   },
                   required: true
                }],

api/app/lib/service/kafka.js

@@ -12,12 +12,12 @@ module.exports = async function factory(app, opts) {
          console.log('111111 ready 666666666666')
       })
 
-      // const kafka = {
+      const kafka = {
-      //    producer: producer,
+         producer: producer,
-      //    configUpdateMessage: opts.configUpdateMessage || {}
+         configUpdateMessage: opts.configUpdateMessage || {}
-      // };
+      };
 
-      // app.fs.kafka = kafka;
+      app.fs.kafka = kafka;
       app.fs.logger.log('debug', "[FS-KAFKA]", "Init.Success");