Skip to content

Commit 848656c

Browse files
schumiyischumiyi
authored
Merge pull request #3 from WeBankFinTech/dev-0.9.0
Dev 0.9.0
2 parents bf2bbea + 188d741 commit 848656c

File tree

47 files changed

+908
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+908
-276
lines changed

‎db/dss_dml.sql‎

Lines changed: 48 additions & 0 deletions
Large diffs are not rendered by default.

‎dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class DSSProject implements Project {
4848
private String product;
4949
private Integer applicationArea;
5050
private String business;
51+
private Long workspaceId;
5152

5253
private DSSProjectVersion latestVersion;
5354
private Boolean isNotPublish;
@@ -282,4 +283,12 @@ public String getBusiness() {
282283
public void setBusiness(String business) {
283284
this.business = business;
284285
}
286+
287+
public Long getWorkspaceId() {
288+
return workspaceId;
289+
}
290+
291+
public void setWorkspaceId(Long workspaceId) {
292+
this.workspaceId = workspaceId;
293+
}
285294
}

‎dss-flow-execution-entrance/src/main/assembly/distribution.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@
5959
<exclude>aopalliance:aopalliance:jar</exclude>
6060
<exclude>asm:asm:jar</exclude>
6161
<exclude>cglib:cglib:jar</exclude>
62-
<exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
63-
<exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
64-
<exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
65-
<exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
66-
<exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
67-
<exclude>com.amazonaws:jmespath-java:jar</exclude>
62+
<!-- <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>-->
63+
<!-- <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>-->
64+
<!-- <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>-->
65+
<!-- <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>-->
66+
<!-- <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>-->
67+
<!-- <exclude>com.amazonaws:jmespath-java:jar</exclude>-->
6868
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
6969
<exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
7070
<exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
71-
<exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
71+
<!-- <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>-->
7272
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
7373
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
7474
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
@@ -264,7 +264,7 @@
264264
<exclude>org.springframework:spring-web:jar</exclude>
265265
<exclude>org.springframework:spring-webmvc:jar</exclude>
266266
<exclude>org.yaml:snakeyaml:jar</exclude>
267-
<exclude>software.amazon.ion:ion-java:jar</exclude>
267+
<!-- <exclude>software.amazon.ion:ion-java:jar</exclude>-->
268268
<exclude>xmlpull:xmlpull:jar</exclude>
269269
<exclude>xpp3:xpp3_min:jar</exclude>
270270
</excludes>

‎dss-server/src/main/assembly/distribution.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@
4141
<exclude>aopalliance:aopalliance:jar</exclude>
4242
<exclude>asm:asm:jar</exclude>
4343
<exclude>cglib:cglib:jar</exclude>
44-
<exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
45-
<exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
46-
<exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
47-
<exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
48-
<exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
49-
<exclude>com.amazonaws:jmespath-java:jar</exclude>
44+
<!-- <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>-->
45+
<!-- <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>-->
46+
<!-- <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>-->
47+
<!-- <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>-->
48+
<!-- <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>-->
49+
<!-- <exclude>com.amazonaws:jmespath-java:jar</exclude>-->
5050
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
5151
<exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
5252
<exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
53-
<exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
53+
<!-- <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>-->
5454
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
5555
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
5656
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
@@ -284,7 +284,7 @@
284284
<exclude>org.springframework:spring-webmvc:jar</exclude>
285285
<exclude>org.tukaani:xz:jar</exclude>
286286
<exclude>org.yaml:snakeyaml:jar</exclude>
287-
<exclude>software.amazon.ion:ion-java:jar</exclude>
287+
<!-- <exclude>software.amazon.ion:ion-java:jar</exclude>-->
288288
<exclude>xerces:xercesImpl:jar</exclude>
289289
<exclude>xmlenc:xmlenc:jar</exclude>
290290
<exclude>xmlpull:xmlpull:jar</exclude>

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
* Copyright 2019 WeBank
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
118
package com.webank.wedatasphere.dss.server.dao;
219

320
import com.webank.wedatasphere.dss.server.dto.response.*;

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/projectMapper.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<mapper namespace="com.webank.wedatasphere.dss.server.dao.ProjectMapper">
2323

2424
<sql id="project_main">
25-
id,`name`,`source`,`description`,`org_id`,`visibility`,`is_transfer`,`initial_org_id`,`user_id`,`create_time`,`create_by`,`product`,`application_area`,`business`
25+
id,`name`,`source`,`description`,`org_id`,`visibility`,`is_transfer`,`initial_org_id`,`user_id`,`create_time`,`create_by`,`product`,`application_area`,`business`,`workspace_id`
2626
</sql>
2727

2828
<sql id="project_version">
@@ -61,7 +61,7 @@
6161
<insert id="addProject" useGeneratedKeys="true" keyProperty="id" parameterType="com.webank.wedatasphere.dss.common.entity.project.DSSProject">
6262
INSERT INTO dss_project (<include refid = "project_main" />)
6363
VALUES
64-
(#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business})
64+
(#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business},#{workspaceId})
6565
</insert>
6666

6767
<insert id="addProjectVersion" useGeneratedKeys="true" keyProperty="id" parameterType="com.webank.wedatasphere.dss.common.entity.project.DSSProjectVersion" >

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dto/response/HomepageDemoInstanceVo.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2019 WeBank
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
117
package com.webank.wedatasphere.dss.server.dto.response;
218

319
/**

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dto/response/HomepageDemoMenuVo.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2019 WeBank
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
117
package com.webank.wedatasphere.dss.server.dto.response;
218

319
import java.util.List;

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dto/response/HomepageVideoVo.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2019 WeBank
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
117
package com.webank.wedatasphere.dss.server.dto.response;
218

319
/**

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dto/response/OnestopMenuAppInstanceVo.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2019 WeBank
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
117
package com.webank.wedatasphere.dss.server.dto.response;
218

319
/**

0 commit comments

Comments
 (0)