@steedos/workflow_time_trigger 2.6.1-beta.7 → 2.6.2-beta.2

package/main/default/objects/workflow_time_trigger_queue/fields/workflow_notifications_actions.field.yml

@@ -1,7 +1,7 @@
 name: workflow_notifications_actions
 type: lookup
 multiple: true
-label: 工作流操作：工作流通知
+label: 工作流操作：消息提醒
 is_wide: true
 reference_to: workflow_notifications
 reference_to_field: name

package/main/default/schedule/consts.js

@@ -0,0 +1,11 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-11-25 12:11:52
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-25 12:12:36
+ * @FilePath: /steedos-platform-2.3/services/workflow_time_trigger/main/default/schedule/const.js
+ * @Description: 
+ */
+module.exports = {
+    DEFAULT_STEEDOS_CRON_WORKFLOW_RULE: '*/10 * * * * *',  // 每十秒执行一次
+}

package/main/default/schedule/time_trigger.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-11-12 13:18:28
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-29 16:06:23
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-25 13:03:30
  * @Description: 工作流时间触发器定时任务，用于将工作流规则中配置的时间触发器放入工作流操作执行队列
  */
 'use strict';
@@ -15,11 +15,13 @@ const _eval = require('eval')
 
 module.exports = {
     run: async function () {
-        if (!process.env.STEEDOS_CRON_WORKFLOW_RULE) {
+        const steedosConfig = objectql.getSteedosConfig() || {};
+        const cron = steedosConfig.cron;
+        if (!cron || 'false' == cron.enabled) {
             return;
         }
 
-        console.log('time_trigger schedule running...')
+        // console.log('time_trigger schedule running...')
         const intervalMinitues = 5 // 每5分钟执行一次
         const rule = `0 */${intervalMinitues} * * * *`
         let next = true;

package/main/default/schedule/time_trigger_queue.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-11-12 17:53:55
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-29 16:09:20
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-25 13:03:27
  * @Description: 执行工作流时间触发器队列
  */
 
@@ -11,6 +11,7 @@
 
 const schedule = require('node-schedule');
 const objectql = require('@steedos/objectql');
+const { DEFAULT_STEEDOS_CRON_WORKFLOW_RULE } = require('./consts')
 
 module.exports = {
     /*
@@ -25,12 +26,15 @@ module.exports = {
     */
     run: async function (options = {}) {
         // STEEDOS_CRON_WORKFLOW_RULE='*/10 * * * * *'
-        const rule = process.env.STEEDOS_CRON_WORKFLOW_RULE
-        if (!rule) {
+        const steedosConfig = objectql.getSteedosConfig() || {};
+        const cron = steedosConfig.cron;
+        if (!cron || 'false' == cron.enabled) {
             return;
         }
+        const rule = cron.workflow_rule_interval || DEFAULT_STEEDOS_CRON_WORKFLOW_RULE
 
-        console.log('time_trigger_queue schedule running...')
+        // console.log('rule:', rule)
+        // console.log('time_trigger_queue schedule running...')
         const opt = {
             excuteBatchSize: 10,
             keepDocs: true,
@@ -66,7 +70,7 @@ module.exports = {
                         if (updates_field_actions) {
                             await objectql.runFieldUpdateActions(updates_field_actions, record_id);
                         }
-                        // 工作流通知
+                        // 消息提醒
                         if (workflow_notifications_actions) {
                             await objectql.runWorkflowNotifyActions(workflow_notifications_actions, record_id);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/workflow_time_trigger",
-  "version": "2.6.1-beta.7",
+  "version": "2.6.2-beta.2",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -9,8 +9,9 @@
     "access": "public"
   },
   "dependencies": {
+    "@steedos/objectql": "2.6.2-beta.2",
     "eval": "0.1.8",
     "node-schedule": "2.1.0"
   },
-  "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }