Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8801 commits
Select commit Hold shift + click to select a range
ac8ba15
fix props is null
Nov 5, 2024
9d5aa7b
fix: updateWorkspace restful
SunPengWan Nov 12, 2024
887b79d
fix: 发布diff过滤资源文件
qweqnotallow Nov 12, 2024
ab6ef59
Merge remote-tracking branch 'origin/dev-1.9.0' into dev-1.9.0
qweqnotallow Nov 12, 2024
55052d3
fix: 发布diff过滤资源文件
qweqnotallow Nov 12, 2024
70afb55
fix: 发布diff过滤资源文件
qweqnotallow Nov 13, 2024
0ec2d9e
fix: 修改工作空间,cookie与页面不一致
qweqnotallow Nov 14, 2024
718b3ae
fix: 添加工作流提交BML 再提交至git日志,监测提交时间
qweqnotallow Nov 14, 2024
e0eed26
工作流发布日志跟踪
Nov 14, 2024
e29a7f0
feat: 1.9.0 changes
demonray Nov 19, 2024
8157a91
fix sensitive info
Nov 27, 2024
de0e193
update maven version
SunPengWan Dec 3, 2024
af93b0e
优化submitFlow接口
SunPengWan Dec 3, 2024
f71912d
dss-server:add username into cookie
xuanzhou11 Dec 9, 2024
13c0ae3
dss-server:setup default workspace
xuanzhou11 Dec 9, 2024
9d1324a
dss-server:add getAllUsername method
xuanzhou11 Dec 9, 2024
7cdfc34
dss-server:add getAllUsername method
xuanzhou11 Dec 9, 2024
6e67ec8
fix git conf
xuanzhou11 Dec 9, 2024
d6cf261
fix code
xuanzhou11 Dec 9, 2024
07750de
dss-server:delete orchestrator prod with dev
xuanzhou11 Dec 10, 2024
34855db
dss-server:fix code
xuanzhou11 Dec 10, 2024
ca70583
dss-server:rollback code
xuanzhou11 Dec 10, 2024
cf7c4ce
Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.10.0
xuanzhou11 Dec 10, 2024
4f03e95
dss-server:rollback code
xuanzhou11 Dec 10, 2024
e64c315
dss-server:fix git conf
xuanzhou11 Dec 10, 2024
2d5b4a8
getWorkspaceStr
Dec 10, 2024
41f4e58
add method deleteOrchestratorByLabel
xuanzhou11 Dec 11, 2024
0c00afd
add rpc receiver
xuanzhou11 Dec 11, 2024
2116aee
add rpc receiver
xuanzhou11 Dec 11, 2024
750eeb0
fix code
xuanzhou11 Dec 11, 2024
13d79a0
1、dssWorkspace_添加enabledFlowKeywordsCheck字段_2、更改发布到wtss工作流长度_3、取消线程等待时间
SunPengWan Dec 11, 2024
9cce787
1、dssWorkspace_添加enabledFlowKeywordsCheck字段_2、更改发布到wtss工作流长度_3、取消线程等待时间
SunPengWan Dec 11, 2024
ee23a94
DSSWorkspace添加isDefaultReference字段
SunPengWan Dec 12, 2024
b1379be
rollback code
xuanzhou11 Dec 12, 2024
27f51b7
Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.10.0
xuanzhou11 Dec 12, 2024
20f0601
dss-server:delete orchestrator prod with dev
xuanzhou11 Dec 10, 2024
8966b20
工作流节点并发导入
Dec 12, 2024
7bc4793
添加 updateWorkspaceInfo restful
SunPengWan Dec 13, 2024
16e2b09
fix code
xuanzhou11 Dec 16, 2024
df1ce45
更新发布工作流时节点内容添加关键字检查
SunPengWan Dec 16, 2024
d5e0313
发布工作流时节点内容添加关键字检查bug
SunPengWan Dec 17, 2024
57f9619
query node info of flow by git path
Dec 17, 2024
c963938
add username to cookie filter non real name user
xuanzhou11 Dec 17, 2024
6be4f7a
更改OrchestratorDiffNodeVo实体字段信息
SunPengWan Dec 17, 2024
4ebd5f7
add delete cookie method
xuanzhou11 Dec 18, 2024
b395ec6
Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.10.0
xuanzhou11 Dec 18, 2024
ffdb9c1
add delete cookie method
xuanzhou11 Dec 18, 2024
951ce4d
1、添加updateWorkFlowNodeJsonForMultiThread函数 2、_updateOrchestratorNotCo…
SunPengWan Dec 18, 2024
708d95a
fix:空工作流提交_bug
SunPengWan Dec 18, 2024
6c995e1
添加batchPublishFlowCheck restful,工作流台账批量发布关键字校验接口
SunPengWan Dec 19, 2024
808d1da
fix: batchPublishFlo bug1
SunPengWan Dec 19, 2024
95a8bb7
fix: batchPublishFlo bug2
SunPengWan Dec 19, 2024
3780fb9
fix: update transferWorkspace bug
SunPengWan Dec 19, 2024
d2d1d62
优化关键字校验code
SunPengWan Dec 19, 2024
c6c0a3f
sort workspace index
xuanzhou11 Dec 20, 2024
f4daa64
fix: 包含关键字正则修改
SunPengWan Dec 20, 2024
9f0c342
sort workspace index
xuanzhou11 Dec 20, 2024
494abb5
fix: getNotContainsKeywordsNode_未接入git和未开启校验,返回空数据
SunPengWan Dec 20, 2024
b51e095
Merge branch 'dev-1.10.0' of https://github.com/WeDataSphere/DataSphe…
SunPengWan Dec 20, 2024
8098aa6
fix bug
xuanzhou11 Dec 23, 2024
a7574ea
Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.10.0
xuanzhou11 Dec 23, 2024
0e83563
fix: updateWorkspaceInfo restful管理员权限校验
SunPengWan Dec 25, 2024
dfe8f94
update communication.jpg
zqburde Jan 3, 2025
7772907
Merge branch 'main'
zqburde Jan 3, 2025
9db589c
fix common_gson JsonDeserializer int error
Jan 8, 2025
18b94c4
Revert "fix common_gson JsonDeserializer int error"
Jan 8, 2025
08833b6
fix int of params
Jan 9, 2025
80db560
fix subflow name length
Jan 13, 2025
d57709f
fix subflow name length
Jan 13, 2025
0a7ea9d
upgrade linkis version to 1.9.0-wds
Jan 21, 2025
0147cfa
支持登录用户设置默认工作空间
SunPengWan Jan 26, 2025
1faaba6
exclusion linkis-mybatis
SunPengWan Jan 26, 2025
6ed51e0
back pom.xml
SunPengWan Jan 26, 2025
43fc653
add UpdateUserDefaultWorkspaceRequest_toString() func
SunPengWan Jan 27, 2025
1eb6197
调整获取isDefaultWorkspace代码
SunPengWan Jan 27, 2025
ee39e09
更改isDefaultWorkspace数据类型
SunPengWan Feb 5, 2025
d81e17a
更改isDefaultWorkspace数据类型
SunPengWan Feb 5, 2025
0233d27
更新updateUserDefaultWorkspace 抛错信息
SunPengWan Feb 5, 2025
00a2c1c
更新updateUserDefaultWorkspace 抛错信息
SunPengWan Feb 5, 2025
c116fd2
datachecker 运行时禁用视图,如遇视图抛错
Feb 5, 2025
f7eb314
去除publicservice依赖
Feb 6, 2025
28d6094
支持工作流选择Spark引擎版本
SunPengWan Feb 7, 2025
c9e3e79
输入代理用户校验是否离职用户或者不存在用户
SunPengWan Feb 7, 2025
384681d
使用spark_3引擎需添加 linkis_spark3_engine_version 参数
SunPengWan Feb 10, 2025
43e2d4c
saveFlow_接口添加代理用户验证
SunPengWan Feb 10, 2025
6555161
取消工作流选择spark引擎版本
SunPengWan Feb 10, 2025
2fc20f1
更新_工作流代理用户校验
SunPengWan Feb 11, 2025
f0e3215
setproxyUser的username从cookie中获取而非接口入参
Feb 12, 2025
a25dd4d
Merge branch 'dev-1.10.0'
SunPengWan Feb 12, 2025
44955b9
setproxyUser的username从cookie中获取而非接口入参
Feb 12, 2025
5e46ae0
master update to 1.10.0 version
SunPengWan Feb 12, 2025
4a0dd19
add proxy super
Feb 12, 2025
2c8e208
add proxy super
Feb 12, 2025
3d8ee02
Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.11.0
Feb 12, 2025
1b95cd9
离职用户判断跳过hadoop
Feb 13, 2025
5f88f9d
允许重复添加已存在的proxyuser
Feb 13, 2025
bdff9c8
更改合并后,编译错误的代码
SunPengWan Feb 13, 2025
27dab50
更改部署启动报错的代码
SunPengWan Feb 13, 2025
105396b
1、取消proxyUserIsDismissed接口相关代码
SunPengWan Feb 14, 2025
2d89c5a
isDismissed接口_校验不存在用户
SunPengWan Feb 14, 2025
1c0ff89
fix: isDismissed传入的usernames集合中的空字符串, 跳过校验
SunPengWan Feb 14, 2025
5eebd3b
update version to 1.2.2
zqburde Feb 19, 2025
7ba19a1
modify dss-git-server path
zqburde Feb 19, 2025
204b53b
job startup add ec.resource.name
SunPengWan Feb 24, 2025
f8964fd
Revert "job startup add ec.resource.name"
SunPengWan Feb 24, 2025
e6fb21e
修复往中央仓库上传包时的异常:
zqburde Feb 25, 2025
5592ff1
fix Deployment failed
SunPengWan Feb 25, 2025
1d2a179
Revert "fix Deployment failed"
SunPengWan Feb 25, 2025
9a2f6bc
fix Deployment failed 2
SunPengWan Feb 25, 2025
5711721
Revert "fix Deployment failed 2"
SunPengWan Feb 25, 2025
efae6a9
取消 dss-sparketl-appconn
SunPengWan Feb 25, 2025
ff34c05
Revert "取消 dss-sparketl-appconn"
SunPengWan Feb 25, 2025
09e8b6b
add distributionManagement element
SunPengWan Feb 25, 2025
261a8e4
gitignore cursor
Feb 25, 2025
7adde4d
Revert "add distributionManagement element"
SunPengWan Feb 25, 2025
91f0720
允许重复添加已存在的proxyuser
Feb 13, 2025
3679d9b
gitignore cursor
Feb 25, 2025
7611b5f
Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.11.0
Feb 25, 2025
6e8084c
update conf and db dir
SunPengWan Feb 26, 2025
5639ed2
删除多余的启动脚本
SunPengWan Feb 26, 2025
53bb57e
fix fold error
Feb 28, 2025
3e8da9b
feat: 1.11.0 web
demonray Mar 3, 2025
eac36e9
application-dss.yml添加配置允许循环引用
SunPengWan Mar 5, 2025
8caccee
处理未扫描到的mybatis包
SunPengWan Mar 5, 2025
0149ba7
1、排除 servlet-api.2.5 jar 2、 dss-server 添加dss-scritis-server包的引用
SunPengWan Mar 5, 2025
e685155
Spring升级后新增配置
zqburde Mar 6, 2025
c122544
update from_v112_to_122.sql
SunPengWan Mar 6, 2025
a6b93d6
update from_v112_to_122.sql
SunPengWan Mar 6, 2025
debbfe3
Merge branch 'master' of https://github.com/WeDataSphere/DataSphereSt…
SunPengWan Mar 6, 2025
eb6a0cb
update from_v112_to_122.sql,fix: Subquery returns more than 1 row
SunPengWan Mar 6, 2025
08f5073
删除无用前端代码
zqburde Mar 6, 2025
29366ff
bug fix
zqburde Mar 7, 2025
c1b5ec5
1、添加git的 dao和xml配置
SunPengWan Mar 7, 2025
1a1b229
添加 wds.dss.appconn.client.user.token 配置
SunPengWan Mar 7, 2025
90c7d3b
升级 web monaco-editor相关包
SunPengWan Mar 7, 2025
ab15083
更改 web 版本为 1.2.2
SunPengWan Mar 7, 2025
8a7d7ff
1、取消行内的接口 2、更改 devProcessPermission 为 devProcessList字段
SunPengWan Mar 7, 2025
5749cde
1、处理 api 访问抛出的错误 2、 取消 listEngineConnInstances、getEcReleaseStrategyL…
SunPengWan Mar 7, 2025
7f92cf9
更新wds.dss.trust.token 为空
SunPengWan Mar 10, 2025
a2d6601
upgrade mvn version
Mar 10, 2025
d65eab8
取消 getProjectTemplates 接口请求
SunPengWan Mar 10, 2025
abb685f
restore project
Mar 10, 2025
2ae8662
remove archive remote git
Mar 10, 2025
cb018f4
fix
Mar 10, 2025
9d413ca
fix
Mar 10, 2025
9a70696
getProjectInfo接口返回新增workSpaceId字段
SunPengWan Mar 11, 2025
c20c7fa
Merge branch 'dev-1.12.0' of https://github.com/WeDataSphere/DataSphe…
SunPengWan Mar 11, 2025
26307d4
fix
Mar 11, 2025
b9f1448
update axios version
zqburde Mar 11, 2025
9217ed5
fix message
Mar 13, 2025
4b42a88
fix datachecker parse float wait time error
Mar 13, 2025
4cd7cb6
fix datachecker parse float wait time error
Mar 13, 2025
ad45134
eventchecker支持多种http信号
Mar 13, 2025
75538a9
eventchecker支持多种http信号
Mar 19, 2025
69c0d61
保存工作流失败加上log
Mar 19, 2025
40eca48
update version
SunPengWan Apr 10, 2025
7d96b03
upgrade druid 2
Apr 14, 2025
1def656
工作空间StarRocks集群管理
zqburde Apr 14, 2025
96dc83e
添加编辑节点内容(editNodeContent)接口
SunPengWan Apr 14, 2025
74f9eaa
接口适配dss gateway规则
zqburde Apr 14, 2025
83837d8
Merge remote-tracking branch 'origin/dev-1.12.0' into dev-1.13.0
Apr 15, 2025
0489dc8
处理表dss_workspace_starrocks_cluster id获取问题
zqburde Apr 15, 2025
44970a4
引用linkis-storage包,保存node的metadata和content.patch
SunPengWan Apr 15, 2025
8716486
dss_proxy_user_添加expireTime
SunPengWan Apr 15, 2025
e45e36a
fix: selectProxyUserList 未添加param
SunPengWan Apr 15, 2025
1f4cfd7
fix: editNodeContent bug
SunPengWan Apr 16, 2025
0b18f22
保存工作流时,校验代码版本是否被回退
Apr 16, 2025
ddb1983
保存工作流时,校验代码版本是否被回退
Apr 16, 2025
c14cc53
添加encryptCopyOrchestrator复制工作流接口
SunPengWan Apr 16, 2025
174942a
复制工作流,添加enableNodeList字段
SunPengWan Apr 17, 2025
549cef5
fix: encryptCopyOrchestrato 接口 bug
SunPengWan Apr 17, 2025
2a0aa3a
fix: encryptCopyOrchestrator 复制工作流 添加配置bug
SunPengWan Apr 18, 2025
2a09133
fix: encryptCopyOrchestrator_添加hadoop为只读权限bug
SunPengWan Apr 18, 2025
1881fe1
fix: selectProxyUserList sql bug
SunPengWan Apr 21, 2025
654fb4a
fix: isMatchDataOrSignalNode bug
SunPengWan Apr 21, 2025
202962c
fix: addUserProxy接口 添加 代理用户延期
SunPengWan Apr 21, 2025
ed23c0b
fix: editNodeContent_节点内容和配置都为空,则不更新节点
SunPengWan Apr 22, 2025
912f483
fix: insertProxyUser expireTime为空的默认时间
SunPengWan Apr 22, 2025
6615aff
工作空间新增starrocks集群添加管理员权限校验;将starrocks集群的端口修改为String格式
zqburde Apr 23, 2025
9258a64
工作空间新增starrocks集群名称重复性校验
zqburde Apr 27, 2025
3fed9d5
工作空间删除starrocks集群时判断是否有被工作流节点引用
zqburde Apr 27, 2025
8748a5d
工作流元数据 添加 校验节点是否可进行编辑
SunPengWan Apr 28, 2025
2984cd6
encryptOrchestratorCopyInfo接口新增返回targetOrchestratorVersionId字段
SunPengWan Apr 28, 2025
59ee961
工作空间清空starrocks集群bug修复
zqburde Apr 28, 2025
1403906
editNodeContent 接口取消节点类型限制
SunPengWan Apr 28, 2025
e0f907d
Merge branch 'dev-1.13.0' of https://github.com/WeDataSphere/DataSphe…
SunPengWan Apr 28, 2025
d564048
修复starrocks节点存在的bug
zqburde Apr 28, 2025
b706078
fix: 修改dss_proxy_user_更新时间
SunPengWan Apr 29, 2025
d5326ad
修复starrocks节点存在的bug
zqburde Apr 29, 2025
823c7c5
修复starrocks节点存在的bug
zqburde Apr 29, 2025
01db083
修复starrocks节点存在的bug
zqburde Apr 29, 2025
e5aadd4
starrocks集群信息更新异常修改
zqburde Apr 29, 2025
e17494a
bug fix
zqburde Apr 29, 2025
a633d23
fix: 修改dss_proxy_user_更新时间
SunPengWan Apr 29, 2025
e53d736
fix: updateNodeMetadata 添加null判断
SunPengWan Apr 29, 2025
a4969d1
bug fix
zqburde Apr 29, 2025
1ac26c4
修改starrocks节点信息异常修复
zqburde Apr 29, 2025
e62fb28
globalLimits接口判断用户后缀
SunPengWan Apr 30, 2025
0f7c13a
Merge branch 'dev-1.13.0' of https://github.com/WeDataSphere/DataSphe…
SunPengWan Apr 30, 2025
7c202d2
fix: globalLimits bug
SunPengWan Apr 30, 2025
d244554
revert globalLimits 判断用户后缀
SunPengWan Apr 30, 2025
cf60524
add globalLimits 判断用户后缀
SunPengWan May 6, 2025
8204d49
fix: globalLimits 判断用户后缀bug
SunPengWan May 6, 2025
a0965da
fix: editNodeContent 工作流递归bug
SunPengWan May 6, 2025
8d69344
globalLimits 接口用户后缀处理
SunPengWan May 7, 2025
42011f9
添加企业明文deleteEncryptOrchestrator删除编排接口
SunPengWan May 8, 2025
fff3dcb
mask接口失败后,打印堆栈
May 8, 2025
ef70a07
保存ContextId失败打印flowID
May 16, 2025
9360fb0
upgrade mvn version
SunPengWan May 27, 2025
f23b385
queryDataDevelopNode 接口新增返回字段和查询字段
SunPengWan May 28, 2025
87ab8ac
createOrchestrator,工作流入库前判重
SunPengWan May 29, 2025
a626d04
更改batchEditFlow,添加starRocks节点处理
SunPengWan May 29, 2025
31d9469
support sendemail about md file.
zqburde Jun 4, 2025
37c45a6
fix: versionById check null
SunPengWan Jun 6, 2025
812506c
Merge branch 'dev-1.14.0' of https://github.com/WeDataSphere/DataSphe…
SunPengWan Jun 6, 2025
7bb88b6
添加getNodeInfoByName,获取节点信息接口
SunPengWan Jun 9, 2025
21b3b50
新增批量更新节点信息接口
SunPengWan Jun 11, 2025
8d81a3f
添加 batchEditNodeContent和getNodeInfoByName 日志信息
SunPengWan Jun 11, 2025
85d3b87
优化batchEditNodeContent代码
SunPengWan Jun 11, 2025
14b7e2f
更改 batchEditNodeContent 返回格式
SunPengWan Jun 11, 2025
8081da9
fix: batchEditNodeContent bug
SunPengWan Jun 11, 2025
b529570
fix: batchEditNodeContent bug
SunPengWan Jun 11, 2025
21aecab
fix: batchEditNodeContent bug 2
SunPengWan Jun 12, 2025
a5607fd
queryDataDevelopNodeList 更改 spark参数,精准匹配改为 模糊匹配
SunPengWan Jun 12, 2025
1ed2412
fix: queryDataDevelopNodeList bug 1
SunPengWan Jun 12, 2025
a1f0385
fix: queryDataDevelopNodeList,spark查询参数去除左右空格
SunPengWan Jun 12, 2025
a957654
StarRocksCluster不允许修改ip和端口
SunPengWan Jun 19, 2025
a317c0e
Revert "support sendemail about md file."
zqburde Jun 23, 2025
00fd0a9
Revert "Revert "support sendemail about md file.""
zqburde Jun 25, 2025
c214fb1
copy工作流更新_flowProxyUser信息
SunPengWan Jun 25, 2025
709ab29
更改_查看用户参数为空,则默认hadoop用户
SunPengWan Jun 25, 2025
74b8535
Merge remote-tracking branch 'origin/dev-1.14.0' into dev-1.15.0
SunPengWan Jun 26, 2025
1b04afb
upgrade mvn version
SunPengWan Jun 26, 2025
93ec6ab
fix: 拷贝工作流,修改代理用户bug
SunPengWan Jul 1, 2025
99c5e1f
工作流节点支持Spark3
SunPengWan Jul 8, 2025
f3b25c2
工作流节点支持Spark3
SunPengWan Jul 9, 2025
73a6118
变更sparkVersion参数从节点runtime中获取
SunPengWan Jul 10, 2025
d4a9c19
优化getSparkVersion代码
SunPengWan Jul 10, 2025
f6ff22f
add user hadoop to cookie
zqburde Jul 11, 2025
564e81e
upgrade linkis to 1.14.0-wds
Jul 14, 2025
7c79a4f
BMLService加上日志
Jul 17, 2025
6b0226d
权限被清理的项目,也能被拉出来,不要报错
Jul 22, 2025
5e76fcd
upgrade linkis version
Jul 23, 2025
1a4d883
upgrade linkis version
Jul 23, 2025
defc94b
send to report agent
Aug 4, 2025
fa966a5
git ignore add .bloop .metals .vscode
Aug 4, 2025
c856085
企业明文复制接口跳过第三方节点复制
Aug 21, 2025
ee99da3
merge 1.15.0 branch to master
SunPengWan Sep 1, 2025
2452d61
bug fix
SunPengWan Sep 1, 2025
9d942ed
Merge remote-tracking branch 'upstream/master'
zqburde Oct 14, 2025
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
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.js linguist-language=java
*.css linguist-language=java
*.html linguist-language=java
*.vue linguist-language=java
*.zip filter=lfs diff=lfs merge=lfs -text
*.vue linguist-language=java
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
.idea
.idea/*
.metals
.vscode
.scalafmt.conf
.bloop

.DS_Store

Expand Down Expand Up @@ -101,6 +105,9 @@ dss-apps/dss-data-governance/dss-data-warehouse-dao/target
dss-apps/dss-data-governance/dss-data-warehouse-service/target
dss-apps/dss-data-governance/dss-data-warehouse-server/target

#dss-git
dss-git/dss-git-common/target
dss-git/dss-git-server/target

# plugins
plugins/azkaban/linkis-jobtype/target
Expand Down
2 changes: 1 addition & 1 deletion README-ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@

       您也可以扫描下面的二维码,加入我们的 微信群,以获得更快速的响应。

![交流](images/zh_CN/readme/communication.png)
![交流](images/zh_CN/readme/communication.jpg)

## 谁在使用 DSS

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ English | [中文](README-ZH.md)

       You can scan the QR code below to join our WeChat to get more immediate response.

![communication](images/en_US/readme/communication.png)
![communication](images/en_US/readme/communication.jpg)

## Who is using DSS

Expand Down
3 changes: 2 additions & 1 deletion assembly/bin/appconn-refresh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ function isSuccess(){

function refresh() {
while true; do
response=$(curl -H "Token-Code:" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
response=$(curl -H "Token-Code:xxx" -H "Token-User:hadoop" -X GET
http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
if [[ $response == *"not appconn manager node"* ]]; then
echo 'not appconn manager node, we will try again 5 seconds later'
sleep 5
Expand Down
2 changes: 1 addition & 1 deletion assembly/bin/dssinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function changeCommonConf(){
sed -i "s#hostname:.*#hostname: $SERVER_IP#g" $CONF_APPLICATION_YML
sed -i "s#wds.linkis.server.mybatis.datasource.url.*#wds.linkis.server.mybatis.datasource.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}?characterEncoding=UTF-8#g" $CONF_DSS_PROPERTIES
sed -i "s#wds.linkis.server.mybatis.datasource.username.*#wds.linkis.server.mybatis.datasource.username=$MYSQL_USER#g" $CONF_DSS_PROPERTIES
sed -i "s#wds.linkis.server.mybatis.datasource.password.*#***REMOVED***$MYSQL_PASSWORD#g" $CONF_DSS_PROPERTIES
sed -i "s#wds.linkis.server.mybatis.datasource.password.*#wds.linkis.server.mybatis.datasource.password=$MYSQL_PASSWORD#g" $CONF_DSS_PROPERTIES
sed -i "s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g" $CONF_DSS_PROPERTIES
sed -i "s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g" $CONF_DSS_PROPERTIES
sed -i "s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://$GATEWAY_INSTALL_IP:$GATEWAY_PORT/#g" $CONF_DSS_PROPERTIES
Expand Down
Loading
Loading