diff --git a/product/CMFActivity/skins/activity/SQLBase_getNow.zsql b/product/CMFActivity/skins/activity/SQLBase_getNow.zsql index fd296eb232feabea4de8f6d66863e3a59ab015f3..d3b0b25b4d6b4d03c47a949c2d9c605b516373e5 100644 --- a/product/CMFActivity/skins/activity/SQLBase_getNow.zsql +++ b/product/CMFActivity/skins/activity/SQLBase_getNow.zsql @@ -8,4 +8,4 @@ class_name: class_file: </dtml-comment> <params></params> -SELECT NOW() +SELECT UTC_TIMESTAMP() diff --git a/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql index 9265f818bcda13dd455fa7b1c042626fea953280..87b76fc0d07e8191d3862802dc2d807156cc03f6 100644 --- a/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql @@ -10,7 +10,7 @@ class_file: <params>uid</params> UPDATE message SET - processing_date = NOW(), + processing_date = UTC_TIMESTAMP(), processing = 1 WHERE uid IN ( diff --git a/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql b/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql index d34e9a64a5360e7e3ef9e3a021fbc70a7be8ac53..90053a4e36501da746ae380d53ebc0e3769fc7f7 100644 --- a/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql @@ -22,7 +22,7 @@ SET , priority = <dtml-sqlvar priority type="int"> </dtml-if> <dtml-if delay> - , date = DATE_ADD(NOW(), INTERVAL <dtml-sqlvar delay type="int"> * (retry + 1) SECOND) + , date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> * (retry + 1) SECOND) <dtml-elif date> , date = <dtml-sqlvar date type="datetime"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql index 9deb836ad9b591acde7863f7f27a088e3cd3512e..b544039d8b16eec34e4de5d241c84d6481fb070f 100644 --- a/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql @@ -21,7 +21,7 @@ INSERT INTO message SET uid = <dtml-sqlvar uid type="int">, path = <dtml-sqlvar path type="string">, - date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>NOW()</dtml-if>, + date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if>, method_id = <dtml-sqlvar method_id type="string">, processing_node = <dtml-sqlvar processing_node type="int">, processing = 0, diff --git a/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql b/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql index 0928ae95a13150d14bb57ecfb2440ddb1d542063..c615b389de2d7b77998d4309ba1b87c3a6c16641 100644 --- a/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql @@ -25,7 +25,7 @@ VALUES ( <dtml-sqlvar expr="uid_list[loop_item]" type="int">, <dtml-sqlvar expr="path_list[loop_item]" type="string">, - <dtml-if date_list><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>NOW()</dtml-if><dtml-else>NOW()</dtml-if>, + <dtml-if date_list><dtml-if expr="date_list[loop_item] is not None"><dtml-sqlvar expr="date_list[loop_item]" type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if><dtml-else>UTC_TIMESTAMP()</dtml-if>, <dtml-sqlvar expr="method_id_list[loop_item]" type="string">, <dtml-if processing_node_list><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>, 0, diff --git a/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql index 7189e8498a5515b0e9bc7e7bb163e9424d5360a5..3d0afc1e0e81355315a46be424dd1c49dbf4bc50 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql @@ -11,7 +11,7 @@ class_file: UPDATE message_queue SET - processing_date = NOW(), + processing_date = UTC_TIMESTAMP(), processing=1 WHERE uid IN ( diff --git a/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql b/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql index 8f2a1c200a63955d669081e02f4e6dc2f7e75d7c..1b817b98419e1be0cf4d96313050e67d60b97501 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql @@ -19,7 +19,7 @@ SET , priority = <dtml-sqlvar priority type="int"> </dtml-if> <dtml-if delay> - , date = DATE_ADD(NOW(), INTERVAL <dtml-sqlvar delay type="int"> SECOND) + , date = DATE_ADD(UTC_TIMESTAMP(), INTERVAL <dtml-sqlvar delay type="int"> SECOND) <dtml-elif date> , date = <dtml-sqlvar date type="datetime"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql index 6a348977072e9965fb515eb6ac9ccb7d0e5c0726..e2db5f1cd7ba68f6726679e85808a95b8cb8645a 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql @@ -19,7 +19,7 @@ INSERT INTO message_queue SET uid = <dtml-sqlvar uid type="int">, path = <dtml-sqlvar path type="string">, - date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>NOW()</dtml-if>, + date = <dtml-if date><dtml-sqlvar date type="datetime"><dtml-else>UTC_TIMESTAMP()</dtml-if>, method_id = <dtml-sqlvar method_id type="string">, <dtml-if processing_node> processing_node = <dtml-sqlvar processing_node type="int">,