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

#3343: [fix-10961][alert server]Change the content of alert to an array (#11033) 

* Change the content of alert to an array

* Increase unit test coverage

* Modify the code format

* Modify the code format

* Modify judgment statement

* Deleting invalid References

* Modify the previous code implementation and improve the test data

* Modify the code format

* Move the location of the Content conversion

* Remove useless code

* Change the code format

* Modify unit tests

* Modify unit tests

* Modify unit tests

* Changing the location of the code

* Modify the code

Co-authored-by: fanwanlong <fanwanlong@kezaihui.com>
Co-authored-by: 范万龙 <fanwanlong@fanwanlongs-MBP.lan>
git-as-svn/v1/dev
jackfanwan 2 years ago committed by GitHub
parent
f8fc1f641b abd5798755
commit
bfc47b3288
2 changed files with 75 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      commit.ref
  2. 112
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit 47b50067ef26b599a7a1a47594c0c393fddcdfd0
Subproject commit abd57987552b77cc783cad6894ceeda898cccb6c

112
commit.yml
Unescape View File

@ -2,43 +2,79 @@
branches: {
}
fileChange:
/dolphinscheduler-master:
newFile: !uuid '94d70def47397e9dc9b47b825b0cd3a1e38c75be'
oldFile: !uuid 'bfcb0593edb5f3ce68302259048cb2617870e0aa'
/dolphinscheduler-master/src:
newFile: !uuid 'baf6d5b72e59d650c4fada16d68c3fe45a026bfb'
oldFile: !uuid '5531f0ffd52e65f3a14da2103474e79169829ada'
/dolphinscheduler-master/src/main:
newFile: !uuid 'd91f5214bfcaa60853f64180968ac70bfa720a0e'
oldFile: !uuid '526a5a2fb6c43c9e175f7fc372aa389e8a8237e9'
/dolphinscheduler-master/src/main/java:
newFile: !uuid 'e4dd34a0ce81adcdf83c379692eae97a9b9148b5'
oldFile: !uuid '3e6d4a14d75d604b539f22f57aa95d057cf0514f'
/dolphinscheduler-master/src/main/java/org:
newFile: !uuid '44340f7e52ee15568d97d2b9454382abc00f1f51'
oldFile: !uuid 'd9f0cc99082194a36a281505699fe4c09f81b01b'
/dolphinscheduler-master/src/main/java/org/apache:
newFile: !uuid 'ddedbd0af8d5d187e7f163a4c3b1be78cc83ce43'
oldFile: !uuid '2aab659a3b02823fee62f792d794903421be3240'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '48673a4df7fd9347d493ca45002ea6a8f20bbbf4'
oldFile: !uuid '538bca0d8b9d44292ccd4693d5d1213a3abc6e28'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
newFile: !uuid 'de23eedb92e90fccc6b5c13c115f66341b077c7d'
oldFile: !uuid '8cdacc6f75d7d5b314321b00f714c39434e594e5'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
newFile: !uuid 'deb62114f680d22ade29421951a09607f94ebc12'
oldFile: !uuid '9b04444336d8e9a220e58ed4ebfb307424b20d73'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
newFile: !uuid 'cd827463e89312576dc89744f93aedc7bfaebbbe'
oldFile: !uuid 'd9eb264fc6ba8d5041e1618ba13920acbc994a42'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task:
newFile: !uuid '7e424d09d0c924670ac46f253767989cd38c9505'
oldFile: !uuid '47a94a9634b8e09b300c028f8fbc2dcccfb6bc45'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java:
newFile: !uuid '7b5f7c66f76e6e59b556c0ae8bbf6c2596c3f13e'
oldFile: !uuid '112e4916a3cb810c1a88ab70367716f8df3cbda3'
gitCommitId: !uuid '47b50067ef26b599a7a1a47594c0c393fddcdfd0'
/dolphinscheduler-alert:
newFile: !uuid 'a890ef859a000f50a47d72ec33bc981150ba2232'
oldFile: !uuid '27b7c2e3bd347d261bc1e8e1d01fa84f3dcce721'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins:
newFile: !uuid 'abe420f7f28d0d16f962302ef68765ef6e11f34b'
oldFile: !uuid '0e0b28c16b0aef948b7d74d079e60c9efa381fc1'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email:
newFile: !uuid 'a77477504463e3aaf13928cf94bae583e1beccb7'
oldFile: !uuid 'eafe32e80a204c0cebbfbac76e1125b14afcb679'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src:
newFile: !uuid '3a3a2ba929a5c7f107d27232fd9188b997e01055'
oldFile: !uuid 'f3303d1ec73fe6b47e830e7eea6279984c34c3dc'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main:
newFile: !uuid 'bcf4fbce03328aaa110b5623264a543875461385'
oldFile: !uuid '62a08e5049488e24fa6cc4c53ce55fde349da8d4'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java:
newFile: !uuid '31dbc869746af8a31cd529d0559edfff9786da18'
oldFile: !uuid '9228d6865ca93aeff7f769f6b26be0983c57fbd7'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org:
newFile: !uuid 'fcd3a452cf790837f01612bf83fe51c2a938f6a7'
oldFile: !uuid '36644ebdb4762c958e4b60219de6819f111cbc49'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache:
newFile: !uuid 'ef24d54f1fc5173808884a7b0076634b535cf0af'
oldFile: !uuid '895fa4761971733dc74df3df4be4e86d74237453'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler
: newFile: !uuid 'ad2923c475ec2d750921105839c333ae3c953fdc'
oldFile: !uuid '915b048ae352ac0bf1cb9d71c1f3e5167e08387b'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin
: newFile: !uuid '19ebb55cb1a41e5c4c4b9c2aa3f9c298d106f117'
oldFile: !uuid '22a7d774b66206c0632e533a5405b3fb37531747'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert
: newFile: !uuid '72ceef9f3d023ed6eb88185fcee1487442597569'
oldFile: !uuid '3328324ada9114016f886be5e0d49fa8d3c28395'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email
: newFile: !uuid '446d4bea404eac9ba796e040af330a4ba5678545'
oldFile: !uuid 'ce6e073bc1634ec47735939a421fa2cbab967f58'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template
: newFile: !uuid 'bbc2153a60ecc55955ec481bced8e232cdba14b7'
oldFile: !uuid '84c0d8d66c87a779e386d13e42a2993e277a4ed7'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
: newFile: !uuid '4167e77235bbfd18318e9806a83f3fe94528bac4'
oldFile: !uuid '433cfda3f773632638afdfa8bb386f69a02596b7'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test:
newFile: !uuid 'c2907edbefa5ee836fcb778c76cc97dee4655c5a'
oldFile: !uuid '2088f3bc4e1e412309f542887bd67d9db0fa470e'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java:
newFile: !uuid '93ab413108f804219c0247690714d1140666029c'
oldFile: !uuid '035e16d0b2f38e47dd82c444662617ec21c48733'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org:
newFile: !uuid '525351f581eea5451a14255f750465e4ed5d92bb'
oldFile: !uuid 'b582c9c9c95e206e3e7a98fea1c7a19592940be3'
/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache:
newFile: !uuid 'eb429abe9a3bf57ad03aab509f10ae167f375625'
oldFile: !uuid '476ed054141f542ce3503f5a60f08e8f6c7ab9e5'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler
: newFile: !uuid 'daff4c3d5b88a3309e16e4696133521cdfbd9326'
oldFile: !uuid '07c6858096bcbf9b18eb2ab854a7b135d3de136d'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin
: newFile: !uuid 'cf6f0306aefb25821d667654fea35302845c5808'
oldFile: !uuid '52a95a730a0d0461c83eeb6749ea5bf7baa40d41'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert
: newFile: !uuid '9ef432d417c0c8a2066344648800cf97dcb264c6'
oldFile: !uuid 'd141ac401bbe1ca1111beba174028f747983728d'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email
: newFile: !uuid '6bc88338094ce9bc89fec9dbc20869c614b55542'
oldFile: !uuid '9c5519f6932b330e8cc01b09d12bf28333538156'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template
: newFile: !uuid 'ea0af03bd7411d551287e858eb8213530b0f9c16'
oldFile: !uuid 'e4d4b00321b27de1bc0c8668215ffc400c1c7380'
? /dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java
: newFile: !uuid '37fe97857c133a229fc9599e46d952ff3784ce5e'
oldFile: !uuid 'bc357cd34aab723260cb25cd72b566ccba0c47dc'
gitCommitId: !uuid 'abd57987552b77cc783cad6894ceeda898cccb6c'
renames: {
}
revisionId: 3342
revisionId: 3343

Write Preview
Loading…
Cancel
Save