Merge pull request #4 from WeBankFinTech/dev-0.9.0

Dev 0.9.0
WeBankFinTech · Jul 8, 2020 · 4ed9a57 · 4ed9a57
2 parents 4083f0c + c7e0bfb
commit 4ed9a57
Show file tree

Hide file tree

Showing 31 changed files with 550 additions and 250 deletions.
diff --git a/db/dss_ddl.sql b/db/dss_ddl.sql
@@ -154,6 +154,7 @@ CREATE TABLE `dss_project` (
   `name` varchar(200) COLLATE utf8_bin DEFAULT NULL,
   `source` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'Source of the dss_project',
   `description` text COLLATE utf8_bin,
+  `workspace_id` bigint(20) DEFAULT 1,
   `user_id` bigint(20) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
   `create_by` bigint(20) DEFAULT NULL,
@@ -372,6 +373,7 @@ DROP TABLE IF EXISTS `dss_onestop_user_favorites`;
 CREATE TABLE `dss_onestop_user_favorites` (
   `id` int(20) NOT NULL AUTO_INCREMENT,
   `username` varchar(64) DEFAULT NULL,
+  `workspace_id` bigint(20) DEFAULT 1,
   `menu_application_id` int(20) DEFAULT NULL,
   `order` int(2) DEFAULT NULL,
   `create_by` varchar(255) DEFAULT NULL,

diff --git a/db/dss_dml.sql b/db/dss_dml.sql
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java
@@ -56,7 +56,7 @@ public interface WorkspaceMapper {
     List<OnestopMenuVo> getApplicationMenuEn();
 
     List<OnestopMenuAppInstanceVo> getMenuAppInstancesCn(Long id);
-    List<OnestopMenuAppInstanceVo> getMenuAppInstanceEn(Long id);
+    List<OnestopMenuAppInstanceVo> getMenuAppInstancesEn(Long id);
 
     List<WorkspaceFavoriteVo> getWorkspaceFavoritesCn(@Param("username") String username, @Param("workspaceId") Long workspaceId);
 

diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml
@@ -31,7 +31,7 @@
     </sql>
     <sql id="menu_appInstances_en">
         m.`id`,m.`title_en` AS `title`, m.`desc_en` AS `description`,m.`labels_en` AS `labels`,
-        m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`
+        m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`,
         m.`manual_button_url`,m.`icon`,m.`order`,app.`homepage_url` AS `access_button_url`,app.project_url, app.`name`
     </sql>
 

diff --git a/...rc/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java b/...rc/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java
@@ -111,7 +111,7 @@ public List<OnestopMenuVo> getWorkspaceManagements(Long workspaceId, String user
     private List<OnestopMenuVo> getMenuAppInstances(List<OnestopMenuVo> menuVos, boolean isChinese) {
         for (OnestopMenuVo menuVo : menuVos) {
             Long menuId = menuVo.getId();
-            List<OnestopMenuAppInstanceVo> menuAppInstanceVos = isChinese ? workspaceMapper.getMenuAppInstancesCn(menuId) : workspaceMapper.getMenuAppInstanceEn(menuId);
+            List<OnestopMenuAppInstanceVo> menuAppInstanceVos = isChinese ? workspaceMapper.getMenuAppInstancesCn(menuId) : workspaceMapper.getMenuAppInstancesEn(menuId);
             menuVo.setAppInstances(menuAppInstanceVos);
         }
         return menuVos;

diff --git a/...nt/appjoint/src/main/java/com.webank/wedatasphere/project/QualitisProjectServiceImpl.java b/...nt/appjoint/src/main/java/com.webank/wedatasphere/project/QualitisProjectServiceImpl.java
@@ -60,10 +60,10 @@ public Project createProject(Project project, Session session) throws AppJointEr
         try {
             QualitisAddProjectRequest qualitisAddProjectRequest = new QualitisAddProjectRequest();
 
-            DSSProject DSSProject = (DSSProject) project;
+            DSSProject dssProject = (DSSProject) project;
             qualitisAddProjectRequest.setProjectName(project.getName());
             qualitisAddProjectRequest.setDescription(project.getDescription());
-            qualitisAddProjectRequest.setUsername(DSSProject.getUserName());
+            qualitisAddProjectRequest.setUsername(dssProject.getUserName());
 
             RestTemplate restTemplate = new RestTemplate();
             HttpEntity<Object> entity = generateEntity(qualitisAddProjectRequest);
@@ -73,7 +73,7 @@ public Project createProject(Project project, Session session) throws AppJointEr
             String responseStatus = (String) response.get("code");
             if (FAILURE_CODE.equals(responseStatus)) {
                 // Send request to auto create qualitis user
-                autoAddUser(restTemplate, DSSProject.getUserName());
+                autoAddUser(restTemplate, dssProject.getUserName());
 
                 // restart to create project
                 response = createProjectReal(restTemplate, entity);
@@ -142,9 +142,9 @@ public void deleteProject(Project project, Session session) throws AppJointError
         try {
             QualitisDeleteProjectRequest qualitisDeleteProjectRequest = new QualitisDeleteProjectRequest();
 
-            DSSProject DSSProject = (DSSProject) project;
+            DSSProject dssProject = (DSSProject) project;
             qualitisDeleteProjectRequest.setProjectId(project.getId());
-            qualitisDeleteProjectRequest.setUsername(DSSProject.getUserName());
+            qualitisDeleteProjectRequest.setUsername(dssProject.getUserName());
 
             RestTemplate restTemplate = new RestTemplate();
             HttpEntity<Object> entity = generateEntity(qualitisDeleteProjectRequest);
@@ -183,11 +183,11 @@ public void updateProject(Project project, Session session) throws AppJointError
         try {
             QualitisUpdateProjectRequest qualitisUpdateProjectRequest = new QualitisUpdateProjectRequest();
 
-            DSSProject DSSProject = (DSSProject) project;
+            DSSProject dssProject = (DSSProject) project;
             qualitisUpdateProjectRequest.setProjectId(project.getId());
             qualitisUpdateProjectRequest.setProjectName(project.getName());
             qualitisUpdateProjectRequest.setDescription(project.getDescription());
-            qualitisUpdateProjectRequest.setUsername(DSSProject.getUserName());
+            qualitisUpdateProjectRequest.setUsername(dssProject.getUserName());
 
             RestTemplate restTemplate = new RestTemplate();
             HttpEntity<Object> entity = generateEntity(qualitisUpdateProjectRequest);

diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dataspherestudio",
-    "version": "0.5.0",
+    "version": "0.9.0",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",

diff --git a/web/src/assets/styles/login.scss b/web/src/assets/styles/login.scss
@@ -44,7 +44,6 @@
     }
     .login-main {
         width: 380px;
-        height: 300px;
         background-color: $body-background;
         margin-right: 9.5%;
         padding: 20px;
@@ -76,9 +75,15 @@
         }
     }
     .remember-user-name {
-        margin: 5px 0 0 10px;
+        margin: 0px 0 10px 10px;
     }
     .ivu-form-item {
         margin-bottom: 20px;
     }
+    .captcha-wp {
+        display: flex;
+        img{
+            height: 44px;
+        }
+    }
 }
diff --git a/web/src/assets/styles/workspace.scss b/web/src/assets/styles/workspace.scss
@@ -52,6 +52,14 @@
   color: #39f;
 }
 
+.nodata-tips {
+  font-size: 12px;
+  margin: auto;
+  height: 70px;
+  line-height: 70px;
+  text-align: center;
+}
+
 .workspace-main {
   padding: 10px 25px;
   display: -webkit-box;
@@ -205,6 +213,8 @@
             display: flex;
             align-items: center;
             margin-top: -10px;
+            margin-right: 50px;
+            flex-wrap: wrap;
 
             .title-sub {
               margin-right: 10px;

diff --git a/web/src/commonData/i18n/common/en.json b/web/src/commonData/i18n/common/en.json
@@ -81,9 +81,10 @@
             "publishSuccess": "Successfully published",
             "publishFailed": "Publish failed",
             "infoTitle": "Welcome",
-            "infoHeader": "Welcome to DataSphere Studio !",
+            "infoHeader": "Welcome to My Project !",
             "infoBodyFirstRow": "DataSphere Studio is a one-stop portal focusing on development and management of data application, as a part of WeDataSphere -- the big data platform of WeBank.",
             "infoBodySecondRow": "Based on Linkis computation middleware, it's able to easily integrate various data application systems, making the development of data application easier and simpler.",
+            "workspace": "Workspace",
             "appTitle": "Application Navigation",
             "applicationStudio": "Business Application Development",
             "applicationMore": "More Information",
@@ -104,6 +105,7 @@
             "noData": "No data please add"
         },
         "workspace": {
+          "infoHeader": "Welcome to DataSphere Studio !",
           "createWorkspace": "Create Workspace",
           "searchWorkspace": "Search Workspace",
           "workspaceList": "Workspace List",
@@ -130,6 +132,7 @@
           "HYP": "Change"
         },
         "workflow": {
+            "infoHeader": "Welcome to Workflow!",
             "workflow": "Workflow",
             "createWorkflow": "Create workflow",
             "gotoVisualis": "Enter Visualis",
@@ -797,14 +800,19 @@
             "password": "Please enter password！",
             "loginSuccess": "Login Success",
             "haveLogin": "You have already logged in, please do not login repeatedly",
-            "vaildFaild": "Authentication failed!"
+            "vaildFaild": "Authentication failed!",
+            "captcha": "Please enter captcha"
         },
         "userMenu": {
             "title": "Warning",
             "content": "<p>This operation will clear the local database cache, leading to loose your script logs, history and result set information, please confirm whether there are scripts unsaved!</p><p>Click OK button to continue?</p>",
             "clearCacheSuccess": "Successfully cleared local cache!",
             "comingSoon": "Not yet open source, please stay tuned!"
         },
+        "header": {
+            "home": "Home",
+            "console": "Console"
+        },
         "headerNavBar": {
             "Workflow": "Workflow Development",
             "Exchangis": "Data Exchange Component",
@@ -1057,7 +1065,9 @@
                 "cancel": "Cancel",
                 "running": "running",
                 "stop": "disable",
-                "searchPlaceholder": "Search application"
+                "searchPlaceholder": "Search application",
+                "tips": "No data or no addition",
+                "repeat": "You cannot add the same application repeatedly"
             }
         },
         "database": {

diff --git a/web/src/commonData/i18n/common/zh.json b/web/src/commonData/i18n/common/zh.json
@@ -82,11 +82,11 @@
             "publishSuccess": "发布成功",
             "publishFailed": "发布失败",
             "infoTitle": "欢迎信息",
-            "infoHeader": "欢迎来到 DataSphere Studio !",
+            "infoHeader": "欢迎来到工作流开发首页！",
             "infoBodyFirstRow": "DataSphere Studio是微众银行大数据平台——WeDataSphere，自研的一站式数据应用开发管理门户。",
             "infoBodySecondRow": "基于Linkis计算中间件构建，可轻松整合上层各数据应用系统，让数据应用开发变得简洁又易用。",
             "appTitle": "应用导航",
-            "applicationStudio": "业务应用开发",
+            "workspace": "工作空间",
             "applicationMore": "了解更多",
             "applicationTipsFirst": "工程 > 工作流，是应用开发的基本组织结构。",
             "applictaionTipsSecond": "在工作流拖拽编辑页面，DataSphere Studio已集成的所有数据应用系统，都将以工作流节点的形式出现，让您能够以业务的视角将其编排串连起来，快速实现全部业务。",
@@ -105,6 +105,7 @@
             "noData": "暂无数据请添加"
         },
         "workspace": {
+          "infoHeader": "欢迎来到 DataSphere Studio !",
           "createWorkspace": "创建工作空间",
           "searchWorkspace": "搜索工作空间",
           "workspaceList": "工作空间列表",
@@ -131,6 +132,7 @@
           "HYP": "换一批"
         },
         "workflow": {
+            "infoHeader": "欢迎来到工作流！",
             "workflow": "工作流",
             "createWorkflow": "创建工作流",
             "gotoVisualis": "进入Visualis",
@@ -798,14 +800,19 @@
             "password": "请输入密码！",
             "loginSuccess": "登录成功",
             "haveLogin": "您已经登录，请不要重复登录",
-            "vaildFaild": "验证未通过！"
+            "vaildFaild": "验证未通过！",
+            "captcha": "请输入验证码"
         },
         "userMenu": {
             "title": "警告",
             "content": "<p>此操作将清空本地数据库缓存，这样会丢失您的脚本日志、历史和结果集等相关信息，请确认是否有未保存的脚本！</p><p>点击确认按钮继续操作？</p>",
             "clearCacheSuccess": "清除本地数据缓存成功!",
             "comingSoon": "尚未开源，敬请期待！"
         },
+        "header": {
+            "home": "首页",
+            "console": "控制台"
+        },
         "headerNavBar": {
             "Workflow": "工作流开发",
             "Exchangis": "数据交换组件",
@@ -1058,7 +1065,9 @@
                 "cancel": "取消",
                 "running": "运行中",
                 "stop": "不可用",
-                "searchPlaceholder": "搜索应用系统"
+                "searchPlaceholder": "搜索应用系统",
+                "tips": "没有数据或者未添加",
+                "repeat": "不能重复添加相同的应用"
             }
         },
         "database": {