Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 1.0.0 rc #282

Merged
merged 925 commits into from
May 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
925 commits
Select commit Hold shift + click to select a range
1afe8cb
Merge pull request #161 from Kabimon/dev-1.0.0
FinalTarget Feb 14, 2022
75d8832
Add dispatcher of service rpc for data source
Davidhua1996 Feb 14, 2022
0c7d2fc
Abstract interface: DataSourceInfoService and MetadataInfoService
Davidhua1996 Feb 14, 2022
56ccd78
list 70-71
mingfengwang Feb 15, 2022
f403135
Merge pull request #46 from Kabimon/feature/ui_refactory
mingfengwang Feb 15, 2022
0b70772
list 76
mingfengwang Feb 15, 2022
fdb678c
Merge pull request #47 from Kabimon/feature/ui_refactory
mingfengwang Feb 15, 2022
73bc2e6
Merge pull request #162 from Kabimon/dev-1.0.0
FinalTarget Feb 15, 2022
a94d253
Modify get job status method
FinalTarget Feb 15, 2022
5f579fe
Complete the LinkisMetadataInfoService
Davidhua1996 Feb 15, 2022
19b61af
Merge pull request #163 from FinalTarget/dev-1.0.0
Davidhua1996 Feb 15, 2022
ee9ad05
list 56 77-84 86 88
mingfengwang Feb 16, 2022
eddf442
Merge pull request #48 from Kabimon/feature/ui_refactory
mingfengwang Feb 16, 2022
4ec60bd
Merge pull request #164 from Kabimon/dev-1.0.0
FinalTarget Feb 16, 2022
debb775
Adjust the namespace of restful classes
Davidhua1996 Feb 16, 2022
9acc488
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Feb 16, 2022
e23ce9b
Merge branch 'dev-1.0.0' of github.com:Davidhua1996/Exchangis into de…
Davidhua1996 Feb 16, 2022
85f7469
Fix the problem in DefaultTaskExecuteService
Davidhua1996 Feb 16, 2022
1bbbda9
Merge pull request #165 from Davidhua1996/dev-1.0.0
FinalTarget Feb 17, 2022
54ccc5a
隐藏首页&修改数据源清空逻辑
mingfengwang Feb 17, 2022
68eabc1
list to 96
mingfengwang Feb 17, 2022
7e7c723
Merge pull request #49 from Kabimon/feature/ui_refactory
mingfengwang Feb 17, 2022
b7ce306
fix bug
mingfengwang Feb 17, 2022
ba06969
Merge pull request #50 from Kabimon/feature/ui_refactory
mingfengwang Feb 17, 2022
5512ee4
Change the package name of Exchangis-AppConn
Davidhua1996 Feb 17, 2022
1b77d14
Merge pull request #166 from Kabimon/dev-1.0.0
FinalTarget Feb 18, 2022
8c3dec0
Add job update interface, add job and project pagination,modify contr…
FinalTarget Feb 18, 2022
3f7b64a
list to 101
mingfengwang Feb 18, 2022
45d05ab
Merge pull request #51 from Kabimon/feature/ui_refactory
mingfengwang Feb 18, 2022
931ed1c
执行历史table滚动
mingfengwang Feb 18, 2022
b0352a1
Merge pull request #52 from Kabimon/feature/ui_refactory
mingfengwang Feb 18, 2022
882ed45
Merge pull request #168 from Kabimon/dev-1.0.0
FinalTarget Feb 18, 2022
17415dc
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
FinalTarget Feb 18, 2022
b6995f4
Merge pull request #167 from FinalTarget/dev-1.0.0
Davidhua1996 Feb 19, 2022
b64aa87
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Feb 19, 2022
9fd0cff
Modification of project create operation
Davidhua1996 Feb 19, 2022
bf5e35d
Merge branch 'dev-1.0.0' of github.com:Davidhua1996/Exchangis into de…
Davidhua1996 Feb 19, 2022
de46096
Abstract the operation class in Exchangis AppConn
Davidhua1996 Feb 20, 2022
d6670b9
Adjustment of AppConn (optimize the structure)
Davidhua1996 Feb 20, 2022
2ce620a
list 102-107
mingfengwang Feb 21, 2022
819e851
list 101
mingfengwang Feb 21, 2022
b7853e3
数据源管理分页修正
mingfengwang Feb 21, 2022
2ea86e1
Merge pull request #53 from Kabimon/feature/ui_refactory
mingfengwang Feb 21, 2022
90ad3ae
Merge pull request #169 from Kabimon/dev-1.0.0
FinalTarget Feb 21, 2022
231587b
隐藏搜索库表 & 独立单页
mingfengwang Feb 21, 2022
7ff6212
resolve conflict
mingfengwang Feb 21, 2022
e854245
Merge branch 'dev-1.0.0' into feature/ui_refactory
mingfengwang Feb 21, 2022
e040a94
Merge pull request #54 from Kabimon/feature/ui_refactory
mingfengwang Feb 21, 2022
c15063f
Merge pull request #170 from Kabimon/dev-1.0.0
FinalTarget Feb 21, 2022
21b5a77
Render service for data source; ElementUIFactory;
Davidhua1996 Feb 21, 2022
9f85a55
Render service for data source(100%)
Davidhua1996 Feb 21, 2022
993c5e0
优化前端代码,删除冗余代码
mingfengwang Feb 22, 2022
56533b7
Modify restfulApi and add page function.
FinalTarget Feb 22, 2022
f20e2d0
list 108-110
mingfengwang Feb 22, 2022
d7078e4
Merge pull request #55 from Kabimon/feature/ui_refactory
mingfengwang Feb 22, 2022
a516a46
Merge pull request #172 from Kabimon/dev-1.0.0
FinalTarget Feb 22, 2022
61de343
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
FinalTarget Feb 22, 2022
52b8c68
Merge pull request #171 from FinalTarget/dev-1.0.0
Davidhua1996 Feb 22, 2022
024f30c
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Feb 22, 2022
772821b
list to 125
mingfengwang Feb 22, 2022
8a6130b
Merge pull request #56 from Kabimon/feature/ui_refactory
mingfengwang Feb 22, 2022
f7ed166
Merge pull request #173 from Kabimon/dev-1.0.0
FinalTarget Feb 22, 2022
ce570fc
Modification in data source module
Davidhua1996 Feb 22, 2022
7348b69
Add user permission in get jobList, and modify get job status condition.
FinalTarget Feb 23, 2022
692e558
list104 126 127
mingfengwang Feb 23, 2022
be7c7da
Merge pull request #57 from Kabimon/feature/ui_refactory
mingfengwang Feb 23, 2022
e609de7
Merge pull request #175 from Kabimon/dev-1.0.0
FinalTarget Feb 23, 2022
2d30dee
Advance the printing of task log
Davidhua1996 Feb 23, 2022
c13623b
Merge pull request #174 from FinalTarget/dev-1.0.0
Davidhua1996 Feb 23, 2022
0f97104
试着修复tree卡顿的问题
mingfengwang Feb 23, 2022
06eeae0
Merge pull request #58 from Kabimon/feature/ui_refactory
mingfengwang Feb 23, 2022
f7ff8a9
Merge pull request #176 from Kabimon/dev-1.0.0
FinalTarget Feb 23, 2022
edce76d
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Feb 23, 2022
b164eed
Merge branch 'dev-1.0.0' of github.com:Davidhua1996/Exchangis into de…
Davidhua1996 Feb 23, 2022
705cce8
修复map更新问题
mingfengwang Feb 24, 2022
7c943bb
Merge pull request #59 from Kabimon/feature/ui_refactory
mingfengwang Feb 24, 2022
0bcf272
list 130
mingfengwang Feb 24, 2022
1305cc6
Merge pull request #177 from Kabimon/dev-1.0.0
FinalTarget Feb 24, 2022
7d7b936
fix bug
mingfengwang Feb 24, 2022
489fe55
Merge pull request #60 from Kabimon/feature/ui_refactory
mingfengwang Feb 24, 2022
60d00e3
Merge pull request #178 from Kabimon/dev-1.0.0
FinalTarget Feb 24, 2022
d1362eb
Problem fix in DefaultTaskExecuteService
Davidhua1996 Feb 24, 2022
32be400
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Feb 24, 2022
3640453
Merge pull request #179 from Davidhua1996/dev-1.0.0
FinalTarget Feb 24, 2022
ebd9508
修复分区信息更新问题
mingfengwang Feb 24, 2022
7489c4a
Merge pull request #61 from Kabimon/feature/ui_refactory
mingfengwang Feb 24, 2022
a19ca90
修复数据源弹窗z-index问题
mingfengwang Feb 24, 2022
4bcd663
Merge pull request #62 from Kabimon/feature/ui_refactory
mingfengwang Feb 24, 2022
1a2bc2e
Merge pull request #180 from Kabimon/dev-1.0.0
FinalTarget Feb 24, 2022
ea8b3ce
list 115
mingfengwang Feb 24, 2022
529ab34
Merge pull request #63 from Kabimon/feature/ui_refactory
mingfengwang Feb 24, 2022
10a1e12
Merge pull request #181 from Kabimon/dev-1.0.0
FinalTarget Feb 24, 2022
0ce79d2
list 133
mingfengwang Feb 24, 2022
0ac467f
Merge pull request #64 from Kabimon/feature/ui_refactory
mingfengwang Feb 24, 2022
c4cfeac
Problem fix in EngineJob and LoadBalancer
Davidhua1996 Feb 24, 2022
ff684bd
Merge pull request #182 from Kabimon/dev-1.0.0
FinalTarget Feb 25, 2022
9398a93
list 122
mingfengwang Feb 25, 2022
d8b5a29
list 134
mingfengwang Feb 25, 2022
cd4762a
Merge pull request #65 from Kabimon/feature/ui_refactory
mingfengwang Feb 25, 2022
d8a6107
list 135
mingfengwang Feb 25, 2022
77bcdb2
Merge pull request #66 from Kabimon/feature/ui_refactory
mingfengwang Feb 25, 2022
c8c8643
list 136 137
mingfengwang Feb 25, 2022
6a8fd34
Merge pull request #67 from Kabimon/feature/ui_refactory
mingfengwang Feb 25, 2022
22ef0a3
Merge pull request #183 from Kabimon/dev-1.0.0
FinalTarget Feb 25, 2022
815e501
Problem fix in JobParamSet and TaskObserver
Davidhua1996 Feb 25, 2022
3915afc
Modify restful about exception.
FinalTarget Feb 25, 2022
485268e
Modify restful about exception
FinalTarget Feb 25, 2022
127a172
Merge pull request #184 from FinalTarget/dev-1.0.0
Davidhua1996 Feb 25, 2022
e86bccf
Merge branch 'dev-1.0.0' of github.com:WeBankFinTech/Exchangis into d…
Davidhua1996 Feb 25, 2022
fae5025
fix bug
mingfengwang Feb 26, 2022
e6773e6
Merge pull request #68 from Kabimon/feature/ui_refactory
mingfengwang Feb 26, 2022
5cae6d2
fix bug
mingfengwang Feb 26, 2022
4e3bbe2
Merge pull request #69 from Kabimon/feature/ui_refactory
mingfengwang Feb 26, 2022
223d046
fix bug
mingfengwang Feb 26, 2022
4afdf6e
Merge pull request #70 from Kabimon/feature/ui_refactory
mingfengwang Feb 26, 2022
e65e0a1
Merge pull request #185 from Davidhua1996/dev-1.0.0
FinalTarget Feb 26, 2022
3b1e8ec
Merge pull request #186 from Kabimon/dev-1.0.0
FinalTarget Feb 26, 2022
2f4f059
fix bug
mingfengwang Feb 26, 2022
af144ca
Merge pull request #71 from Kabimon/feature/ui_refactory
mingfengwang Feb 26, 2022
c690a14
fix bug
mingfengwang Feb 26, 2022
c595fba
Merge pull request #72 from Kabimon/feature/ui_refactory
mingfengwang Feb 26, 2022
37f390b
Merge pull request #187 from Kabimon/dev-1.0.0
FinalTarget Feb 26, 2022
1d6daf5
Add AbstractLoggingExchangisJobBuilder;Add DEFINE_INSPECTION in Sqoop…
Davidhua1996 Feb 26, 2022
f7994e3
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Feb 26, 2022
de367ad
Merge pull request #188 from Davidhua1996/dev-1.0.0
FinalTarget Feb 27, 2022
f2ede44
Reconstruct the project module
Davidhua1996 Feb 28, 2022
6e05fd2
Merge branch 'dev-1.0.0' of github.com:Davidhua1996/Exchangis into de…
Davidhua1996 Feb 28, 2022
d69edf4
Merge branch 'dev-1.0.0' of github.com:Davidhua1996/Exchangis into de…
Davidhua1996 Feb 28, 2022
b49ba9d
Add Default validator group
Davidhua1996 Feb 28, 2022
f767406
Replace the @NotBlank with @NotNull
Davidhua1996 Feb 28, 2022
a64bf47
Merge pull request #189 from Davidhua1996/dev-1.0.0
FinalTarget Feb 28, 2022
9e9ee86
fix bug & list 139-142
mingfengwang Feb 28, 2022
cea0e82
Merge pull request #73 from Kabimon/feature/ui_refactory
mingfengwang Feb 28, 2022
9420a41
fix bug
mingfengwang Feb 28, 2022
bdf0236
Merge pull request #74 from Kabimon/feature/ui_refactory
mingfengwang Feb 28, 2022
dd4c4c6
Merge pull request #190 from Kabimon/dev-1.0.0
FinalTarget Feb 28, 2022
2c45f67
change timeout 10s to 30s
mingfengwang Feb 28, 2022
0e05d25
Merge pull request #75 from Kabimon/feature/ui_refactory
mingfengwang Feb 28, 2022
85d0eb5
Merge pull request #191 from Kabimon/dev-1.0.0
FinalTarget Feb 28, 2022
39191ad
fix bug
mingfengwang Feb 28, 2022
eb3cc71
Merge pull request #76 from Kabimon/feature/ui_refactory
mingfengwang Feb 28, 2022
322475f
refine style lint
mingfengwang Feb 28, 2022
ead9b2d
Merge pull request #77 from Kabimon/feature/ui_refactory
mingfengwang Feb 28, 2022
c51869a
fix bug
mingfengwang Feb 28, 2022
5b7c08e
Merge pull request #78 from Kabimon/feature/ui_refactory
mingfengwang Feb 28, 2022
fd99f96
Modify update and create method of datasource.Add connectTestByJson
FinalTarget Feb 28, 2022
35026ea
Avoid the useless restful api
Davidhua1996 Feb 28, 2022
94d5c18
Merge pull request #192 from Kabimon/dev-1.0.0
FinalTarget Feb 28, 2022
cd6b8ff
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
FinalTarget Feb 28, 2022
0a29f05
Merge pull request #193 from FinalTarget/dev-1.0.0
Davidhua1996 Feb 28, 2022
28ad7ee
Merge branch 'dev-1.0.0' of github.com:Davidhua1996/Exchangis into de…
Davidhua1996 Feb 28, 2022
63634e4
Complete the ParamsTestConnectAction
Davidhua1996 Feb 28, 2022
1a93524
Revert "Avoid the useless restful api"
Davidhua1996 Feb 28, 2022
caea1ed
fix bug
mingfengwang Mar 1, 2022
ce9ece8
fix bug
mingfengwang Mar 1, 2022
6c0cf71
fix bug
mingfengwang Mar 1, 2022
b105fd8
Merge pull request #79 from Kabimon/feature/ui_refactory
mingfengwang Mar 1, 2022
56d079e
Merge pull request #194 from Davidhua1996/dev-1.0.0
FinalTarget Mar 1, 2022
cd3d318
Merge pull request #195 from Kabimon/dev-1.0.0
FinalTarget Mar 1, 2022
4415eda
fix bug
mingfengwang Mar 1, 2022
d406f82
Merge pull request #80 from Kabimon/feature/ui_refactory
mingfengwang Mar 1, 2022
7a5d5b0
Merge pull request #196 from Kabimon/dev-1.0.0
FinalTarget Mar 1, 2022
1a3bcaf
Rebuild the job module to suitable JSR303 rule and new table
Davidhua1996 Mar 1, 2022
8535483
Resolve conflict
Davidhua1996 Mar 1, 2022
8bb3954
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Mar 1, 2022
f940a80
Merge pull request #222 from Davidhua1996/dev-1.0.0
FinalTarget Mar 2, 2022
d37c81e
convert datasource title split from - to .
mingfengwang Mar 2, 2022
fcebb30
Merge pull request #81 from Kabimon/feature/ui_refactory
mingfengwang Mar 2, 2022
db04664
Resolve job info service and exchangis AppConn problem
Davidhua1996 Mar 2, 2022
bb7c2e4
Add update/delete rule in ExchangisProjectRestfulApi
Davidhua1996 Mar 2, 2022
2090119
Upgrade the properties and xml file
Davidhua1996 Mar 3, 2022
9cb8269
Merge pull request #223 from Kabimon/dev-1.0.0
FinalTarget Mar 3, 2022
488caa6
DSS restful api problem
Davidhua1996 Mar 3, 2022
62401e3
Change linkis dependence from 1.0.3 to 1.1.0.Add regex judge to datas…
FinalTarget Mar 4, 2022
e867118
Merge pull request #224 from FinalTarget/dev-1.0.0
Davidhua1996 Mar 4, 2022
614e8c6
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Mar 4, 2022
c1b4e07
Modify ddl、dml and config file.Change linkis version from 1.0.3 to 1.…
FinalTarget Mar 4, 2022
3ca143d
change for appconn
mingfengwang Mar 7, 2022
d0eecb2
Merge pull request #82 from Kabimon/feature/ui_refactory
mingfengwang Mar 7, 2022
235c6d9
get request add labels=dev
mingfengwang Mar 7, 2022
3a2ca26
Merge pull request #83 from Kabimon/feature/ui_refactory
mingfengwang Mar 7, 2022
e0ae0ae
Merge pull request #226 from Kabimon/dev-1.0.0
FinalTarget Mar 7, 2022
0b00d6f
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
FinalTarget Mar 7, 2022
6b1f58c
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
Davidhua1996 Mar 8, 2022
1b8f612
Merge pull request #227 from Davidhua1996/dev-1.0.0
FinalTarget Mar 8, 2022
1a09018
save commit
one-beauty Mar 9, 2022
5a54aea
Add Exchangis Appconn import and export operation, modify queryOperat…
FinalTarget Mar 9, 2022
32b1517
Delete exchangis-server.properties
FinalTarget Mar 10, 2022
91712b6
Repare confict.
FinalTarget Mar 10, 2022
cdc54dc
list 144 145
mingfengwang Mar 10, 2022
c1f8cb5
Merge pull request #84 from Kabimon/feature/ui_refactory
mingfengwang Mar 10, 2022
eea616b
Delete exchangis-server.properties
FinalTarget Mar 10, 2022
8aebd4f
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
FinalTarget Mar 10, 2022
86c5774
Merge pull request #228 from Kabimon/dev-1.0.0
FinalTarget Mar 11, 2022
7ede5f0
save commit
one-beauty Mar 11, 2022
9259122
Add exchangis-server.properties file
FinalTarget Mar 11, 2022
133af0f
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
one-beauty Mar 11, 2022
ef7041c
Modify exchangis-server.properties
FinalTarget Mar 11, 2022
fd29ed2
Merge pull request #229 from FinalTarget/dev-1.0.0
Davidhua1996 Mar 12, 2022
23bb868
datax引擎
Mar 13, 2022
91d1aba
linkis version
Mar 13, 2022
f0ad9a3
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
one-beauty Mar 14, 2022
37eb5ce
Merge pull request #230 from Kabimon/dev-1.0.0
Davidhua1996 Mar 16, 2022
e2a6e16
Add Exchangis Appconn import and exportOperation
FinalTarget Mar 16, 2022
3dd2faf
Merge branch 'WeBankFinTech:dev-1.0.0' into dev-1.0.0
one-beauty Mar 16, 2022
c788982
change url (add /dss pre),add two interface(1,subJobList,2 getJobList)
Mar 16, 2022
de2f13c
Merge pull request #232 from one-beauty/dev-1.0.0
Davidhua1996 Mar 17, 2022
06ffb8c
Merge branch 'dev-1.0.0' into dev-1.0.0
FinalTarget Mar 18, 2022
6a4eff0
Merge pull request #2 from WeBankFinTech/dev-1.0.0
FinalTarget Mar 18, 2022
f2b5193
update
mingfengwang Mar 23, 2022
8a8803c
Merge pull request #85 from Kabimon/feature/ui_refactory
mingfengwang Mar 23, 2022
51f380f
update
mingfengwang Mar 23, 2022
714fd81
Merge pull request #86 from Kabimon/feature/ui_refactory
mingfengwang Mar 23, 2022
fe4cf91
Modify Appconn delete, export and import operation.
FinalTarget Mar 25, 2022
c99f685
修改相对路径接口前缀
mingfengwang Mar 26, 2022
1d41f4e
Merge pull request #87 from Kabimon/feature/ui_refactory
mingfengwang Mar 26, 2022
09e51e0
Merge pull request #263 from Kabimon/dev-1.0.0
FinalTarget Mar 26, 2022
90a9f3f
Modify duplicate project name and job name method.
FinalTarget Mar 28, 2022
48777cb
update
mingfengwang Mar 28, 2022
df696d1
Merge pull request #88 from Kabimon/feature/ui_refactory
mingfengwang Mar 28, 2022
a60f6a1
Merge pull request #265 from Kabimon/dev-1.0.0
FinalTarget Mar 28, 2022
d97c336
Merge pull request #264 from FinalTarget/dev-1.0.0
Davidhua1996 Mar 28, 2022
4d327ce
增加url前缀(/main)
Mar 28, 2022
4f49fb5
修改路径前缀
Mar 29, 2022
3e16ecb
Merge pull request #266 from one-beauty/dev-1.0.0
FinalTarget Mar 30, 2022
ea7760f
Modify publish operation and restful.
FinalTarget Apr 7, 2022
43338b7
Merge pull request #269 from FinalTarget/dev-1.0.0
Davidhua1996 Apr 8, 2022
37b4ab1
fix bug
mingfengwang Apr 8, 2022
5e54336
Merge pull request #89 from Kabimon/feature/ui_refactory
mingfengwang Apr 8, 2022
2fcdaa7
Merge pull request #270 from Kabimon/dev-1.0.0
FinalTarget Apr 8, 2022
36f06cc
submit dss appconns del project and update project
Apr 9, 2022
5d4fa61
Merge pull request #271 from one-beauty/dev-1.0.0
FinalTarget Apr 11, 2022
8e0c254
add getEnvironment
mingfengwang Apr 11, 2022
8d8b0f3
Merge pull request #90 from Kabimon/feature/ui_refactory
mingfengwang Apr 11, 2022
494888b
Merge branch 'dev-1.0.0' into dev-1.0.0
mingfengwang Apr 12, 2022
8ff6c3e
Merge pull request #274 from Kabimon/dev-1.0.0
FinalTarget Apr 12, 2022
5c58882
Modify execution operation
FinalTarget Apr 13, 2022
22702a1
Modify run_date parameter don`t identify problem.
FinalTarget Apr 21, 2022
0fba8a0
Modify time placeholder operation.
FinalTarget Apr 22, 2022
1411715
Update ExchangisJobDssAppConnRestfulApi.java
FinalTarget Apr 24, 2022
40ba30d
Update DefaultJobInfoService.java
FinalTarget Apr 24, 2022
6a7d173
Merge pull request #275 from FinalTarget/dev-1.0.0
Davidhua1996 Apr 24, 2022
bb3ecbd
fix bug
Apr 24, 2022
e61f7c1
Merge pull request #279 from one-beauty/dev-1.0.0
FinalTarget Apr 24, 2022
a9a6c0e
job execute submit
Apr 25, 2022
a970e4f
Merge pull request #280 from one-beauty/dev-1.0.0
FinalTarget Apr 26, 2022
44c043f
dev-1.0.0-rc version.
FinalTarget May 5, 2022
3a813bb
Repair ssoRequestOperation is null bug
FinalTarget May 6, 2022
ee2f0a8
Modify exchangisRefExecutionOperation with LongTermRefExecutionOperat…
FinalTarget May 7, 2022
e42ed1c
Modify projectUpdate operation
FinalTarget May 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ target

### IntelliJ IDEA ###
.idea
*.log
*.iws
*.iml
*.ipr
Expand All @@ -26,3 +27,12 @@ target
.mvn/wrapper/maven-wrapper.jar
.mvn/wrapper/maven-wrapper.properties
/packages/
exchangis-server/exchangis-extds
/logs/
/web/package-lock.json
package-lock.json
.DS_Store

web/dist

workspace/
9 changes: 9 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM harbor.local.hching.com/library/jdk:8u301

ADD assembly-package/target/wedatasphere-exchangis-1.0.0-RC1.tar.gz /opt/wedatasphere-exchangis.tar.gz

RUN cd /opt/wedatasphere-exchangis.tar.gz/packages/ && tar -zxf exchangis-server_1.0.0-RC1.tar.gz && cd /opt/wedatasphere-exchangis.tar.gz/sbin

WORKDIR /opt/wedatasphere-exchangis.tar.gz/sbin

ENTRYPOINT ["/bin/bash start.sh"]
Empty file.
20 changes: 20 additions & 0 deletions assembly-package/config/application-exchangis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
server:
port: 9500
spring:
application:
name: exchangis-server
eureka:
client:
serviceUrl:
defaultZone: http://127.0.0.1:20503/eureka/
instance:
metadata-map:
test: wedatasphere

management:
endpoints:
web:
exposure:
include: refresh,info
logging:
config: classpath:log4j2.xml
52 changes: 52 additions & 0 deletions assembly-package/config/exchangis-server.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#
# Copyright 2019 WeBank
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#

wds.linkis.server.mybatis.datasource.url=jdbc:mysql://localhost:3306/database?useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true

wds.linkis.server.mybatis.datasource.username=username

wds.linkis.server.mybatis.datasource.password=password

wds.linkis.log.clear=true

wds.linkis.server.version=v1

# datasource client
wds.exchangis.datasource.client.serverurl=
wds.exchangis.datasource.client.authtoken.key=DATASOURCE-AUTH
wds.exchangis.datasource.client.authtoken.value=DATASOURCE-AUTH
wds.exchangis.datasource.client.dws.version=v1

# launcher client
wds.exchangis.client.linkis.server-url=
wds.exchangis.client.linkis.token.value=DATASOURCE-AUTH
wds.exchangis.datasource.extension.dir=exchangis-extds

##restful
wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.exchangis.datasource.server.restful.api,\
com.webank.wedatasphere.exchangis.project.server.restful,\
com.webank.wedatasphere.exchangis.job.server.restful
wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/exchangis/job/server/mapper/impl/*.xml:\
,classpath*:com/webank/wedatasphere/exchangis/project/server/mapper/impl/*.xml

wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.exchangis.dao,\
com.webank.wedatasphere.exchangis.project.server.mapper,\
com.webank.wedatasphere.exchangis.job.server.mapper




Empty file.
44 changes: 44 additions & 0 deletions assembly-package/config/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019 WeBank
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->

<configuration status="error" monitorInterval="30">
<appenders>
<RpcLog name="RpcLog" >
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level - %msg%xEx%n"/>
</RpcLog>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
</Console>
<RollingFile name="RollingFile" fileName="${sys:log.path}/${sys:serviceName}.log"
filePattern="${sys:log.path}/$${date:yyyy-MM}/${sys:serviceName}/exchangis-log-%d{yyyy-MM-dd}-%i.log">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
<SizeBasedTriggeringPolicy size="100MB"/>
<DefaultRolloverStrategy max="20"/>
</RollingFile>
</appenders>
<loggers>
<root level="INFO" additivity="false">
<appender-ref ref="RollingFile"/>
<appender-ref ref="Console"/>
</root>
<logger name="com.webank.wedatasphere.exchangis.job.server.log.DefaultRpcJobLogger$" level="INFO" additivity="true">
<appender-ref ref="RpcLog"/>
</logger>
</loggers>
</configuration>
75 changes: 75 additions & 0 deletions assembly-package/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019 WeBank
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>exchangis</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>assembly-package</artifactId>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>dist</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<skipAssembly>false</skipAssembly>
<finalName>wedatasphere-exchangis-${exchangis.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
19 changes: 19 additions & 0 deletions assembly-package/sbin/common.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
#
# Copyright 2020 WeBank
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

declare -A MODULE_MAIN_CLASS
MODULE_MAIN_CLASS["exchangis-server"]="com.webank.wedatasphere.exchangis.server.boot.ExchangisServerApplication"
25 changes: 25 additions & 0 deletions assembly-package/sbin/configure.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
#
# Copyright 2020 WeBank
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# configure modules

configure_main(){

}

configure_server(){

}
68 changes: 68 additions & 0 deletions assembly-package/sbin/daemon.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#!/bin/bash
#
# Copyright 2020 WeBank
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

if [[ "x"${EXCHANGIS_HOME} != "x" ]]; then
source ${EXCHANGIS_HOME}/sbin/launcher.sh
source ${EXCHANGIS_HOME}/sbin/common.sh
else
source ./launcher.sh
source ./common.sh
fi

MODULE_NAME=""
usage(){
echo "Usage is [start|stop|restart {service}]"
}

start(){
# call launcher
launcher_start $1 $2
}

stop(){
# call launcher
launcher_stop $1 $2
}

restart(){
launcher_stop $1 $2
if [[ $? -eq 0 ]]; then
sleep 2
launcher_start $1 $2
fi
}

COMMAND=$1
case $COMMAND in
start|stop|restart)
if [[ ! -z $2 ]]; then
MAIN_CLASS=${MODULE_MAIN_CLASS[${MODULE_DEFAULT_PREFIX}$2]}
if [[ "x"${MAIN_CLASS} != "x" ]]; then
$COMMAND ${MODULE_DEFAULT_PREFIX}$2 ${MAIN_CLASS}
else
LOG ERROR "Cannot find the main class for [ ${MODULE_DEFAULT_PREFIX}$2 ]"
fi
else
usage
exit 1
fi
;;
*)
usage
exit 1
;;
esac
Empty file.
Loading