Skip to content

Commit ae3eb79

Browse files
JackChen0810JackChen0810
committed
fix bug #448 
1 parent f4972c4 commit ae3eb79

File tree

9 files changed

+78
-39
lines changed

9 files changed

+78
-39
lines changed

‎assembly/bin/appconn-install.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,8 @@ echo ""
106106

107107
echo "step4:refresh appconn load"
108108
curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load
109+
echo ""
110+
111+
echo ""
112+
echo "step5:Restart the DSS service,please use sbin/dss-start-all.sh to restart it!"
109113
echo ""

‎assembly/bin/install.sh‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ function checkJava(){
5454

5555
checkJava
5656

57-
dos2unix ${workDir}/config/*
58-
dos2unix ${workDir}/bin/*
57+
dos2unix -q ${workDir}/config/*
58+
dos2unix -q ${workDir}/bin/*
5959

6060
echo "step1:load config"
6161
source ${workDir}/config/config.sh
@@ -150,7 +150,7 @@ function changeConf(){
150150
sed -i "s#spring.spring.application.name=.*#spring.spring.application.name=$SERVER_FULL_NAME#g" $CONF_SERVER_PROPERTIES
151151
fi
152152
sed -i "s#wds.dss.appconn.scheduler.project.store.dir.*#wds.dss.appconn.scheduler.project.store.dir=$WDS_SCHEDULER_PATH#g" $CONF_SERVER_PROPERTIES
153-
isSuccess "subsitution $CONF_SERVER_PROPERTIES of $SERVER_NAME"
153+
isSuccess "subsitution $CONF_SERVER_PROPERTIES"
154154
}
155155
##function end
156156

@@ -204,12 +204,13 @@ fi
204204

205205
##Install dss projects
206206
function installDssProject() {
207+
echo "step2:update config"
207208
# if [ "$DSS_INSTALL_HOME" != "" ]
208209
# then
209210
# rm -rf $DSS_INSTALL_HOME
210211
# fi
211-
echo ""
212-
echo "-----------------DSS install start--------------------"
212+
#echo ""
213+
#echo "-----------------DSS install start--------------------"
213214
SERVER_HOME=$DSS_INSTALL_HOME
214215
if [ "$SERVER_HOME" == "" ]
215216
then
@@ -224,7 +225,7 @@ function installDssProject() {
224225
sudo mkdir -p $SERVER_HOME;sudo chown -R $deployUser:$deployUser $SERVER_HOME
225226
isSuccess "Create the dir of $SERVER_HOME"
226227

227-
echo ""
228+
#echo ""
228229
SERVER_NAME=dss-framework-project-server
229230
SERVER_IP=$DSS_FRAMEWORK_PROJECT_SERVER_INSTALL_IP
230231
SERVER_PORT=$DSS_FRAMEWORK_PROJECT_SERVER_PORT
@@ -237,7 +238,7 @@ function installDssProject() {
237238
CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
238239
###install project-Server
239240
installPackage
240-
echo ""
241+
#echo ""
241242

242243
SERVER_NAME=dss-framework-orchestrator-server
243244
SERVER_IP=$DSS_FRAMEWORK_ORCHESTRATOR_SERVER_INSTALL_IP
@@ -250,7 +251,7 @@ function installDssProject() {
250251
CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
251252
###install project-Server
252253
installPackage
253-
echo ""
254+
#echo ""
254255

255256
SERVER_NAME=dss-apiservice-server
256257
SERVER_IP=$DSS_APISERVICE_SERVER_INSTALL_IP
@@ -263,7 +264,7 @@ function installDssProject() {
263264
CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
264265
###install dss-apiservice-server
265266
installPackage
266-
echo ""
267+
#echo ""
267268

268269
SERVER_NAME=dss-datapipe-server
269270
SERVER_IP=$DSS_DATAPIPE_SERVER_INSTALL_IP
@@ -276,7 +277,7 @@ function installDssProject() {
276277
CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
277278
###install dss-datapipe-server
278279
installPackage
279-
echo ""
280+
#echo ""
280281

281282
##Flow execution Install
282283
PACKAGE_DIR=dss
@@ -291,7 +292,7 @@ function installDssProject() {
291292
CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
292293
###Install flow execution
293294
installPackage
294-
echo ""
295+
#echo ""
295296

296297
SERVER_NAME=dss-workflow-server
297298
SERVER_IP=$DSS_WORKFLOW_SERVER_INSTALL_IP
@@ -304,10 +305,11 @@ function installDssProject() {
304305
CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
305306
###install dss-workflow-server
306307
installPackage
307-
echo ""
308-
echo "-----------------DSS install end--------------------"
309-
echo ""
308+
#echo "-----------------DSS install end--------------------"
309+
#echo ""
310310

311311
}
312312
ENV_FLAG="dev"
313-
installDssProject
313+
installDssProject
314+
315+
echo "Congratulations! You have installed DSS $DSS_VERSION successfully, please use sbin/dss-start-all.sh to start it!"

‎dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/BatchDeleteAppConnNodeRequest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
public class BatchDeleteAppConnNodeRequest {
99

1010
private List<Map<String,Object>> nodes;
11+
private LabelRouteVO labels;
1112

1213
public List<Map<String, Object>> getNodes() {
1314
return nodes;
@@ -16,4 +17,12 @@ public List<Map<String, Object>> getNodes() {
1617
public void setNodes(List<Map<String, Object>> nodes) {
1718
this.nodes = nodes;
1819
}
20+
21+
public LabelRouteVO getLabels() {
22+
return labels;
23+
}
24+
25+
public void setLabels(LabelRouteVO labels) {
26+
this.labels = labels;
27+
}
1928
}

‎dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/DeleteFlowRequest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.webank.wedatasphere.dss.workflow.entity.request;
22

3+
import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
4+
35
public class DeleteFlowRequest {
46

57
private Long id;
68
private Boolean sure;
9+
private LabelRouteVO labels;
710

811
public Long getId() {
912
return id;
@@ -20,4 +23,12 @@ public Boolean getSure() {
2023
public void setSure(Boolean sure) {
2124
this.sure = sure;
2225
}
26+
27+
public LabelRouteVO getLabels() {
28+
return labels;
29+
}
30+
31+
public void setLabels(LabelRouteVO labels) {
32+
this.labels = labels;
33+
}
2334
}

‎dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/UpdateExternalNodeRequest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import java.util.Map;
66

77
public class UpdateExternalNodeRequest {
8-
9-
108
private Long projectID;
119
private String nodeType;
1210
private LabelRouteVO labels;

‎dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/UpdateFlowBaseInfoRequest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package com.webank.wedatasphere.dss.workflow.entity.request;
22

3+
import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
4+
35
public class UpdateFlowBaseInfoRequest {
46

57
private Long id;
68
private String name;
79
private String description ;
810
private String uses;
11+
private LabelRouteVO labels;
912

1013
public Long getId() {
1114
return id;
@@ -38,4 +41,12 @@ public String getUses() {
3841
public void setUses(String uses) {
3942
this.uses = uses;
4043
}
44+
45+
public LabelRouteVO getLabels() {
46+
return labels;
47+
}
48+
49+
public void setLabels(LabelRouteVO labels) {
50+
this.labels = labels;
51+
}
4152
}

‎dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public Message getReleaseStatus(@Context HttpServletRequest request,
159159

160160
@RequestMapping(value = "updateFlowBaseInfo",method = RequestMethod.POST)
161161
// @ProjectPrivChecker
162-
public Message updateFlowBaseInfo(@Context HttpServletRequest req, UpdateFlowBaseInfoRequest updateFlowBaseInfoRequest) throws DSSErrorException {
162+
public Message updateFlowBaseInfo(@Context HttpServletRequest req,@RequestBody UpdateFlowBaseInfoRequest updateFlowBaseInfoRequest) throws DSSErrorException {
163163
Long flowID = updateFlowBaseInfoRequest.getId();
164164
String name = updateFlowBaseInfoRequest.getName();
165165
String description = updateFlowBaseInfoRequest.getDescription();
@@ -199,7 +199,7 @@ public Message get(@Context HttpServletRequest req, @RequestParam(required = fal
199199

200200
@RequestMapping(value = "deleteFlow",method = RequestMethod.POST)
201201
// @ProjectPrivChecker
202-
public Message deleteFlow(@Context HttpServletRequest req, DeleteFlowRequest deleteFlowRequest) throws DSSErrorException {
202+
public Message deleteFlow(@Context HttpServletRequest req,@RequestBody DeleteFlowRequest deleteFlowRequest) throws DSSErrorException {
203203
Long flowID = deleteFlowRequest.getId();
204204
boolean sure = deleteFlowRequest.getSure() != null && deleteFlowRequest.getSure().booleanValue();
205205
// TODO: 2019/6/13 projectVersionID的更新校验

‎sbin/common.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ source ~/.bash_profile
2020

2121
export local_host="`hostname --fqdn`"
2222

23-
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
23+
#ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
2424

2525
function isLocal(){
2626
if [ "$1" == "127.0.0.1" ];then
@@ -31,8 +31,8 @@ function isLocal(){
3131
return 0
3232
elif [ "$1" == $local_host ]; then
3333
return 0
34-
elif [ "$1" == $ipaddr ]; then
35-
return 0
34+
#elif [ "$1" == $ipaddr ]; then
35+
# return 0
3636
fi
3737
return 1
3838
}

‎web/install.sh‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@ fi
4141
# 区分版本
4242
version=`cat /etc/redhat-release|sed -r 's/.* ([0-9]+)\..*/\1/'`
4343

44-
45-
echo "========================================================================配置信息======================================================================="
46-
47-
echo "前端访问端口：${dss_port}"
48-
echo "后端Linkis的地址：${linkis_url}"
49-
echo "静态文件地址：${dss_basepath}/dist"
50-
echo "当前路径：${workDir}"
51-
echo "本机ip：${dss_ipaddr}"
52-
53-
echo "========================================================================配置信息======================================================================="
54-
echo ""
44+
##echo "========================================================================配置信息======================================================================="
45+
##
46+
##echo "前端访问端口：${dss_port}"
47+
##echo "后端Linkis的地址：${linkis_url}"
48+
##echo "静态文件地址：${dss_basepath}/dist"
49+
##echo "当前路径：${workDir}"
50+
##echo "本机ip：${dss_ipaddr}"
51+
##
52+
##echo "========================================================================配置信息======================================================================="
53+
##echo ""
5554

5655

5756
# 创建文件并配置nginx
@@ -122,7 +121,7 @@ centos7(){
122121
# nginx是否安装
123122
#sudo rpm -Uvh http://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm
124123
sudo yum install -y nginx
125-
echo "nginx 安装成功"
124+
echo "Nginx installed successfully"
126125

127126
# 配置nginx
128127
dssConf
@@ -198,8 +197,13 @@ fi
198197
if [[ $version -eq 7 ]]; then
199198
centos7
200199
fi
201-
echo '安装visualis前端,用户自行编译DSS前端安装包，则安装时需要把visualis的前端安装包放置于此'$dss_basepath/dss/visualis'，用于自动化安装:'
202-
cd $dss_basepath/dss/visualis;unzip -o build.zip > /dev/null
203-
echo '安装linkis管理台,用户自行编译DSS前端安装包，则安装时需要把linkis管理台安装包放置于此'$dss_basepath/dss/linkis'，用于自动化安装:'
204-
cd $dss_basepath/dss/linkis;unzip -o build.zip > /dev/null
205-
echo "请浏览器访问：http://${dss_ipaddr}:${dss_port}"
200+
#echo '安装visualis前端,用户自行编译DSS前端安装包，则安装时需要把visualis的前端安装包放置于此'$dss_basepath/dss/visualis'，用于自动化安装:'
201+
if test -e $dss_basepath/dss/visualis/build.zip ; then
202+
cd $dss_basepath/dss/visualis;unzip -o build.zip > /dev/null
203+
fi
204+
205+
#echo '安装linkis管理台,用户自行编译DSS前端安装包，则安装时需要把linkis管理台安装包放置于此'$dss_basepath/dss/linkis'，用于自动化安装:'
206+
if test -e $dss_basepath/dss/linkis/build.zip ; then
207+
cd $dss_basepath/dss/linkis;unzip -o build.zip > /dev/null
208+
fi
209+
#echo "请浏览器访问：http://${dss_ipaddr}:${dss_port}"

0 commit comments

Comments
 (0)