Merge pull request #3 from WeBankFinTech/dev-0.9.0

Dev 0.9.0

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

@@ -48,6 +48,7 @@ public class DSSProject implements Project {
     private String product;
     private Integer applicationArea;
     private String business;
+    private Long workspaceId;
 
     private DSSProjectVersion latestVersion;
     private Boolean isNotPublish;
@@ -282,4 +283,12 @@ public String getBusiness() {
     public void setBusiness(String business) {
         this.business = business;
     }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
 }

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

@@ -59,16 +59,16 @@
                 <exclude>aopalliance:aopalliance:jar</exclude>
                 <exclude>asm:asm:jar</exclude>
                 <exclude>cglib:cglib:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
-                <exclude>com.amazonaws:jmespath-java:jar</exclude>
+<!--                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>-->
+<!--                <exclude>com.amazonaws:jmespath-java:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
-                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
+<!--                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
                 <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
@@ -264,7 +264,7 @@
                 <exclude>org.springframework:spring-web:jar</exclude>
                 <exclude>org.springframework:spring-webmvc:jar</exclude>
                 <exclude>org.yaml:snakeyaml:jar</exclude>
-                <exclude>software.amazon.ion:ion-java:jar</exclude>
+<!--                <exclude>software.amazon.ion:ion-java:jar</exclude>-->
                 <exclude>xmlpull:xmlpull:jar</exclude>
                 <exclude>xpp3:xpp3_min:jar</exclude>
             </excludes>

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

@@ -41,16 +41,16 @@
                 <exclude>aopalliance:aopalliance:jar</exclude>
                 <exclude>asm:asm:jar</exclude>
                 <exclude>cglib:cglib:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
-                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
-                <exclude>com.amazonaws:jmespath-java:jar</exclude>
+<!--                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>-->
+<!--                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>-->
+<!--                <exclude>com.amazonaws:jmespath-java:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
-                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
+<!--                <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>-->
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
                 <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
                 <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
@@ -284,7 +284,7 @@
                 <exclude>org.springframework:spring-webmvc:jar</exclude>
                 <exclude>org.tukaani:xz:jar</exclude>
                 <exclude>org.yaml:snakeyaml:jar</exclude>
-                <exclude>software.amazon.ion:ion-java:jar</exclude>
+<!--                <exclude>software.amazon.ion:ion-java:jar</exclude>-->
                 <exclude>xerces:xercesImpl:jar</exclude>
                 <exclude>xmlenc:xmlenc:jar</exclude>
                 <exclude>xmlpull:xmlpull:jar</exclude>

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

@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 package com.webank.wedatasphere.dss.server.dao;
 
 import com.webank.wedatasphere.dss.server.dto.response.*;

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

@@ -22,7 +22,7 @@
 <mapper namespace="com.webank.wedatasphere.dss.server.dao.ProjectMapper">
 
     <sql id="project_main">
-        id,`name`,`source`,`description`,`org_id`,`visibility`,`is_transfer`,`initial_org_id`,`user_id`,`create_time`,`create_by`,`product`,`application_area`,`business`
+        id,`name`,`source`,`description`,`org_id`,`visibility`,`is_transfer`,`initial_org_id`,`user_id`,`create_time`,`create_by`,`product`,`application_area`,`business`,`workspace_id`
     </sql>
 
     <sql id="project_version">
@@ -61,7 +61,7 @@
     <insert id="addProject" useGeneratedKeys="true" keyProperty="id"  parameterType="com.webank.wedatasphere.dss.common.entity.project.DSSProject">
         INSERT INTO dss_project (<include refid = "project_main" />)
         VALUES
-        (#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business})
+        (#{id},#{name},#{source},#{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},#{userID},#{createTime},#{createBy},#{product},#{applicationArea},#{business},#{workspaceId})
     </insert>
 
     <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

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ *
+ */
 package com.webank.wedatasphere.dss.server.dto.response;
 
 /**

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

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ *
+ */
 package com.webank.wedatasphere.dss.server.dto.response;
 
 import java.util.List;

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

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ *
+ */
 package com.webank.wedatasphere.dss.server.dto.response;
 
 /**

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

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ *
+ */
 package com.webank.wedatasphere.dss.server.dto.response;
 
 /**

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

@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 package com.webank.wedatasphere.dss.server.dto.response;
 
 import java.util.List;

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

@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 package com.webank.wedatasphere.dss.server.dto.response;
 
 /**

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

@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 package com.webank.wedatasphere.dss.server.dto.response;
 
 /**

dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSFavorite.java

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ *
+ */
 package com.webank.wedatasphere.dss.server.entity;
 
 /**

dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DSSWorkspace.java

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ *
+ */
 package com.webank.wedatasphere.dss.server.entity;
 
 /**

dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/ProjectRestfulApi.java

@@ -101,8 +101,9 @@ public Response addProject(@Context HttpServletRequest req, JsonNode json) throw
         String product = json.get("product").getTextValue();
         Integer applicationArea = json.get("applicationArea").getIntValue();
         String business = json.get("business").getTextValue();
+        Long workspaceId = json.get("workspaceId") == null ? 1 : json.get("workspaceId").getLongValue();
         // TODO: 2019/5/16 空值校验，重复名校验
-        projectService.addProject(userName, name, description, taxonomyID,product,applicationArea,business);
+        projectService.addProject(userName, name, description, taxonomyID,product,applicationArea,business, workspaceId);
         return Message.messageToResponse(Message.ok());
     }
 

dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/TreeRestfulApi.java

@@ -26,13 +26,11 @@
 import com.webank.wedatasphere.linkis.server.security.SecurityFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 import scala.Enumeration;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;

dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/WorkspaceRestfulApi.java

@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 package com.webank.wedatasphere.dss.server.restful;
 
 import com.webank.wedatasphere.dss.server.dto.response.HomepageDemoMenuVo;

dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectService.java

@@ -32,7 +32,7 @@ public interface DSSProjectService {
 
     DSSProject getProjectByID(Long id);
 
-    Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business) throws DSSErrorException, AppJointErrorException;
+    Long addProject(String userName, String name, String description, Long taxonomyID,String product,Integer applicationArea,String business, Long workspaceId) throws DSSErrorException, AppJointErrorException;
 
     void updateProject(long projectID, String name, String description, String userName , String product ,Integer applicationArea ,String business) throws AppJointErrorException;
 

dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSProjectTaxonomyService.java

@@ -30,7 +30,7 @@ public interface DSSProjectTaxonomyService {
     List<DSSProjectTaxonomy> listProjectTaxonomyByUser(String userName);
 
     //----------------------
-    List<DSSProjectTaxonomy> listAllProjectTaxonomy(String userName);
+    List<DSSProjectTaxonomy> listAllProjectTaxonomy(String userName, Long workspaceId);
 
     List<DSSProjectTaxonomy> listProjectTaxonomy(Long taxonomyID, String userName);
 

dss-server/src/main/java/com/webank/wedatasphere/dss/server/service/DSSWorkspaceService.java

@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 package com.webank.wedatasphere.dss.server.service;
 
 import com.webank.wedatasphere.dss.server.dto.response.HomepageDemoMenuVo;