#2606: [Bug-9235][Alert]Fix wechat markdown message and change wechat form structure (#9367)

* fix wechat issues:
1. change table msg type to markdown.
2. change userId to not required and enrich hints
3. change 'app id' to 'app id and chat id'

* fix wechat issues:
1. revert table showtype and add markdown showtype.
2. enrich hints.
3. delete 'chatid', rename agentid to weChatAgentIdChatId.
4. modify code to send markdown message.

* fix wechat issues: Change the language pack of agentId to agentId/chatId.

* fix format

* fix param name

Co-authored-by: Amy <amywang0104@163.com>

commit.ref

@@ -1 +1 @@
-Subproject commit 2bab12f2c855e9d4421d081518b53a088f0969ce
+Subproject commit c294979e2fc96e876f5699bc3164accbfa5c1023

commit.yml

@@ -3,147 +3,105 @@ branches: {
   }
 fileChange:
   /dolphinscheduler-alert:
-    newFile: !uuid 'b93ac86cd9ce121e41583c1e039addf8fa047c6f'
+    newFile: !uuid '61e77eeaacc5ba37056ae1f0d9a00700b830462e'
-    oldFile: !uuid 'f74aa977b8d5615b0342445091ff1054154d1184'
+    oldFile: !uuid 'b93ac86cd9ce121e41583c1e039addf8fa047c6f'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api:
-    newFile: !uuid 'd54e75c466618f9ab86ed4860b744dbb9a6c72cd'
+    newFile: !uuid '70435a9b8a525fb15c3b9911fc4876b5780c41ca'
-    oldFile: !uuid 'd734530e8a41039000613afbb46e1d2dce5ebd08'
+    oldFile: !uuid '5a597ec05107bf1077b8c04bf0111b95b8995187'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src:
-    newFile: !uuid '98b91d94a65efaec15b894886823ca125930dc82'
+    newFile: !uuid '5d7398393b1ff6a47a43544e7d4cc973747a0cf0'
-    oldFile: !uuid '6e5ddfb865ecb0d21b23b3c594be4efce8a1e857'
+    oldFile: !uuid '77ec1d0d4a176de9e6d6fdc72260c19d3f0c4bb0'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main:
-    newFile: !uuid 'f1e12f55b0703f394506758bb2767e2443981c8f'
+    newFile: !uuid '677fcd892d629c2efa94fe5cec53308c7d0bf6bb'
-    oldFile: !uuid '62f8e3664e0dfab84926df04b861a3dd0eea3c4c'
+    oldFile: !uuid '32973ca306363e6c506e0ba72db3f2f389c4f3b0'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java:
-    newFile: !uuid '7984af1f8f73ad1dd57ed408f040832105957ff5'
+    newFile: !uuid 'fa1926b4d406ef5f45c3638e02ecfa533cf6a157'
-    oldFile: !uuid 'ec31342979b8d375f063e6a70d32a86dba78f39b'
+    oldFile: !uuid 'f85babc41c6bc6b838a9ac57fd852ca1305ee50b'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org:
-    newFile: !uuid '2f170cf61e4bada4e7030608132a89296e5ca69e'
+    newFile: !uuid 'ab86747fe327d45f1a3ee8c97c76f2603c02aa0f'
-    oldFile: !uuid '3f38b4bf16ed5acefb06f7b3cdd557735d638c9b'
+    oldFile: !uuid '6a9f2599d43e0ea5df317f0a64c4607f10cda5a0'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache:
-    newFile: !uuid '769e8bcf75ea6870a4b4c92e7343c84cf4d585c6'
+    newFile: !uuid 'badefa237178d7676e7b1d5f08d7120ef0fc08a1'
-    oldFile: !uuid '9e7b87ec49c717e34ca3882e78affd2928e63e45'
+    oldFile: !uuid '4a7b1e183ff9f3528144f5e6a4851cc270332c8d'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '978cffbdbe04fc510047d00e40537c66f4b4af8c'
+    newFile: !uuid '32ce9f821986c4a8e911a34f17c088a0ca299f69'
-    oldFile: !uuid '4fc1d2a353f1e8f994c52344cb99736ce3e14793'
+    oldFile: !uuid '02dd036b3de4eac917fb0b92463070957dae5c63'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert:
-    newFile: !uuid 'e25d961ff5880ecddcfc8a0f4caf41edaa0dd16d'
+    newFile: !uuid 'd91c05a4ecf2140712e9f31ffadecdefbb8d331f'
-    oldFile: !uuid 'fd856e5bfbfbe186a8ddd7950bb7bd0298566df4'
+    oldFile: !uuid '83189dd5f80e4aee5074dbd07d7020e2379524ed'
-  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSender.java:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api:
-    newFile: !uuid '3ddc5c57953f57b199d015b1dbf485bd8aa80c42'
+    newFile: !uuid 'a88d95f2b1234c819e1b1a85f8f3713a4de12c63'
-    oldFile: !uuid '2f15fb65e3285df8cb971f1a5458a1e66169c61b'
+    oldFile: !uuid '2ef76f115dcb9b48315acf57a333e9aa23981204'
-  /dolphinscheduler-common:
+  /dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java:
-    newFile: !uuid '0b461e4a878d44f0afc5ea8d3da4360712b1ec3f'
+    newFile: !uuid '2f1b4f2b4b2d55c4fc7feae53576fe8209d45abb'
-    oldFile: !uuid 'da3f4c8d6f94a39c27654573bedc5287708d9bf9'
+    oldFile: !uuid 'bb1b1b2afb1fccaad31c7ca9cada2936c150cb91'
-  /dolphinscheduler-common/src:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins:
-    newFile: !uuid '6cce722b04f2f90713ad5cf8bc78550a555f978b'
+    newFile: !uuid '86c1bce55f6c71a09965a670c0ca3ef08941ad47'
-    oldFile: !uuid '16115469187ab66c2857a3804d18e991aa2622dd'
+    oldFile: !uuid 'e3ea2e99bce11b478ca4fa1823f283b9a7f99870'
-  /dolphinscheduler-common/src/main:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat:
-    newFile: !uuid '26da44c9365089c936de11db7e5f078856996d3f'
+    newFile: !uuid '4e665e86c78336da37bdad3670427c73c5a18545'
-    oldFile: !uuid '37fd82a4c01dd0c7fb72f343087e60bfd4afe735'
+    oldFile: !uuid '9e03be73cfb41b59fcf91430d91bf539239e7798'
-  /dolphinscheduler-common/src/main/java:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src:
-    newFile: !uuid '3694816bac85fa8b849ba36a6c9e83fc43ef1bd4'
+    newFile: !uuid 'f13c406c41c6f642ee57456855edaeee6e489f93'
-    oldFile: !uuid '4cc67993c7258bd972f43cc19329244aaa9003dd'
+    oldFile: !uuid '3c49fc30b0099bd667d53cd8a2cc016993dff3b2'
-  /dolphinscheduler-common/src/main/java/org:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main:
-    newFile: !uuid '6a8be67e009a6db6cb2b3c6a2bf0ad034edd936f'
+    newFile: !uuid '92f69afca6d15a60b49a761e6b938f046fe11f5e'
-    oldFile: !uuid '75b4276b6b266553c96df91a54bf16dd60aee978'
+    oldFile: !uuid 'd9367669ca40236948a1a954dd716b7e6aadfbde'
-  /dolphinscheduler-common/src/main/java/org/apache:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java:
-    newFile: !uuid '8aa6bd8b5a46041f3fe0b5b520396f97e83c1180'
+    newFile: !uuid '8201b17a5454d59b879829c46091d96feadd6fe3'
-    oldFile: !uuid '7c669a74ce9f376e7994f1d92864881b7edb9cd4'
+    oldFile: !uuid '4ed275b0a3d68fdee5bcc7586e96241013af13c5'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org:
-    newFile: !uuid 'f81a4c485d7ec1eb4d487d2a70b2d806ade4ca4d'
+    newFile: !uuid '32995bbee4601a806112a313fac85ba19dc65f67'
-    oldFile: !uuid 'cdf0d8ed7f84009ccd3d7b9b3cc7b8f576c0700d'
+    oldFile: !uuid 'f240ff28338ae6e168ed44763538baad48b68c70'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
+  /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache:
-    newFile: !uuid 'cd777b3b56b629a7022e070552c7b6dd3067ea41'
+    newFile: !uuid 'f09427e793cab3bc9f1a4ef5ab3dc466c7e1ed82'
-    oldFile: !uuid '2d9960093b25f3860234855d9ba86015d7cf9c8b'
+    oldFile: !uuid '54b8af6aefd4f18402da837e333ed70398b70555'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler
-    newFile: !uuid '4a113955a8405052ac9ca3967149b160f4c05546'
+  : newFile: !uuid '8b8448ba93c10c36656b5f9963f575ae054aacb8'
-    oldFile: !uuid 'c4af35337b1a4ca39f8259cb1f3ff0f2c01140f9'
+    oldFile: !uuid 'b047c6ee80524b4eb77471c932c41e1f91e88ac6'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin
-    newFile: !uuid '2ee288274efaff6c94fdc10141413c60b9d4cc42'
+  : newFile: !uuid 'f984aedbf59ce65f7e009180dcb6bf7afdd09b7c'
-    oldFile: !uuid '3457296737563f863b54ae12eeb0d00e2ed7e983'
+    oldFile: !uuid 'a73f3f6df7d1d0b2ce1b48492d0edf94719158b0'
-  /dolphinscheduler-dao:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert
-    newFile: !uuid '10717c6e19acab371fb2c5e4be4cd0e2b95c2b82'
+  : newFile: !uuid '2d23507c6f0bd3ceefce2f8181ff8860c886454f'
-    oldFile: !uuid '147eadf001c852be95f4acff8969f7d3b8191987'
+    oldFile: !uuid '6462ff4f61de842e701f99b6039db3235d5f6ce8'
-  /dolphinscheduler-dao/src:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat
-    newFile: !uuid 'c07ef84045d7b91df68cbbbd32ee82571a7689fe'
+  : newFile: !uuid '8c8ad9173d72f5a184ae4fad485fd62217401c67'
-    oldFile: !uuid '1ce599916b8011b135282a25e94336cb2014bc1c'
+    oldFile: !uuid 'a34d56fc79765487019a0bf31e0ae5d3434c4511'
-  /dolphinscheduler-dao/src/main:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
-    newFile: !uuid 'a29f99f8b8e5a5f61705991ac52dd8212a26cf4b'
+  : newFile: !uuid '39a4a8159fb2f5b936d8620c1cb407b8ac716424'
-    oldFile: !uuid '1257a24141600edf84ac4c4621daaad8051eda07'
+    oldFile: !uuid 'a77daf7e459b1d8546207a2868c96d41620ea71d'
-  /dolphinscheduler-dao/src/main/java:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
-    newFile: !uuid '32f453c7cb40cf4ae257f6f155c468d797f54f58'
+  : newFile: !uuid 'd8085b901fc3ffdecccf43a1bf4c3982eddef953'
-    oldFile: !uuid '4e336b86ab39df38fccf83084b2c310d0dd68f29'
+    oldFile: !uuid 'db9813dab8fd929584df7a2eef7874488a97a7a3'
-  /dolphinscheduler-dao/src/main/java/org:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
-    newFile: !uuid '10373f5a1f62906e288dbc83cf3ecc5dfb5119b9'
+  : newFile: !uuid 'b8ed73d5870005435fe7905acae003c50b3f7d7e'
-    oldFile: !uuid '8213e6bf864eb9de1b5e387dbfaa744539af53fe'
+    oldFile: !uuid '8dfdf50986bcc6a401d91224a4074aeee38ac8b9'
-  /dolphinscheduler-dao/src/main/java/org/apache:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppChatMessage.java
-    newFile: !uuid 'fee7e5d626696c41a0b87441bb8860ae6f009d87'
+  : newFile: !uuid 'e04f7335b83d06cb93e3899a3f07f99e0b020775'
-    oldFile: !uuid '656ba5f593ed6a762d6f8f5b49e1d87432d4ab4c'
+    oldFile: !uuid '5294972b3cc247ec800289f79a50f67544912fc1'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppMessage.java
-    newFile: !uuid 'ca471e3791e43aedb3491575451ef6b7675e98c9'
+  : newFile: !uuid 'dbb74a6a93d788a76f6830e6ec470617ea0cbddb'
-    oldFile: !uuid '7dbd695fd843fae9ddcb50395db50ca860350abf'
+    oldFile: !uuid '4032e4856fe0da7e3e9f62ecf3cded0fc5eb7708'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+  /dolphinscheduler-ui-next:
-    newFile: !uuid '72925b236fbc99ab1b875679fb477bcfe50501b1'
+    newFile: !uuid '83453f72e6f34458aac1763323e660d6543f883f'
-    oldFile: !uuid '255712a24fe771dfe11e07e1a847cc9d79a0e21b'
+    oldFile: !uuid '19a6ce932b8b98bb2f01527a3439d1679329e101'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java:
+  /dolphinscheduler-ui-next/src:
-    newFile: !uuid '00755e3b87d1fdaad93ed63228b5de4c76403d85'
+    newFile: !uuid '6e9f24ac9df7fd1d592c521503b4209ec47df2a8'
-    oldFile: !uuid 'ec803b6beba4060af1b29dcbb1ab99c52cb3897b'
+    oldFile: !uuid 'b8c5cc2fcb2a31023fe3084dadca0b76a955e1a2'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+  /dolphinscheduler-ui-next/src/locales:
-    newFile: !uuid '9781d7c4aa96987d76bab8750a7b3aaea637f3d0'
+    newFile: !uuid '22917904f2fc5e90779cb7d0b79037bdb8493c5a'
-    oldFile: !uuid 'fc69d2546d0f763a964e59ae26820b31caee7db9'
+    oldFile: !uuid '8526ce7860b5c4c2399e91751f03ee430a2b8394'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertSendStatus.java:
+  /dolphinscheduler-ui-next/src/locales/modules:
-    newFile: !uuid 'c1876a581d469e3adac38ddcf50700a48fd014ba'
+    newFile: !uuid '5c9267e85f5c057e1b48e1b972d4c9518fdd8fcc'
-    oldFile: null
+    oldFile: !uuid 'a653563defdeb186b20a5c5bb08448a9a7f750df'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
+  /dolphinscheduler-ui-next/src/locales/modules/en_US.ts:
-    newFile: !uuid '39d074708133728a4d921d4db53f7db4b30fd38e'
+    newFile: !uuid '8faf9f9031dbd6410274ba665028b40ce5bc3f84'
-    oldFile: !uuid 'aad8cc1c186ee1463255048323a7114078ba9c92'
+    oldFile: !uuid 'a76690effdac8529e4f3629718829f739372b6cd'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertSendStatusMapper.java:
+  /dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts:
-    newFile: !uuid '62be65642383e6b04d3362977ab3bc3f1731d6fc'
+    newFile: !uuid '8e81fab7e7e715936c119f12c40b92489d542404'
-    oldFile: null
+    oldFile: !uuid 'a435f59371e111853fa826fdd779e46c94cd05ab'
-  /dolphinscheduler-dao/src/main/resources:
+gitCommitId: !uuid 'c294979e2fc96e876f5699bc3164accbfa5c1023'
-    newFile: !uuid 'd7d3adb3688c7261ca2e45fafc072d8df13d92ef'
-    oldFile: !uuid '4b0dbdd1195767a79e03c3a1a157acd6077d7d80'
-  /dolphinscheduler-dao/src/main/resources/sql:
-    newFile: !uuid '40d3e0ec607b81726a1654a0546b354f5109e202'
-    oldFile: !uuid 'c5cd21e5ac5bd9c27bffeba6913d59cd06d03355'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql:
-    newFile: !uuid '11f29eb2f27e6d8307e4ff2fae582bac76848fea'
-    oldFile: !uuid '687914a62f86ab310647096e88c3c647e2ae811b'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql:
-    newFile: !uuid '43ffc345be9819f4ef7ab639c29281c810c15e5b'
-    oldFile: !uuid '5038031fff16016563a1d82c0b9b6db53c50ae98'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql:
-    newFile: !uuid '7b371d2397783660200feeab18ce254b7cac3f5a'
-    oldFile: !uuid 'bfede5f2e05b653ef16643ffd31d49778467b697'
-  /dolphinscheduler-dao/src/test:
-    newFile: !uuid '76f880dc4abe773a95a82b3f5df288f420151e00'
-    oldFile: !uuid 'a01c478bd6b2302f23ceca97a561d62fe69a6378'
-  /dolphinscheduler-dao/src/test/java:
-    newFile: !uuid '6017643e3480116b16cae0861402f13ce7769fda'
-    oldFile: !uuid '0f61e3e58f6132c3875e60dfb42a3790a7c8e525'
-  /dolphinscheduler-dao/src/test/java/org:
-    newFile: !uuid '916ccc5ce4b6c5898525e42c4e135464cd043f10'
-    oldFile: !uuid 'e068cd0d06b9f644a431ab8f3a8abd4d90f177d8'
-  /dolphinscheduler-dao/src/test/java/org/apache:
-    newFile: !uuid '4c950ecfec335105fcb83febf6d4ead7183a3624'
-    oldFile: !uuid '15fdcc1b7e7cd231953335ecc6028d46ddc7b227'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '025ebfec2a38e7abb0c367b57029f02d01089011'
-    oldFile: !uuid '79fa4b47401b0f4cb5837dda06c0de05356a8aa8'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '34e8d4063c5ae61f91737bfc42b30eed0b5719f7'
-    oldFile: !uuid '12f3b20e9e1897562e921cf038f297e3bf18d0a3'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/AlertDaoTest.java:
-    newFile: !uuid '820ac793bea64bfc4358ab3d3e1624da8c514290'
-    oldFile: !uuid '2349162b85e50a235c3c5520b420e0885dc58d69'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid 'f8337b9ec940d660ff806a29d9ec18eecbad4126'
-    oldFile: !uuid '65a684bedef88e654cd731a26e7c4ed43789e182'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertSendStatusMapperTest.java:
-    newFile: !uuid 'be02aec436db5b0f1f845fc8b721dcf82941b91e'
-    oldFile: null
-gitCommitId: !uuid '2bab12f2c855e9d4421d081518b53a088f0969ce'
 renames: {
   }
-revisionId: 2605
+revisionId: 2606