modify some code to adopt dss1.1.0.

Author: jinyangrao

db/ddl.sql

@@ -31,21 +31,21 @@ CREATE TABLE `visualis_project` (
 
 ---- visualis使用这个表做权限管理
 --DROP TABLE IF EXISTS `linkis_user`;
---CREATE TABLE `linkis_user` (
---  `id` bigint(20) NOT NULL AUTO_INCREMENT,
---  `email` varchar(255) DEFAULT NULL,
---  `username` varchar(255) NOT NULL,
---  `password` varchar(255) DEFAULT NULL,
---  `admin` tinyint(1) DEFAULT NULL COMMENT 'If it is an administrator',
---  `active` tinyint(1) DEFAULT NULL COMMENT 'If it is active',
---  `name` varchar(255) DEFAULT NULL COMMENT 'User name',
---  `description` varchar(255) DEFAULT NULL,
---  `department` varchar(255) DEFAULT NULL,
---  `avatar` varchar(255) DEFAULT NULL COMMENT 'Path of the avator',
---  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
---  `create_by` bigint(20) DEFAULT '0',
---  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
---  `update_by` bigint(20) DEFAULT '0',
---  `is_first_login` bit(1) DEFAULT NULL COMMENT 'If it is the first time to log in',
---  PRIMARY KEY (`id`)
---) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `linkis_user` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `email` varchar(255) DEFAULT NULL,
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `admin` tinyint(1) DEFAULT NULL COMMENT 'If it is an administrator',
+  `active` tinyint(1) DEFAULT NULL COMMENT 'If it is active',
+  `name` varchar(255) DEFAULT NULL COMMENT 'User name',
+  `description` varchar(255) DEFAULT NULL,
+  `department` varchar(255) DEFAULT NULL,
+  `avatar` varchar(255) DEFAULT NULL COMMENT 'Path of the avator',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `create_by` bigint(20) DEFAULT '0',
+  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_by` bigint(20) DEFAULT '0',
+  `is_first_login` bit(1) DEFAULT NULL COMMENT 'If it is the first time to log in',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

server/src/main/java/com/webank/wedatasphere/dss/visualis/utils/HttpUtils.java

@@ -10,6 +10,7 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.cookie.BasicClientCookie;
 import org.apache.http.util.EntityUtils;
+import org.apache.linkis.errorcode.client.ClientConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,8 +21,7 @@
 import java.util.Date;
 
 public class HttpUtils {
-    private static final String GATEWAY_URL = CommonConfig.GATEWAY_PROTOCOL().getValue() +
-            CommonConfig.GATEWAY_IP().getValue() + ":" + CommonConfig.GATEWAY_PORT().getValue();
+    private static final String GATEWAY_URL = ClientConfiguration.getGatewayUrl();
     private static final String DATABASE_URL = GATEWAY_URL + CommonConfig.DB_URL_SUFFIX().getValue();
     private static final String TABLE_URL = GATEWAY_URL + CommonConfig.TABLE_URL_SUFFIX().getValue();
     private static final String COLUMN_URL = GATEWAY_URL + CommonConfig.COLUMN_URL_SUFFIX().getValue();

server/src/main/scala/com/webank/wedatasphere/dss/visualis/configuration/CommonConfig.scala

@@ -2,24 +2,14 @@ package com.webank.wedatasphere.dss.visualis.configuration
 
 import org.apache.linkis.common.conf.CommonVars
 
-/**
- * Created by allenlliu on 2019/1/26.
- */
+
 object CommonConfig {
   /**
    * 接口越权检测
    * */
   val CHECK_PROJECT_USER = CommonVars("wds.dss.visualis.check.project.user", false)
 
   val ENGINE_DEFAULT_LIMIT = CommonVars("wds.dss.engine.default.limit", 5000)
-  /**
-   * this is the configuration to get the hive database source
-   */
-  val GATEWAY_IP = CommonVars("wds.dss.visualis.gateway.ip", "")
-
-  val GATEWAY_PORT = CommonVars("wds.dss.visualis.gateway.port", "")
-
-  val GATEWAY_PROTOCOL = CommonVars("wds.dss.visualis.gateway.protocol", "http://")
 
   val DB_URL_SUFFIX = CommonVars("wds.dss.visualis.database.url", "/api/rest_j/v1/datasource/dbs")
 

server/src/main/scala/com/webank/wedatasphere/dss/visualis/utils/VisualisUtils.scala

@@ -16,9 +16,6 @@ import edp.core.model.{BaseSource, PaginateWithQueryColumns}
 import edp.davinci.model.View
 import org.apache.linkis.adapt.LinkisUtils
 
-/**
-  * Created by johnnwang on 2019/1/23.
-  */
 object VisualisUtils {
 
   val sender = Sender.getSender(EntranceConfiguration.QUERY_PERSISTENCE_SPRING_APPLICATION_NAME.getValue)