Synchronize the latest backend code to adapt dss1.1.0 and linkis1.1.1.

Author: jinyangrao

server/README.md

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>visualis</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.0.0-rc1</version>
+        <version>1.2.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,8 +22,8 @@
         <jdk.compile.version>1.8</jdk.compile.version>
         <skipTests>true</skipTests>
 
-        <apache.linkis.version>1.1.1</apache.linkis.version>
-        <opensource.dss.version>1.0.1</opensource.dss.version>
+        <apache.linkis.version>1.1.0</apache.linkis.version>
+        <opensource.dss.version>1.1.0</opensource.dss.version>
 
         <elasticsearch.version>5.1.2</elasticsearch.version>
         <spring.boot.version>2.3.7.RELEASE</spring.boot.version>
@@ -37,6 +37,14 @@
     </properties>
 
     <dependencies>
+
+        <!--行内差异化变量改造-->
+        <dependency>
+            <groupId>cn.webank.bsp</groupId>
+            <artifactId>encrypt</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
@@ -431,7 +439,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.83</version>
+            <version>1.2.70</version>
         </dependency>
 
         <dependency>
@@ -693,4 +701,4 @@
     </build>
 
 
-</project>
+</project>

server/pom.xml

@@ -0,0 +1,5 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class CommonContant {
+    public static String URL = "url";
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/CommonContant.java

@@ -0,0 +1,11 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class DashboardContant {
+
+    public static String DASHBOARD_ID = "dashboardId";
+
+    public static String DASHBOARD = "dashboard";
+
+    public static String NAME = "name";
+
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/DashboardContant.java

@@ -0,0 +1,4 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class DisplayContant {
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/DisplayContant.java

@@ -0,0 +1,4 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class ProjectContant {
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/ProjectContant.java

@@ -0,0 +1,4 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class SourceContant {
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/SourceContant.java

@@ -0,0 +1,4 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class UserContant {
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/UserContant.java

@@ -0,0 +1,6 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class ViewContant {
+
+    public static String VIEW_ID = "viewId";
+}

server/src/main/java/com/webank/wedatasphere/dss/visualis/content/ViewContant.java

@@ -0,0 +1,37 @@
+package com.webank.wedatasphere.dss.visualis.content;
+
+public class WidgetContant {
+
+    public static String WIDGET_CONFIG_TEMPLATE = "{${context_info}\"data\":[],\"cols\":[],\"rows\":[]," +
+            "\"metrics\":[],\"filters\":[],\"color\":{\"title\":\"颜色\",\"type\":\"category\"," +
+            "\"value\":{\"all\":\"#509af2\"},\"items\":[]},\"chartStyles\":{\"pivot\":{\"fontFamily\":\"PingFang SC\"," +
+            "\"fontSize\":\"12\",\"color\":\"#666\",\"lineStyle\":\"solid\",\"lineColor\":\"#D9D9D9\"," +
+            "\"headerBackgroundColor\":\"#f7f7f7\"}},\"selectedChart\":1,\"pagination\":{\"pageNo\":0," +
+            "\"pageSize\":0,\"withPaging\":false,\"totalCount\":0},\"renderType\":\"clear\",\"orders\":[]," +
+            "\"mode\":\"pivot\",\"model\":${model_content},\"controls\":[],\"computed\":[],\"cache\":false,\"expired\":300,\"autoLoadData\":true}";
+
+    public static String WIDGET_CHART_CONFIG_TEMPLE = "{${context_info}\"data\":[],\"pagination\":{\"pageNo\":0," +
+            "\"pageSize\":0,\"totalCount\":0,\"withPaging\":false}," +
+            "\"cols\":[],\"rows\":[],\"metrics\":[],\"secondaryMetrics\":[]," +
+            "\"filters\":[],\"chartStyles\":{\"pivot\":{\"fontFamily\":\"PingFangSC\"," +
+            "\"fontSize\":\"12\",\"color\":\"#666\",\"lineStyle\":\"solid\"," +
+            "\"lineColor\":\"#D9D9D9\",\"headerBackgroundColor\":\"#f7f7f7\"}," +
+            "\"table\":{\"fontFamily\":\"PingFangSC\",\"fontSize\":\"12\"," +
+            "\"color\":\"#666\",\"lineStyle\":\"solid\",\"lineColor\":\"#D9D9D9\"," +
+            "\"headerBackgroundColor\":\"#f7f7f7\",\"headerConfig\":[],\"columnsConfig\":[]," +
+            "\"leftFixedColumns\":[],\"rightFixedColumns\":[],\"headerFixed\":true," +
+            "\"autoMergeCell\":false,\"bordered\":true,\"size\":\"small\",\"withPaging\":true," +
+            "\"pageSize\":\"5000\",\"withNoAggregators\":false}},\"selectedChart\":1," +
+            "\"orders\":[],\"mode\":\"chart\",\"model\":${model_content},\"controls\":[],\"computed\":[]," +
+            "\"cache\":false,\"expired\":300,\"autoLoadData\":true,\"query\":null}";
+
+    public static String WIDGET_ID = "widgetId";
+
+    public static String NAME = "name";
+
+    public static String WIDGET = "widget";
+
+    public static String WIDGETS = "widgets";
+
+
+}