Skip to content

Commit 1478d9e

Browse files
HmhWzHmhWz
committed
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSphereStudio into dev-1.1.4
2 parents 3bf58a3 + 9c58051 commit 1478d9e

File tree

31 files changed

+3374
-12
lines changed

31 files changed

+3374
-12
lines changed

‎dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,9 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
172172
try {
173173
if (StringUtils.isNotBlank(flowEditLock)) {
174174
DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
175-
Long flowId = Optional.ofNullable(dssFlowEditLock).map(DSSFlowEditLock::getFlowID).get();
176-
lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), flowId);
175+
if (dssFlowEditLock != null) {
176+
lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
177+
}
177178
}
178179
} catch (Exception e) {
179180
LOGGER.error("flowEditLock delete failed，flowId：{}", flowEditLock, e);

‎sbin/dss-start-all.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,25 @@ function startDssProject(){
8787
startApp
8888
sleep 15
8989

90-
echo "------------------------Start check whether the project service is registered to eureka successfully-----------------------------"
90+
echo "------------------------Start to check whether the project service is registered to eureka successfully-----------------------------"
9191
#project服务启动并注册到eureka后再启动其他服务
92-
while [[ -z $result ]]
92+
i=1
93+
while [[ -z $result ]] && [[ $i -le 24 ]]
9394
do
9495
sleep 5
95-
if [ -z $EUREKA_USERNAME ] || [ -z $EUREKA_PASSWORD ];
96-
then
96+
if [ -z $EUREKA_USERNAME ] || [ -z $EUREKA_PASSWORD ];then
9797
response=`curl http://${EUREKA_INSTALL_IP}:${EUREKA_PORT}/eureka/apps/DSS-FRAMEWORK-PROJECT-SERVER`
98-
else
98+
else
9999
response=`curl http://${EUREKA_USENAME}:${EUREKA_PASSWORD}@${EUREKA_INSTALL_IP}:${EUREKA_PORT}/eureka/apps/DSS-FRAMEWORK-PROJECT-SERVER`
100100
fi
101+
let i++
101102
result=$(echo $response |grep 'DSS-FRAMEWORK-PROJECT-SERVER')
102103
done
103-
echo "------------------------the project service is registered to eureka successfully------------------------------------------------"
104+
if [[ $i -eq 25 ]]; then
105+
echo "the project server start failed in two minutes,please check the log to find more error details."
106+
exit
107+
fi
108+
echo "------------------------the project service is registered to eureka successfully------------------------------------------------"
104109

105110
SERVER_NAME=dss-framework-orchestrator-server
106111
SERVER_IP=$DSS_FRAMEWORK_ORCHESTRATOR_SERVER_INSTALL_IP

‎web/config.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@
3232
"zh-CN": "dataService/i18n/zh.json"
3333
}
3434
},
35+
"apiServices": {
36+
"routes": "apiServices/router",
37+
"module": "apiServices/module",
38+
"i18n": {
39+
"en": "apiServices/i18n/en.json",
40+
"zh-CN": "apiServices/i18n/zh.json"
41+
}
42+
},
3543
"dataGovernance": {
3644
"routes": "dataGovernance/router",
3745
"module": "dataGovernance/module",
@@ -55,6 +63,8 @@
5563
"app_name": "DataSphere Studio",
5664
"app_logo": "dss/assets/images/dssLogo.png",
5765
"user_guide": "",
66+
"hide_view_tb_detail": true,
67+
"hide_view_db_detail": true,
5868
"watermark": {
5969
"show": false,
6070
"template": "${username} ${time}",

‎web/packages/apiServices/assets/images/dssLogo.png

5.37 KB
Loading

‎web/packages/apiServices/i18n/en.json

Lines changed: 262 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,262 @@
1+
{
2+
"message": {
3+
"apiServices": {
4+
"viewAll": "View All",
5+
"viewValid": "View Valid",
6+
"deleted": "Deleted",
7+
"delete": "Delete",
8+
"enterDetele": "confirm Detele",
9+
"enterDeteleName": "Are you sure to delete {name}?",
10+
"publishing": "Publishing",
11+
"confirm": "Confirm",
12+
"modifyRemarks": "Modify Remarks",
13+
"save": "Save",
14+
"open": "Open",
15+
"title": "Data Service",
16+
"back": "Back",
17+
"tableDisplay": "Table",
18+
"cardDisplay": "Card",
19+
"display": "Display",
20+
"action": "Aciton",
21+
"kill": {
22+
"title": "Execution Notice",
23+
"desc": "Stopped executing this script"
24+
},
25+
"date": {
26+
"label": " Start Date",
27+
"placeholder": "Please choose the start date"
28+
},
29+
"query": {
30+
"apiName": "Data Service Title",
31+
"tag": "Tag",
32+
"status": "Service Status",
33+
"commiter": "Commiter",
34+
"buttonText": "Query",
35+
"clearButtonText": "Clear",
36+
"stop": "Stop",
37+
"comment": "Comment",
38+
"more": "More"
39+
},
40+
"formTitle": {
41+
"dataApiManage": "Data API Manage"
42+
},
43+
"shortcuts": {
44+
"week": "Recent Week",
45+
"month": "Recent Month",
46+
"threeMonths": "Recent Three Months"
47+
},
48+
"placeholder": {
49+
"enterName": "Please enter the name",
50+
"apiName": "Enter API Name",
51+
"tag": "Select Tag",
52+
"scope": "Select Scope",
53+
"description": "Enter Description",
54+
"visibleRole": "Select Visible Role",
55+
"emter": "Enter",
56+
"startDate": "Please choose the start date",
57+
"dateAndTime": "Select Date And Time",
58+
"inputSubmitter": "Input Submitter"
59+
},
60+
"label": {
61+
"apiName": "API Name：",
62+
"tag": "Tag：",
63+
"name": "Name",
64+
"parameter": "Parameter Info：",
65+
"scope": "Scope：",
66+
"description": "Description：",
67+
"visibleRole": "Visible Role：",
68+
"test": "Test：",
69+
"applicant": "Applicant：",
70+
"status": "Status：",
71+
"find": "Find",
72+
"path": "API Path：",
73+
"submitter": "Submitter",
74+
"scriptsPath": "Scripts Path："
75+
},
76+
"buttonText": {
77+
"enter": "Enter",
78+
"maintained": "Being maintained",
79+
"refresh": "Refresh Status"
80+
},
81+
"tip": {
82+
"success": "Success",
83+
"cannotBeEmpty": "Cannot Be Empty",
84+
"failed": "Failed",
85+
"disableConfirmTitle": "Disable Confirm",
86+
"disableConfirm": "Are you sure you want to disable the {name} API ?",
87+
"enableConfirmTitle": "Enable Confirm",
88+
"enableConfirm": "Are you sure you want to enable the {name} API ?"
89+
},
90+
"apiTable": {
91+
"user": "User",
92+
"duration": "Duration",
93+
"reason": "Reason",
94+
"ip_whitelist": "Ip Whitelist",
95+
"apply_time": "Apply Time",
96+
"caller": "Caller",
97+
"access": "Access",
98+
"version": "Version",
99+
"scriptPath": "Script Path",
100+
"creator": "Creator",
101+
"publishDateStr": "Publish DateStr",
102+
"updateDateStr": "Update Date",
103+
"apiName": "Data Service Name",
104+
"apiPath": "API Path",
105+
"status": "Status",
106+
"type": "Type",
107+
"describe": "Describe",
108+
"calledCount": "Call count",
109+
"responsiblePerson": "Responsible Person",
110+
"belongTo": "Belong To",
111+
"tag": "Tag",
112+
"operation": {
113+
"title": "Operation",
114+
"test": "Test",
115+
"copy": "Copy",
116+
"disable": "Disable",
117+
"enable": "Enable",
118+
"manager": "Manager",
119+
"update": "Update",
120+
"view": "View"
121+
},
122+
"reconfirm": {
123+
"title": "Confirm",
124+
"disable": "Confirm disable this API？",
125+
"enable": "Confirm enable this API？"
126+
}
127+
},
128+
"view": {
129+
"scriptPath": "Script Path:",
130+
"scriptContent": "Script Content:"
131+
},
132+
"enable": "Running",
133+
"disable": "Stop",
134+
"normal": "Normal",
135+
"expired": "Expired",
136+
"all": "All",
137+
"updateApiModal": {
138+
"modalTitle": "Update API",
139+
"selectApi": "API Name",
140+
"apiPath": "API Path",
141+
"apiVersion": "API Version",
142+
"apiVersionUpgrade": "New Version",
143+
"paramConfirm": "Please confirm param"
144+
},
145+
"paramTable": {
146+
"paramName": "Param Name",
147+
"paramType": "Param Type",
148+
"require": {
149+
"title": "Require",
150+
"yes": "Yes",
151+
"no": "No",
152+
"hide": "Hide"
153+
},
154+
"defaultValue": "Default Value",
155+
"displayName": "Display Name",
156+
"describe": "Describe"
157+
},
158+
"rule": {
159+
"nameRule": "Please input api name!",
160+
"pathRule": "Please input api path!",
161+
"pathRegRule": "Api path illegal!",
162+
"requestTypeRule": "Please select request type!",
163+
"protocolRule": "Please select protocol!",
164+
"contentLengLimit": "Length limit 255",
165+
"pathRepeat": "Api path exists",
166+
"nameRepeat": "Api name exists"
167+
},
168+
"visible": {
169+
"workspace": "Workspace",
170+
"personal": "Personal",
171+
"public": "Public"
172+
},
173+
"apiInfo": {
174+
"title": "API Info",
175+
"authorize": "Token Authorize",
176+
"set": "Set",
177+
"tag": "Tag",
178+
"metrics": "API Metrics",
179+
"monthCall": "Call Total This Month",
180+
"weekCall": "Call Total This Week",
181+
"dayCall": "Call Total Today",
182+
"averageTime": "Average Call Time",
183+
"callSuccess": "Success Percent",
184+
"topQps": "TOP QPS",
185+
"use": "API Call Info",
186+
"selectCallTime": "Select Call Time",
187+
"version": "Version",
188+
"callStatus": "Call Info",
189+
"callUser": "Caller",
190+
"callApp": "CallApp",
191+
"callIp": "Call IP",
192+
"callTime": "Call Time",
193+
"callVersion": "Call Version",
194+
"operation": "Operation",
195+
"query": {
196+
"clearButtonText": "Clear",
197+
"buttonText": "Query"
198+
}
199+
},
200+
"apiSetForm": {
201+
"flowLimitation": "Flow Limitation",
202+
"defaultSetting": "Default Setting",
203+
"advancedSetting": "Advanced Setting",
204+
"form": {
205+
"MaxConcurrentNumber": "Max Concurrent Number：",
206+
"MaxSimultaneousQuery": "Max Simultaneous Query：",
207+
"MaxTimeQuery": "Max Time Query：",
208+
"defaultVersion": "Default Version：",
209+
"defaultConfigurationParameter": "Default Configuration Parameter：",
210+
"defaultVariable": "Default Variable：",
211+
"approvalNo": "Approval No："
212+
}
213+
},
214+
"apiTestInfo": {
215+
"title": "API Test",
216+
"testApi": "Test API",
217+
"apiVersion": "Version",
218+
"search": "Search",
219+
"params": "Screening criteria",
220+
"moreParams": "More filters",
221+
"paramsMore": "More filters",
222+
"selectParams": "已选择过滤条件",
223+
"allSelect": "全选",
224+
"allSelectParams": "可选择参数列表",
225+
"paramTable": {
226+
"paramName": "Param Name",
227+
"paramType": "Param Type",
228+
"description": "Param Description",
229+
"require": {
230+
"title": "Require",
231+
"yes": "YES",
232+
"no": "NO"
233+
},
234+
"defaultValue": "Test Value"
235+
},
236+
"testResult": "Test Result"
237+
},
238+
"apiVersionInfo": {
239+
"title": "API Version",
240+
"params": "params",
241+
"versionInfoTable": {
242+
"version": "Version",
243+
"status": "Status",
244+
"source": "Source",
245+
"creator": "Publisher",
246+
"publishDate": "Publish Time",
247+
"updateDate": "Update Time",
248+
"operation": "Operation",
249+
"query": {
250+
"title": "Query",
251+
"clear": "Clear",
252+
"publishDate": "Select Publish Time"
253+
}
254+
}
255+
},
256+
"notice": {
257+
"publishSuccess": "Publish Success"
258+
},
259+
"tagPlaceholder": "tag，click enter add"
260+
}
261+
}
262+
}

0 commit comments

Comments
 (0)