#75: Merge pull request #17 from qiaozhanwei/dev

1，Outlook TLS support
2，Worker performs the creation of a tenant if the tenant does not exist
3，Protobuf conflict resolution
4，Servlet conflict resolution

commit.ref

@@ -1 +1 @@
-Subproject commit c08496d8b13e137fd7c685b15a8c6cde249954a4
+Subproject commit f17dff70a9f2823463997c0290236a2503d5e6e9

commit.yml

@@ -2,43 +2,73 @@
 branches: {
   }
 fileChange:
-  /docs:
-    newFile: !uuid 'd1f94e4941116543d9365b10997a15998c81ceac'
-    oldFile: !uuid 'cede7491ad185bf645706b06a7ec07a18ac8bc62'
-  /docs/zh_CN:
-    newFile: !uuid '01797e337077b4fcebf984062d08f6bbc7c9dd98'
-    oldFile: !uuid '26cd4d3190b12ec3095b335c47ab6c7f75f64c07'
-  /docs/zh_CN/后端部署文档.md:
-    newFile: !uuid 'fff6be713cc64b6a17d950df2e86415a18341e93'
-    oldFile: !uuid 'dfba8a5962e8de73e18eff45e288333d591d4070'
+  /escheduler-alert:
+    newFile: !uuid '1a14720c7cffae55f54c4a6349b8983af16b9c74'
+    oldFile: !uuid '0c43b0b260510bd8a47f1be16d2505a5f17b8618'
+  /escheduler-alert/src:
+    newFile: !uuid '57297d23c623d9492174d544ab09a2d47675d39d'
+    oldFile: !uuid '0554c2fc0f3151c5f55afa72f48044f7288ab62f'
+  /escheduler-alert/src/main:
+    newFile: !uuid 'ed7552cdb8ce12c4a02f4242c50b345a4691d438'
+    oldFile: !uuid 'b082e841602625b98d575d8dd02980d13641f6fb'
+  /escheduler-alert/src/main/java:
+    newFile: !uuid '83293014090892630b142dbf1ce7aaa3fc2844b3'
+    oldFile: !uuid 'd35b95846625728cd2277e39d467c3a2e3e0dfab'
+  /escheduler-alert/src/main/java/cn:
+    newFile: !uuid '000577f62b1d4ccd01acbbfb0241f63e8cf52ed1'
+    oldFile: !uuid 'e4a99fbda81e1a5cd57d3a1f9928630755139cd6'
+  /escheduler-alert/src/main/java/cn/escheduler:
+    newFile: !uuid '34049ffac728a9b0d355a7f96bd13008a2fef021'
+    oldFile: !uuid '340ea663f8fb233984da95013e57652d85e0d4b6'
+  /escheduler-alert/src/main/java/cn/escheduler/alert:
+    newFile: !uuid 'f95251cee0ac3e6d3725c86dadf1f8e3af37a064'
+    oldFile: !uuid '3c658a51b0f5e392e9fadbc7a376a0a3a4c2ac00'
+  /escheduler-alert/src/main/java/cn/escheduler/alert/utils:
+    newFile: !uuid '7b59815a7d4f1186aa51c8624700e8940dd963d1'
+    oldFile: !uuid '05dcb62179616b1d549ccf7aaca7e09599f8957b'
+  /escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java:
+    newFile: !uuid '07d1866a5df5a33b7797977e4889534760a842d7'
+    oldFile: !uuid '1f036af54b2fe75ae4e50557fab35cf09531ab82'
+  /escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java:
+    newFile: !uuid '42fbebd2f2afa1a6201b028eaaf4ecf632d18b90'
+    oldFile: !uuid '7746465e6225b2e477d4d4d3cd02ceb1a9c6e4f4'
+  /escheduler-common:
+    newFile: !uuid 'b1d46cf9634f50f264df103fe426346e3aa706e5'
+    oldFile: !uuid '0afbb45a836c75b65420723f85544a396b5b1e66'
+  /escheduler-common/pom.xml:
+    newFile: !uuid 'e06b344c4fd1de8e8b3b1d756264e279317ab107'
+    oldFile: !uuid '9cbc80b83f1b903b939c140a5266eb3bccb54a33'
   /escheduler-server:
-    newFile: !uuid '9ed0b3b31e355df336d7bed720efa28d07954e43'
-    oldFile: !uuid '4356bb712c6d86ac5752ee69e892403adb1edac4'
+    newFile: !uuid '428febe7021fc4acac4be3f08f885563b85901da'
+    oldFile: !uuid '9ed0b3b31e355df336d7bed720efa28d07954e43'
   /escheduler-server/src:
-    newFile: !uuid 'f97bbca5a9a567904c93dac18e70f1699d959920'
-    oldFile: !uuid '6e0447f0d13af3219f95577f0fdf2fee797daa4e'
-  /escheduler-server/src/test:
-    newFile: !uuid '009f27c71833b8cb2d2218ff642df0106eb74948'
-    oldFile: !uuid 'f2ed6edb4f1a7c20fe6f51b5762c99a13c450964'
-  /escheduler-server/src/test/java:
-    newFile: !uuid 'df49df52df65c79a03a4a8a5b8dc102806cc83cd'
-    oldFile: !uuid 'e2f92c71fe97533a7f98bf6e4c3846e7b3a3ab46'
-  /escheduler-server/src/test/java/cn:
-    newFile: !uuid 'c2576e680bd54b4615c3721091fcbc6775a5795e'
-    oldFile: !uuid '6b354e9d98cfd18e0ba3996425132aa0c6df37f2'
-  /escheduler-server/src/test/java/cn/escheduler:
-    newFile: !uuid '006751e7df9aa243ab7bb6925a85dfb9910f7b19'
-    oldFile: !uuid 'e24961a3a72b43622095a600d0768680977907c5'
-  /escheduler-server/src/test/java/cn/escheduler/server:
-    newFile: !uuid 'f113a37a4642b9ee78b570cf220930255b8b63e5'
-    oldFile: !uuid 'ffdc8e409635cb85d41103df7fc4563a411d9fb1'
-  /escheduler-server/src/test/java/cn/escheduler/server/zk:
-    newFile: !uuid '996bc34381b62c35c9855788f5f2feb2edae5259'
-    oldFile: !uuid 'd9c62fa9294fafb06f264c8ece3d68dff19e443a'
-  /escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java:
-    newFile: !uuid 'f18be54e0c3b364d44d3f1bd8c06eb2667ae8fbf'
-    oldFile: !uuid '04e8b8d606ba2b5c8b27e3b41edfd5fafd443243'
-gitCommitId: !uuid 'c08496d8b13e137fd7c685b15a8c6cde249954a4'
+    newFile: !uuid '5c1dc38d8a1d8779a6a32ff5be608008f423bfe5'
+    oldFile: !uuid 'f97bbca5a9a567904c93dac18e70f1699d959920'
+  /escheduler-server/src/main:
+    newFile: !uuid 'b7c22678098db6d6ecf55c25b4fc7b08cf50e3fb'
+    oldFile: !uuid '7eaf3a38ef9fe69c8381251cad1e722e7cd99506'
+  /escheduler-server/src/main/java:
+    newFile: !uuid '6d045cabac293093d85488625514f919df57232d'
+    oldFile: !uuid '0cb8a0424e120a8bc4bf94e3c72b3fe09a6b1fdf'
+  /escheduler-server/src/main/java/cn:
+    newFile: !uuid '27413ae7cb25b95161664387cfa47773dc644535'
+    oldFile: !uuid '2c6bce5ffccbc6bd37101eca14fab5e230dc02ca'
+  /escheduler-server/src/main/java/cn/escheduler:
+    newFile: !uuid 'f60e8bd06a118a73644876c07ae8ef1a4d9db256'
+    oldFile: !uuid 'a94f409bec2b71f3021f1301aa8b62ed1c76dbb5'
+  /escheduler-server/src/main/java/cn/escheduler/server:
+    newFile: !uuid '9e6d443b49c038b346ed5e83302bae2ccfdd355c'
+    oldFile: !uuid 'b64586244976f115d7ab2e98f87e91f33e8c7ae6'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker:
+    newFile: !uuid '9fdb5f6716ee96fd23be3d7fd756396d44c34ffb'
+    oldFile: !uuid '73fbb898be1e1bb235c97ae00d7d6775035e02b8'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/runner:
+    newFile: !uuid 'd55688a38394d5dd909cf44fb5ce47d12ca98398'
+    oldFile: !uuid 'b22e2701692b03822fd26c5eff82b9ed884d7396'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java:
+    newFile: !uuid '6a28e1bbdffce7b95e75c1bb833a4f3349a4ed8a'
+    oldFile: !uuid '50402d4a3b5f797de17f465ece2815fe589e0986'
+gitCommitId: !uuid 'f17dff70a9f2823463997c0290236a2503d5e6e9'
 renames: {
   }
-revisionId: 74
+revisionId: 75