github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

#2566: [Bug] [ALERT-9224] fix wechat alert functions: app and group chat (#9225) 

* fix wechat alert with app and group chat

* add apache header and fix imports

* delete wechat alert 'userSendMsg' property code

* delete wechat alert 'userSendMsg' property code in Test

* delete wechat alert 'userSendMsg' property code in factory Test

* change `getSubWorkFlowParam` from private to protected
git-as-svn/v1/dev
Tq 3 years ago committed by GitHub
parent
3d8b659ac5 03a0c9f544
commit
9825039933
2 changed files with 117 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      commit.ref
  2. 193
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit 0d0674df1f78d666fc7c2155629627380aa0a9b1 Subproject commit 03a0c9f54429956cd399de0829aa70c11b67934d

193
commit.yml
Unescape View File

@ -2,82 +2,121 @@
branches: { branches: {
} }
fileChange: fileChange:
/dolphinscheduler-e2e: /dolphinscheduler-alert:
newFile: !uuid 'ab5e018afb004e3bf2c6303d20df79ea53c31c95' newFile: !uuid '8a8c3f4d2b07aa203691de2082782580706e2bdd'
oldFile: !uuid 'e76d061c0c8e5cd1b6750778241e794ed9406b0a' oldFile: !uuid 'b2db966b40aad8fab0fa11113f6f35b32ea0448f'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case: /dolphinscheduler-alert/dolphinscheduler-alert-plugins:
newFile: !uuid 'a9b2b0c8ff782a0fcf54304d1b59d817f129af78' newFile: !uuid 'e3ea2e99bce11b478ca4fa1823f283b9a7f99870'
oldFile: !uuid '56df6f8bbce17b15729e045b5c879484a74cf804' oldFile: !uuid '68bc3a491def739830508cfe4a0353d83e08657a'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat:
newFile: !uuid '9edae84719578a7d12bc903262813bb1f4cec159' newFile: !uuid '9e03be73cfb41b59fcf91430d91bf539239e7798'
oldFile: !uuid 'b34f16e149a4713a93fc618daf7d97c845dd5fc6' oldFile: !uuid '17184815ac2942ae785bc26cdeeee7de1307fd48'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src:
newFile: !uuid '1a03485435bc577c251b4ec424a8275fd18354d0' newFile: !uuid '3c49fc30b0099bd667d53cd8a2cc016993dff3b2'
oldFile: !uuid '9ae80d1f207b44e600f4db304f5ebd932ce50bb8' oldFile: !uuid '5bc6dba998bdbed04dc36c0d05a64616bc6d5680'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main:
newFile: !uuid 'db5a174294851a72c681875fd6bb4557ffa1475c' newFile: !uuid 'd9367669ca40236948a1a954dd716b7e6aadfbde'
oldFile: !uuid '0b06cd5e58d73334137ad871141a621bd633c657' oldFile: !uuid 'b637dd99bfc51b1af4866b58f1532d9367653686'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java:
newFile: !uuid 'f8e8a2c46c4c42246f0ca746a325a932d4de2ae5' newFile: !uuid '4ed275b0a3d68fdee5bcc7586e96241013af13c5'
oldFile: !uuid '74b9a194d0748fca7c4ee5ae0512d23cb2855fdb' oldFile: !uuid '7d08253de83323eb637028d84adf1ca09e21f5e7'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org:
newFile: !uuid '9b60b19016b8dd7b357080a1cfcd08e1c70981ea' newFile: !uuid 'f240ff28338ae6e168ed44763538baad48b68c70'
oldFile: !uuid '46ef7913aae0e09797fe69a826a715fad3fce1b7' oldFile: !uuid '74b767e3623c9aea9f8879608c7c2261e3ff6a44'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache:
newFile: !uuid '1ea8636e6fd0d415a1ea9cf847ca0832ffeec8b6' newFile: !uuid '54b8af6aefd4f18402da837e333ed70398b70555'
oldFile: !uuid 'e69e373bf3074db36eca7242fe5741f2a33a4ebb' oldFile: !uuid 'fba213a79fccf9ff46e54abe1fe9ea70bc3dbe9e'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler
newFile: !uuid '3a397135bb8a31d3416247a2becb50620bf1682f' : newFile: !uuid 'b047c6ee80524b4eb77471c932c41e1f91e88ac6'
oldFile: !uuid 'dfaee17094c79faf87bad2399e2e0ba05370d700' oldFile: !uuid '981f5cc975d472d7a41afe0f769a0650f250aa0c'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin
newFile: !uuid '08bb5740b28e36ae574a3ee3a38d46bd2f6066c1' : newFile: !uuid 'a73f3f6df7d1d0b2ce1b48492d0edf94719158b0'
oldFile: !uuid 'cb57ba058975b9e831cca240cc563e07f0999f24' oldFile: !uuid 'c06c2e441ae542314257c6b99e24cc08d2dbf493'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert
newFile: !uuid 'd9682282e9532dc204293aa4e2f72d311df9feec' : newFile: !uuid '6462ff4f61de842e701f99b6039db3235d5f6ce8'
oldFile: !uuid 'c2b90b1d7714c023ae1f5ee6f0257e11d85758cd' oldFile: !uuid '403b91727a76995d8caac35c614db277250bc9a8'
? /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat
: newFile: !uuid 'a94343576c9cd599a2ee6e0e6bfd3e6cacfa401b' : newFile: !uuid 'a34d56fc79765487019a0bf31e0ae5d3434c4511'
oldFile: !uuid 'a810d6b08e5a08efca59885f9e176a1138ed1047' oldFile: !uuid '49fe5e8a31a10fe4314040502b4ec61ceb2e92c1'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
newFile: !uuid 'fdb531eeadf17fa435d176d7712073d43b3e415a' : newFile: !uuid 'a77daf7e459b1d8546207a2868c96d41620ea71d'
oldFile: !uuid 'f8717da3465dea8cb18f65557e9504034b2a5456' oldFile: !uuid 'ef5fc6f4cb5919bbbd7eba6e152e7dd7d01fd576'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java
newFile: !uuid '35f98b2e711410af74cb38a6cbc593e2eb39578b' : newFile: !uuid '36ebc1c8d4d225ec8a04e4ae34a7a12980da7910'
oldFile: !uuid '4414be95233e07e0451b5af7649d5e75a610130a' oldFile: !uuid '9c90d63e28feece8291ab3185eaeea90343471fd'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
newFile: !uuid '89c1914b95f5353c40b9a93ff34d6029291d3136' : newFile: !uuid 'db9813dab8fd929584df7a2eef7874488a97a7a3'
oldFile: !uuid '5f75df621d03b5091a062aa0fdb77bca448f2469' oldFile: !uuid '5cf9e40e038b6d68fe3aa1cc229c8e3778b2c5cb'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
newFile: !uuid '40278ac393c0a6a3168171304d11c675d2bffb84' : newFile: !uuid '8dfdf50986bcc6a401d91224a4074aeee38ac8b9'
oldFile: !uuid '612d2ca160a6f6695ccc03af17117e294346883b' oldFile: !uuid 'badd6f252549fdf25c8b27e3956d39e668932b24'
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppChatMessage.java
newFile: !uuid '792888fbb1093f52ab79e37eb4f5fbf6cd88ca3f' : newFile: !uuid '5294972b3cc247ec800289f79a50f67544912fc1'
oldFile: !uuid '7dcd87cab40f51d72d845c2363a081371cd7f254' oldFile: null
/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppMessage.java
newFile: !uuid '0fcc488c3d58f1575b01e6e8a01ed38d2e782dbb' : newFile: !uuid '4032e4856fe0da7e3e9f62ecf3cded0fc5eb7708'
oldFile: !uuid 'b5784b653872b507f300112498d91b8ac3c9533b' oldFile: null
/dolphinscheduler-ui-next: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test:
newFile: !uuid '8ce8cbb9f1d1f4fd11bd7dc20d24454908ef2b64' newFile: !uuid '761a42f2e9117fdac8ad505b26f099f690af26f0'
oldFile: !uuid 'a09466debd2edeed6ae68a354638553aab0d9c75' oldFile: !uuid 'c3fdd3fe2c0cd859a31ba3f674ba6b2b4accdad5'
/dolphinscheduler-ui-next/src: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java:
newFile: !uuid '35db02e7583f6bb57dcb263c61c919df25473278' newFile: !uuid '409ed7868342e95abe78aa038428a960917ff6d8'
oldFile: !uuid 'e9d9847be8bcb579aa7326f83d36791e5e3dcb9a' oldFile: !uuid '87610824d1609a0f06f4533ac346e2ab212074dc'
/dolphinscheduler-ui-next/src/views: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org:
newFile: !uuid 'f6cc36867f621042cfdb7d70696e0382fa87905e' newFile: !uuid 'ac3bc25bb67e1b036f1ba5252a073fb888c4e14e'
oldFile: !uuid '3d10b3305f4f1ff0f5761df966c2e94978f2f6ae' oldFile: !uuid '534ede3827f1166e8d9b5430b2190b37c317b0f9'
/dolphinscheduler-ui-next/src/views/security: /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache:
newFile: !uuid '446e0c63ef5e81a3ab65346d13b20f5e9f116862' newFile: !uuid '56f9082de49189049fbdb6bed21498466aecf0e0'
oldFile: !uuid '52afe744bf34e74ae5955d30df3d1191afa90977' oldFile: !uuid '451482aa8f8265d26aa7cc4f2d903190ae2625a6'
/dolphinscheduler-ui-next/src/views/security/user-manage: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler
newFile: !uuid 'fbdc352f1548b14aff779931773c1ec8714d3715' : newFile: !uuid 'c277c9b9934381089de538db92e219b4eaab2871'
oldFile: !uuid 'd567d6d54387f6527da2f0a5fefb8affb27bdcab' oldFile: !uuid '1d1c631444b768f7b2f3ec8a3a49cd8fa548ae09'
/dolphinscheduler-ui-next/src/views/security/user-manage/components: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin
newFile: !uuid '01fdf07645b13e8c36e603530a2c05a8e836eb68' : newFile: !uuid '2d6e7f0cae48fffb0f99fc26f016f1662a926659'
oldFile: !uuid '77a4212e5dd734c4cfeb2b50971a64978956b654' oldFile: !uuid '8ccf20327dcfab077694f680b77ec61b132b6f93'
/dolphinscheduler-ui-next/src/views/security/user-manage/components/user-detail-modal.tsx: ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert
newFile: !uuid 'e693fbf3f15a7cfde25f6058382a7eca43f39d3b' : newFile: !uuid '5c0d226a295a1ab760504373b2eace1e89679ce9'
oldFile: !uuid '1db19ca7b4abdc2d4621817b314fc2a3f9cd3d1a' oldFile: !uuid '86ec48870dda4ed880242bed557517f41385ede7'
gitCommitId: !uuid '0d0674df1f78d666fc7c2155629627380aa0a9b1' ? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat
: newFile: !uuid '44a8b1831024bd35d11518f3599d5a8ab38eb567'
oldFile: !uuid '9f2065a70bdc4801d41213ccf5e37686f6ee1984'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactoryTest.java
: newFile: !uuid '04ecc36482d67537616066e1fc7c61caf53ced05'
oldFile: !uuid '648c206a33802eba331513a42a07a0adc9923ed2'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSenderTest.java
: newFile: !uuid '77ee0c2dbea71dd71319f650072c510a9a890964'
oldFile: !uuid '73d889b652fa3cc81aa2657c1c4a3d2731b6459a'
/dolphinscheduler-service:
newFile: !uuid '078350119f112e5e293913938b556c48c2540251'
oldFile: !uuid '2e16aefc55d9fe5240a2094f5ab8a4e79698a0b0'
/dolphinscheduler-service/src:
newFile: !uuid 'def551f91f531dc973bca3f97195864082c81395'
oldFile: !uuid '29eeba1cd4522cdff5df32937bbfec23d6f04a52'
/dolphinscheduler-service/src/main:
newFile: !uuid '43753035b3bcb8e8ea6571f29c1584435d6a7e4c'
oldFile: !uuid '48750316ff09c08d410a0210a49da55a48a51239'
/dolphinscheduler-service/src/main/java:
newFile: !uuid '7301ee8d908f7a535f2fbac0755c701aab2e7c56'
oldFile: !uuid '36c34e1e9c58b24efe8d7270c78882535743022c'
/dolphinscheduler-service/src/main/java/org:
newFile: !uuid '6f96c19ffea1798d78d93a5fb2631de46a3f80bc'
oldFile: !uuid 'ceb1ce4a3bb287036d2450e063935590bd96acfd'
/dolphinscheduler-service/src/main/java/org/apache:
newFile: !uuid '8e6bdbb518ed0a7431a797b1268510f445bde7af'
oldFile: !uuid '459847e260a4eebe4106bab17008079ae039850f'
/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '87bed8b91c850fe9e0dd038a0fdc0bd7af777013'
oldFile: !uuid '5984f08ee4aab17f65c8e0b26e51fff19dcf12ca'
/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
newFile: !uuid 'd58e963b77eb7acfb90c71d9674ff065a00e2607'
oldFile: !uuid '5c09ef3935e2e138b4184fcbf296b53507272e39'
/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process:
newFile: !uuid '0575ed9ba4476eb07ee3cc74bc192686e3f0badb'
oldFile: !uuid 'd56531b14c35082b64213d54a28fbb224ec08e73'
/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java:
newFile: !uuid '8a9427f5f8a29d4b5fc422b56155a74ee16e3441'
oldFile: !uuid 'cf12b059601c080ef575ab786506ef04b6fb4242'
gitCommitId: !uuid '03a0c9f54429956cd399de0829aa70c11b67934d'
renames: { renames: {
} }
revisionId: 2565 revisionId: 2566

Write Preview
Loading…
Cancel
Save