Merge pull request #2 from WeBankFinTech/dev-0.9.0

Dev 0.9.0

Author: schumiyi

docs/zh_CN/ch4/DSS工程发布调度系统架构设计.md

@@ -17,10 +17,10 @@
 
 （1）从数据库读取最新版本的工程、工作流信息，获取所有的保存在BML库工作流JSON文件。
 
-（2）将上面的数据库内容，JSON文件内容分别转成DSS中的DWSProject，DWSFlow，如果存在子flow，则需要一并设置到flow中，保持原来的层级关系和依赖关系，构建好DWSProject，其中包含了工程下所有的DWSFlow。
+（2）将上面的数据库内容，JSON文件内容分别转成DSS中的DSSProject，DSSFlow，如果存在子flow，则需要一并设置到flow中，保持原来的层级关系和依赖关系，构建好DSSProject，其中包含了工程下所有的DSSFlow。
      一个工作流JSON包含了所有节点的定义，并存储了节点之间的依赖关系，以及工作流自身的属性信息。
 
-（3）将DWSProject经过工程转换器转成SchedulerProject，转成SchedulerProject的过程中，同时完成了DWSJSONFlow到SchedulerFlow的转换，也完成了DWSNode到SchedulerNode的转换。
+（3）将DSSProject经过工程转换器转成SchedulerProject，转成SchedulerProject的过程中，同时完成了DSSJSONFlow到SchedulerFlow的转换，也完成了DSSNode到SchedulerNode的转换。
 
 （4）使用ProjectTuning对整个SchedulerProject工程进行tuning操作，用于完成工程发布前的整体调整操作，在Azkaban的实现中主要完成了工程的路径设置和工作流的存储路径设置。
 

…sphere/dss/server/dao/DWSUserMapper.java …cation/dao/DSSApplicationUserMapper.javadss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DWSUserMapper.java renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSApplicationUserMapper.java dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/DWSUserMapper.java renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/DSSApplicationUserMapper.java

@@ -15,13 +15,17 @@
  *
  */
 
-package com.webank.wedatasphere.dss.server.dao;
+package com.webank.wedatasphere.dss.application.dao;
 
-import org.apache.ibatis.annotations.Mapper;
+import com.webank.wedatasphere.dss.application.entity.DSSUser;
 
+/**
+ * Created by chaogefeng on 2019/10/11.
+ */
+public interface DSSApplicationUserMapper {
+    DSSUser getUserByName(String username);
 
-public interface DWSUserMapper {
-    Long getUserID(String userName);
+    void registerDssUser(DSSUser userDb);
 
-    String getuserName(Long userID);
+    void updateUserFirstLogin(Long userId);
 }

…s/application/dao/impl/DSSUserMapper.xml …on/dao/impl/DSSApplicationUserMapper.xmldss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSUserMapper.xml renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSApplicationUserMapper.xml dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSUserMapper.xml renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/dao/impl/DSSApplicationUserMapper.xml

@@ -19,7 +19,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 
-<mapper namespace="com.webank.wedatasphere.dss.application.dao.DSSUserMapper">
+<mapper namespace="com.webank.wedatasphere.dss.application.dao.DSSApplicationUserMapper">
 
     <sql id="dss_user">
         id,`username`,`name`,`is_first_login`

dss-application/src/main/java/com/webank/wedatasphere/dss/application/handler/UserFirstLoginHandler.java

@@ -18,7 +18,7 @@
 package com.webank.wedatasphere.dss.application.handler;
 
 import com.webank.wedatasphere.dss.application.entity.DSSUser;
-import com.webank.wedatasphere.dss.application.service.DSSUserService;
+import com.webank.wedatasphere.dss.application.service.DSSApplicationUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class UserFirstLoginHandler implements Handler {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
-    private DSSUserService dssUserService;
+    private DSSApplicationUserService dssApplicationUserService;
 
     @Override
     public int getOrder() {
@@ -44,15 +44,15 @@ public int getOrder() {
     public void handle(DSSUser user) {
         logger.info("UserFirstLoginHandler:");
         synchronized (user.getUsername().intern()){
-            DSSUser userDb = dssUserService.getUserByName(user.getUsername());
+            DSSUser userDb = dssApplicationUserService.getUserByName(user.getUsername());
             if(userDb == null){
                 logger.info("User first enter dss, insert table dss_user");
                 userDb = new DSSUser();
                 userDb.setUsername(user.getUsername());
                 userDb.setName(user.getName());
                 userDb.setFirstLogin(true);
                 userDb.setId(user.getId());
-                dssUserService.registerDSSUser(userDb);
+                dssApplicationUserService.registerDssUser(userDb);
             }
             // TODO: 2019/11/29 update  firstLogin
             user = userDb;

dss-application/src/main/java/com/webank/wedatasphere/dss/application/restful/ApplicationRestfulApi.java

@@ -22,7 +22,7 @@
 import com.webank.wedatasphere.dss.application.entity.DSSUserVO;
 import com.webank.wedatasphere.dss.application.handler.ApplicationHandlerChain;
 import com.webank.wedatasphere.dss.application.service.ApplicationService;
-import com.webank.wedatasphere.dss.application.service.DSSUserService;
+import com.webank.wedatasphere.dss.application.service.DSSApplicationUserService;
 import com.webank.wedatasphere.dss.application.util.ApplicationUtils;
 import com.webank.wedatasphere.linkis.server.Message;
 import com.webank.wedatasphere.linkis.server.security.SecurityFilter;
@@ -51,7 +51,7 @@ public class ApplicationRestfulApi {
     @Autowired
     private ApplicationService applicationService;
     @Autowired
-    private DSSUserService dataworkisUserService;
+    private DSSApplicationUserService dataworkisUserService;
     @Autowired
     private ApplicationHandlerChain applicationHandlerChain;
 

…/application/service/DSSUserService.java …n/service/DSSApplicationUserService.javadss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSUserService.java renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSApplicationUserService.java dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSUserService.java renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/DSSApplicationUserService.java

@@ -22,11 +22,11 @@
 /**
  * Created by chaogefeng on 2019/10/11.
  */
-public interface DSSUserService {
+public interface DSSApplicationUserService {
 
     DSSUser getUserByName(String username);
 
-    void registerDSSUser(DSSUser userDb);
+    void registerDssUser(DSSUser userDb);
 
     void updateUserFirstLogin(Long id);
 }

…ion/service/impl/DSSUserServiceImpl.java …/impl/DSSApplicationUserServiceImpl.javadss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSUserServiceImpl.java renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSApplicationUserServiceImpl.java dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSUserServiceImpl.java renamed to dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/DSSApplicationUserServiceImpl.java

@@ -17,33 +17,33 @@
 
 package com.webank.wedatasphere.dss.application.service.impl;
 
-import com.webank.wedatasphere.dss.application.dao.DSSUserMapper;
+import com.webank.wedatasphere.dss.application.dao.DSSApplicationUserMapper;
 import com.webank.wedatasphere.dss.application.entity.DSSUser;
-import com.webank.wedatasphere.dss.application.service.DSSUserService;
+import com.webank.wedatasphere.dss.application.service.DSSApplicationUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * Created by chaogefeng on 2019/10/11.
  */
 @Service
-public class DSSUserServiceImpl implements DSSUserService {
+public class DSSApplicationUserServiceImpl implements DSSApplicationUserService {
 
     @Autowired
-    private DSSUserMapper dssUserMapper;
+    private DSSApplicationUserMapper dssApplicationUserMapper;
 
     @Override
     public DSSUser getUserByName(String username) {
-        return dssUserMapper.getUserByName(username);
+        return dssApplicationUserMapper.getUserByName(username);
     }
 
     @Override
-    public void registerDSSUser(DSSUser userDb) {
-        dssUserMapper.registerDSSUser( userDb);
+    public void registerDssUser(DSSUser userDb) {
+        dssApplicationUserMapper.registerDssUser( userDb);
     }
 
     @Override
     public void updateUserFirstLogin(Long id) {
-        dssUserMapper.updateUserFirstLogin(id);
+        dssApplicationUserMapper.updateUserFirstLogin(id);
     }
 }

dss-application/src/main/java/com/webank/wedatasphere/dss/application/service/impl/LinkisUserServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package com.webank.wedatasphere.dss.application.service.impl;
 
-import com.webank.wedatasphere.dss.application.dao.DSSUserMapper;
+import com.webank.wedatasphere.dss.application.dao.DSSApplicationUserMapper;
 import com.webank.wedatasphere.dss.application.dao.LinkisUserMapper;
 import com.webank.wedatasphere.dss.application.entity.DSSUser;
 import com.webank.wedatasphere.dss.application.entity.LinkisUser;
@@ -33,7 +33,7 @@ public class LinkisUserServiceImpl implements LinkisUserService {
     @Autowired
     private LinkisUserMapper linkisUserMapper;
     @Autowired
-    private DSSUserMapper dssUserMapper;
+    private DSSApplicationUserMapper dssApplicationUserMapper;
 
     @Override
     public LinkisUser getUserByName(String username) {
@@ -55,6 +55,6 @@ public void registerDSSUser(LinkisUser userDb) {
         dssUser.setName(userDb.getName());
         dssUser.setUsername(userDb.getUserName());
         dssUser.setFirstLogin(userDb.getFirstLogin());
-        dssUserMapper.registerDSSUser(dssUser);
+        dssApplicationUserMapper.registerDssUser(dssUser);
     }
 }

dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanNodePublishHook.java

@@ -59,7 +59,7 @@ public void postPublish(SchedulerNode schedulerNode) {
     }
 
     private void writeNodeResourcesToLocal(SchedulerNode schedulerNode) throws DSSErrorException {
-        List<Resource> nodeResources = schedulerNode.getDWSNode().getResources();
+        List<Resource> nodeResources = schedulerNode.getDssNode().getResources();
         if(nodeResources == null || nodeResources.isEmpty()) {return;}
         FileOutputStream os = null;
         try {

dss-azkaban-scheduler-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/scheduler/azkaban/hooks/LinkisAzkabanProjectPublishHook.java

@@ -75,7 +75,7 @@ private void removeProjectStoreDirAndzip(AzkabanSchedulerProject publishProject)
     }
 
     private void writeProjectResourcesToLocal(AzkabanSchedulerProject publishProject)throws DSSErrorException {
-        List<Resource> resources = publishProject.getDWSProject().getProjectResources();
+        List<Resource> resources = publishProject.getDssProject().getProjectResources();
         FileOutputStream os = null;
         try {
             String storePath = publishProject.getStorePath();