#100: Merge pull request #56 from lidongdai/dev

edit en_US , translate chinese to english
6 years ago · f06cb46b27
2 changed files with 21 additions and 210 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit e571de2828bfe0bc6df2ea17c87cc822b07c6ac8
+Subproject commit 9770d988fe706ca852e6ee998f1b2a7f3f865323
--- a/commit.yml
+++ b/commit.yml
@ -2,217 +2,28 @@
 branches: {
  }
 fileChange:
-  /escheduler-api:
-    newFile: !uuid 'bb4f3f2cdc7ef9d6bb7cb66660c8eae8d1642245'
-    oldFile: !uuid 'aaf827ac61c6a6f82d5ffc2d60ba6c60417fc2e8'
-  /escheduler-api/src:
-    newFile: !uuid '6c3d58070900f448ad5711ad01efc91b2828fa87'
-    oldFile: !uuid '7836e8cbf62bd932058400dfd32b31c015c33fbc'
-  /escheduler-api/src/main:
-    newFile: !uuid 'e2059a3e7562d52ce88fe8144eb22a4453071359'
-    oldFile: !uuid '2f51e5ac76b56262230b2a961399d9fb59882ee6'
-  /escheduler-api/src/main/java:
-    newFile: !uuid '37d4a4c301fc89ce5140cc4ec5649fd0dff24376'
-    oldFile: !uuid '7227d7df2a55f0ddd790174ea3cabdb232c083b6'
-  /escheduler-api/src/main/java/cn:
-    newFile: !uuid 'ef0efd55e1e0846d8f952ddedc7fe84a7e27aafb'
-    oldFile: !uuid '99babc9aff3a25790125cc849eba093b85be507f'
-  /escheduler-api/src/main/java/cn/escheduler:
-    newFile: !uuid 'f2093465d1450f4a11e06e700755c0d0b1e6a0b1'
-    oldFile: !uuid '8c2df0063279cd4304a60554f6ca687d3a6bb248'
-  /escheduler-api/src/main/java/cn/escheduler/api:
-    newFile: !uuid '370d5bc7049d94cacc9492cb571d20f0ed75cb6a'
-    oldFile: !uuid 'b7069997f6493dc7651c98766058a1e8e5ba9fd4'
-  /escheduler-api/src/main/java/cn/escheduler/api/service:
-    newFile: !uuid '9325f1808d9c9fe34b43c3c7a3a70e06b2430f96'
-    oldFile: !uuid 'cd445f0680a5eb1c4b0a81028adef98d45c4e44e'
-  /escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java:
-    newFile: !uuid 'a5c72758fb1af1fb1379c844425a34ff24050105'
-    oldFile: !uuid '58c24bddc138881ca20a8b6102d2a980d13285e7'
-  /escheduler-api/src/main/java/cn/escheduler/api/utils:
-    newFile: !uuid '11003be86cbd7053964754a74b158f98f06a072d'
-    oldFile: !uuid '528e60f3b499b13aa35497f906a30eb57e1f6cf6'
-  /escheduler-api/src/main/java/cn/escheduler/api/utils/Constants.java:
-    newFile: !uuid '79cf3e5b3fa7a5f824b10ed0a1afb09ed6c1649f'
-    oldFile: !uuid 'aa25da8f1116430c9fceb24edd9263410f2cacb2'
-  /escheduler-common:
-    newFile: !uuid '364528b70851b3cf2ae4fdd9d74572932601379d'
-    oldFile: !uuid '133b5491342ea5e92c9da48d6f486019a94d9c25'
-  /escheduler-common/pom.xml:
-    newFile: !uuid 'c0daa0bce7cc536aaf7a13d5d428ab1435ab8d0a'
-    oldFile: !uuid '35c83bc2b0aff8751fd8d474e809dde79440f522'
-  /escheduler-common/src:
-    newFile: !uuid '743dcc8cce3e20a01754dfb14a57950927e258cb'
-    oldFile: !uuid 'ac062d2dc66ee30030c7d5dade1cf8f3ebf1a941'
-  /escheduler-common/src/main:
-    newFile: !uuid '2168e092f660ae1270a7c4c520dec574139c8ca7'
-    oldFile: !uuid 'e794010cf1cfdd1a7f55e80834a404c255084b57'
-  /escheduler-common/src/main/java:
-    newFile: !uuid '9d8b2541aa0537d9c847f822c67a7367e6c39786'
-    oldFile: !uuid '748de5fe0edc9e20a090c4e8e7d62292a29bbdbd'
-  /escheduler-common/src/main/java/cn:
-    newFile: !uuid '6f44dfd15c961dad486b2aff320c26ffe7dc4b23'
-    oldFile: !uuid '5f3217a9d362f53fbf995157b5c4c35dbd214075'
-  /escheduler-common/src/main/java/cn/escheduler:
-    newFile: !uuid 'd88aea7987a576fbbcbd8a8fac4e82987075f64b'
-    oldFile: !uuid 'd1404be57ffd573b2461c3ec11366e3664c37c1c'
-  /escheduler-common/src/main/java/cn/escheduler/common:
-    newFile: !uuid '341ac0fd2ae43b62ab9ecb822db2f5887071d233'
-    oldFile: !uuid 'c6020838488461a2d3be725465dda601fa895ce5'
-  /escheduler-common/src/main/java/cn/escheduler/common/Constants.java:
-    newFile: !uuid '98a2535f03e6e3e2b78f866b05ab937658c06c94'
-    oldFile: !uuid 'e61bef101888e1d34b8bcefef39b542834e1a19a'
-  /escheduler-common/src/main/java/cn/escheduler/common/enums:
-    newFile: !uuid '9a164862203d807f872de0ed00cc9dced51b55da'
-    oldFile: !uuid '4df59c019820ec989ff5689688819ee73199f88f'
-  /escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java:
-    newFile: !uuid 'bf0ebba60c9f25022839747c9ee8ec23588546f1'
-    oldFile: !uuid 'bcd7e71dbddf285d88d16c32bd8dd240c80fd0c2'
-  /escheduler-common/src/main/java/cn/escheduler/common/job:
-    newFile: !uuid '0ddb60f1fb45570cae4f9618e8530df00970e4f6'
-    oldFile: !uuid '4e310786d6ec6627268bdc2cfecac76f83627461'
-  /escheduler-common/src/main/java/cn/escheduler/common/job/db:
-    newFile: !uuid 'f5239fd7fedda348281a84a84166f6d47ba5c5be'
-    oldFile: !uuid '252c9b73c1cd3a9bfcce83c03160528135781f86'
-  /escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java:
-    newFile: !uuid '316be26d89bcb30f06f433c49b10e9962ff96ae0'
-    oldFile: !uuid 'c694b9c70813dfa8aad72809622b63966088d877'
-  /escheduler-common/src/main/java/cn/escheduler/common/job/db/OracleDataSource.java:
-    newFile: !uuid '5e245a590c0c7bd0ce7034bda0a19029b8b6f9ad'
-    oldFile: null
-  /escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java:
-    newFile: !uuid 'f4d202a76e8b7800823ddada47d3bb905f5ece34'
-    oldFile: null
-  /escheduler-server:
-    newFile: !uuid 'f1659afe55114a43bb0b33536be442533485e0c0'
-    oldFile: !uuid 'ddce14b20a2753cdf8451933929e511a2c9eceb9'
-  /escheduler-server/src:
-    newFile: !uuid '227e23537d657f8401189f655455a3f5eb054918'
-    oldFile: !uuid 'fef00818e1ebc2089ffb0aeac20f0ba6538c3cb2'
-  /escheduler-server/src/main:
-    newFile: !uuid '37ea0fc29d50c921777f69c40c818fc15fb4905f'
-    oldFile: !uuid '2bf42fb05045606b26b5b01886768c35bdc59eb9'
-  /escheduler-server/src/main/java:
-    newFile: !uuid 'bdf56ac0513efb3e1009207101f15d6a84953dbe'
-    oldFile: !uuid 'a413f3bfa0de3f9c46d7f15b98e5a9d8f927680f'
-  /escheduler-server/src/main/java/cn:
-    newFile: !uuid '1c117775fd9205a608d33969b64a37d2ca704ab9'
-    oldFile: !uuid 'd377a89e122ac1cd22a02f99cf336297ea5d7f6f'
-  /escheduler-server/src/main/java/cn/escheduler:
-    newFile: !uuid '7f48524528d828be5903e1735a7ae1d02e4c6bf8'
-    oldFile: !uuid 'e6bea715c83156f33acc04ff044b30476aab666f'
-  /escheduler-server/src/main/java/cn/escheduler/server:
-    newFile: !uuid '5844372fb9e38fb68a6c87dbfe60e40501b8ef7e'
-    oldFile: !uuid 'c35bc2a4e1c0117e4e8331acae68ed8f08ad361d'
-  /escheduler-server/src/main/java/cn/escheduler/server/worker:
-    newFile: !uuid '55beb965df9e6aa17fe14bbd24857470dc71ea78'
-    oldFile: !uuid 'dd44b8c6f559fbce72dd306c00690369c68023c8'
-  /escheduler-server/src/main/java/cn/escheduler/server/worker/task:
-    newFile: !uuid 'c9f2e44ae7bfe9010ac0b35969d7c2c8cf0162a4'
-    oldFile: !uuid 'cc5ee8ec7c26134ce8cdd1fb9f549a77ff00370f'
-  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure:
-    newFile: !uuid '58277c7a08b8bb06198858d80e557e8ef4a677ec'
-    oldFile: !uuid '43ac9d0140b47891bd5139355841a39f0cf0c5cc'
-  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java:
-    newFile: !uuid '98428c5389260869fa0a48187d6363fda832f820'
-    oldFile: !uuid '4c3f3f63adcbcd171acd5e2ff6bb8fdfe3246734'
-  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql:
-    newFile: !uuid '25cc10c54cf095ec4d3539a2254f32c29702f315'
-    oldFile: !uuid '76a63fd8bbedfd438e0c0108851d1895a9e7df1c'
-  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java:
-    newFile: !uuid 'bab755ba67d898890ec0deb94cf5b11808580fc1'
-    oldFile: !uuid '858e7b8bfc8fec9f2c19048653864242f10f624a'
-  /escheduler-server/src/test:
-    newFile: !uuid 'c0d8a7cdfb802c2e9ed6d6bd7394d5438a4d4d7c'
-    oldFile: !uuid '565b94841d426887fe6a30b3b815c45e2604569b'
-  /escheduler-server/src/test/java:
-    newFile: !uuid '0cb26539c3476395dd900cf9c2e470c9ac6ba713'
-    oldFile: !uuid '86035c9d7885cb0b54241b1870754272ec2f19ed'
-  /escheduler-server/src/test/java/cn:
-    newFile: !uuid 'db1fc34f912a17873ddd372999141b915cc86c59'
-    oldFile: !uuid '559aec306a3075f00f738ab081a1920c00b49a02'
-  /escheduler-server/src/test/java/cn/escheduler:
-    newFile: !uuid 'ab9c24241e3eb857ab8f0b4a1b8b3bc8043cf408'
-    oldFile: !uuid 'de3bf6643d51503f4a2ce220e217d1245b03d70e'
-  /escheduler-server/src/test/java/cn/escheduler/server:
-    newFile: !uuid '563f05303c3718531eae32b62a2de1ccb625136c'
-    oldFile: !uuid '6ce07286c13c1dcb214ac410a1444ea8473dad1a'
-  /escheduler-server/src/test/java/cn/escheduler/server/worker:
-    newFile: !uuid 'd487674d5e01280ca1ab19f189d0d6d9b3814efd'
-    oldFile: !uuid '665b9192484a535f6f7a16a7737f8deb3afcf93d'
-  /escheduler-server/src/test/java/cn/escheduler/server/worker/sql:
-    newFile: !uuid '5dc473dc865d2b0bc6f263cab6b239c7d35f267a'
-    oldFile: !uuid '40885c8dd31e04667349fbd635c0ce80076fc99a'
-  /escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java:
-    newFile: !uuid '120e7a997268501a43e9253cd31b46364805e344'
-    oldFile: !uuid '5565cd6a089549e3d99fd6a87efe6ee25cb09c21'
  /escheduler-ui:
-    newFile: !uuid '59bdac10176a7e2544b35e7932ada59bd9ff7682'
-    oldFile: !uuid '166f447e74db0236bf61df4853a79165c1d8d6f1'
+    newFile: !uuid '8f2d0ebb6748a7995eb645c3474af23472aaa444'
+    oldFile: !uuid '59bdac10176a7e2544b35e7932ada59bd9ff7682'
  /escheduler-ui/src:
-    newFile: !uuid '005db2bab3d4989e06acd6b8707ce3ff3b5bc5fa'
-    oldFile: !uuid 'edb0e1b005cefc0d298b78f1a9cb0367ab8f9af5'
+    newFile: !uuid 'c948881684d127f2c7b0d4563101eb98208b391c'
+    oldFile: !uuid '005db2bab3d4989e06acd6b8707ce3ff3b5bc5fa'
  /escheduler-ui/src/js:
-    newFile: !uuid '322823e1163a396e1f899ee14101af318781b6da'
-    oldFile: !uuid '4b6247fd5f5a8c3f42aca42ab6e7d90c36e6f029'
-  /escheduler-ui/src/js/conf:
-    newFile: !uuid '9ab05ab459faf797bfc97ab4c3526206096f6ce6'
-    oldFile: !uuid 'ad005d15f2deabdf22341e6b903ea5d0db6d111c'
-  /escheduler-ui/src/js/conf/home:
-    newFile: !uuid '627e2b61837aa66fbf2e0322e13caa9d97c85c40'
-    oldFile: !uuid '6d8489e5b4c9964813a38a6cf575a541ab99628d'
-  /escheduler-ui/src/js/conf/home/pages:
-    newFile: !uuid '576e42000378e6e31628e8706f147a9cca6d42cd'
-    oldFile: !uuid 'a4fe427b97387174d3de8092b156eabd333d6a5f'
-  /escheduler-ui/src/js/conf/home/pages/dag:
-    newFile: !uuid '323c8a1a17128f8a998612165f8e7306f745c51f'
-    oldFile: !uuid 'b9ee3cc85a9166f7a3f9250039db9c1cb8d6e8d1'
-  /escheduler-ui/src/js/conf/home/pages/dag/_source:
-    newFile: !uuid '19f49df2708b7cce6a44910613cfaa5bec886a63'
-    oldFile: !uuid '95bf0d8f3e6cfae80002b615fc12e6ab5799643b'
-  /escheduler-ui/src/js/conf/home/pages/dag/_source/formModel:
-    newFile: !uuid '3d7a1cd5874ab307765c048e61ab4bc9fe8349a0'
-    oldFile: !uuid '7409a4fc9584aaad3646bcdc581182d3c3cd5225'
-  /escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks:
-    newFile: !uuid '4a15a96ed470bcb674be25bc9cbd523123a34757'
-    oldFile: !uuid '66ec69a01923fe741b08f396892905e380e59081'
-  /escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue:
-    newFile: !uuid '74a41d7ff38722e6f34f55fe5a7455d0502e0c2a'
-    oldFile: !uuid '84a2d05634d5252aad7ffc498745e33bf86027f5'
-  /escheduler-ui/src/js/conf/home/pages/datasource:
-    newFile: !uuid '327552e5d34bf0ffd3e0054493572d5c2308166e'
-    oldFile: !uuid '1df8c579a37fea1847d552e49bed3827f95d6490'
-  /escheduler-ui/src/js/conf/home/pages/datasource/pages:
-    newFile: !uuid 'd8f1c211f2df24bc1862801ae19f499edb16d54b'
-    oldFile: !uuid 'aa2cbfc6068ca463c7a7378b9adf185ebc054233'
-  /escheduler-ui/src/js/conf/home/pages/datasource/pages/list:
-    newFile: !uuid 'f5a2b7ac2b4cc0b049351930a4491db897bd3af3'
-    oldFile: !uuid '833afaed443cec8031a18a2110b24d8f8591cda2'
-  /escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source:
-    newFile: !uuid 'fb45379d4a1a6d611a77d50b903403cfd955231b'
-    oldFile: !uuid 'c319324e4813d1476595fc2f9e3455dd381753a9'
-  /escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue:
-    newFile: !uuid '10f091f6bf7a0fffd70be16053eed2f7eb5f3c8d'
-    oldFile: !uuid '96e453c3180b17628b74c5c7c5f1a66c7c672bb4'
-  /escheduler-ui/src/js/conf/home/store:
-    newFile: !uuid '9479ead82de18afb1a330bc13327f39201525363'
-    oldFile: !uuid 'ae75b40898c87b12feee882418651fce79a4e6a5'
-  /escheduler-ui/src/js/conf/home/store/dag:
-    newFile: !uuid '079d58138c8bd477ce8b210501fcd69a99113699'
-    oldFile: !uuid 'ef8eb9a5c7698c6c071f54bb8ef647399f1def27'
-  /escheduler-ui/src/js/conf/home/store/dag/state.js:
-    newFile: !uuid '6ac387abef0d41d9d72afeb9c0ed0c7b7d648ab9'
-    oldFile: !uuid 'e51c2186ec0fb666072ae12ed3ee5b4031bfa4c6'
-  /escheduler-ui/src/js/conf/home/store/datasource:
-    newFile: !uuid '74e996473255ac2401fb25375a1aa656601d99bc'
-    oldFile: !uuid '208e7433c3e66c529476de747dc7bcf6fa44e43a'
-  /escheduler-ui/src/js/conf/home/store/datasource/actions.js:
-    newFile: !uuid '3e409ccb8be034ed4abd8d8ae0a2a2c83c8e55e0'
-    oldFile: !uuid '4e7bd13d76b8bb801b86c51f6c153b0927377e5b'
-  /pom.xml:
-    newFile: !uuid '83b2032985d9073f5a0eedfe73bc5bf6fc885d61'
-    oldFile: !uuid '2b0b585106a082986f9cfb4899e427f63efb304b'
-gitCommitId: !uuid 'e571de2828bfe0bc6df2ea17c87cc822b07c6ac8'
+    newFile: !uuid 'b31ba800654f28f7b6c4f5fcfce7d372e2999c35'
+    oldFile: !uuid '322823e1163a396e1f899ee14101af318781b6da'
+  /escheduler-ui/src/js/module:
+    newFile: !uuid '1b48d8efdd20e32945c5194b01601f873f7a1aaf'
+    oldFile: !uuid '308a469b6c58f6e875c2f256fc3dc8a2e9fea05d'
+  /escheduler-ui/src/js/module/i18n:
+    newFile: !uuid '8186717c74c76c23860ac5a37d2ddeb9fefc1402'
+    oldFile: !uuid '1b208b6b490eb823e1a5ea8c4f1084b9af4735a9'
+  /escheduler-ui/src/js/module/i18n/locale:
+    newFile: !uuid '88471c36cd4657dda2f151cafb43247bf4ef9c4b'
+    oldFile: !uuid '6087640129c93e7e028bb6924b8ff2de7279e5b5'
+  /escheduler-ui/src/js/module/i18n/locale/en_US.js:
+    newFile: !uuid '292705f440a12a2b4248ecb04d01e0ffeab592f9'
+    oldFile: !uuid '449a652416350d8575aaf155d69aa3fb4c78280b'
+gitCommitId: !uuid '9770d988fe706ca852e6ee998f1b2a7f3f865323'
 renames: {
  }
-revisionId: 99
+revisionId: 100