From 441b75fed27ac8066f7197424155d84475a1ee11 Mon Sep 17 00:00:00 2001
From: peacewong <wpeace1212@gmail.com>
Date: Fri, 29 Nov 2019 15:12:06 +0800
Subject: [PATCH 1/3] update gateway conf add token

---
 .../src/main/resources/linkis.properties                    | 6 ++++--
 .../src/main/resources/token.properties                     | 5 +++++
 .../springcloudgateway/src/main/resources/linkis.properties | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 gateway/gateway-ujes-support/src/main/resources/token.properties

diff --git a/gateway/gateway-ujes-support/src/main/resources/linkis.properties b/gateway/gateway-ujes-support/src/main/resources/linkis.properties
index ed296b2c84..786777975e 100644
--- a/gateway/gateway-ujes-support/src/main/resources/linkis.properties
+++ b/gateway/gateway-ujes-support/src/main/resources/linkis.properties
@@ -27,6 +27,8 @@ wds.linkis.server.web.session.timeout=1h
 
 wds.linkis.gateway.conf.enable.proxy.user=false
 
-wds.linkis.gateway.conf.url.pass.auth=/dws/,/api/rest_j/v1/entrance/
+wds.linkis.gateway.conf.url.pass.auth=/dss/
 
-wds.linkis.gateway.admin.user=hadoop
\ No newline at end of file
+wds.linkis.gateway.admin.user=hadoop
+
+wds.linkis.gateway.conf.enable.token.auth=true
\ No newline at end of file
diff --git a/gateway/gateway-ujes-support/src/main/resources/token.properties b/gateway/gateway-ujes-support/src/main/resources/token.properties
new file mode 100644
index 0000000000..136141cebf
--- /dev/null
+++ b/gateway/gateway-ujes-support/src/main/resources/token.properties
@@ -0,0 +1,5 @@
+QML-AUTH=*
+BML-AUTH=*
+WS-AUTH=*
+dss-AUTH=*
+QUALITIS-AUTH=*
\ No newline at end of file
diff --git a/gateway/springcloudgateway/src/main/resources/linkis.properties b/gateway/springcloudgateway/src/main/resources/linkis.properties
index 91497bbdb3..fa61ae88b5 100644
--- a/gateway/springcloudgateway/src/main/resources/linkis.properties
+++ b/gateway/springcloudgateway/src/main/resources/linkis.properties
@@ -16,7 +16,6 @@
 
 #wds.linkis.test.mode=true
 
-bdp.dataworkcloud.server.version=v1
 
 wds.linkis.ldap.proxy.url=
 wds.linkis.ldap.proxy.baseDN=

From 0a605610210f96b70ba55f85427eb359c386d9d5 Mon Sep 17 00:00:00 2001
From: peacewong <wpeace1212@gmail.com>
Date: Fri, 29 Nov 2019 15:13:06 +0800
Subject: [PATCH 2/3] Fix issue:public service pom  import the io-netty jar
 Closes #160

---
 publicService/pom.xml                            | 6 ++++++
 publicService/src/main/assembly/distribution.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/publicService/pom.xml b/publicService/pom.xml
index 891d4b82ca..5d4ebf202d 100644
--- a/publicService/pom.xml
+++ b/publicService/pom.xml
@@ -28,6 +28,12 @@
     <artifactId>publicservice</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.6.2.Final</version>
+        </dependency>
+
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
             <artifactId>linkis-application</artifactId>
diff --git a/publicService/src/main/assembly/distribution.xml b/publicService/src/main/assembly/distribution.xml
index 355cd47550..a8948f88e4 100644
--- a/publicService/src/main/assembly/distribution.xml
+++ b/publicService/src/main/assembly/distribution.xml
@@ -128,7 +128,7 @@
                 <exclude>commons-net:commons-net:jar</exclude>
                 <exclude>commons-pool:commons-pool:jar</exclude>
                 <exclude>io.micrometer:micrometer-core:jar</exclude>
-                <exclude>io.netty:netty:jar</exclude>
+                <!--<exclude>io.netty:netty:jar</exclude>-->
                 <exclude>io.netty:netty-all:jar</exclude>
                 <exclude>io.netty:netty-buffer:jar</exclude>
                 <exclude>io.netty:netty-codec:jar</exclude>

From 40e3f8e81196c10b571ebf22c3e56fffcaa76a8e Mon Sep 17 00:00:00 2001
From: peacewong <wpeace1212@gmail.com>
Date: Fri, 29 Nov 2019 15:15:59 +0800
Subject: [PATCH 3/3] publicService add gateway url conf

---
 publicService/conf/linkis.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/publicService/conf/linkis.properties b/publicService/conf/linkis.properties
index 5c93ff9521..74ac6c4f24 100644
--- a/publicService/conf/linkis.properties
+++ b/publicService/conf/linkis.properties
@@ -47,5 +47,6 @@ wds.linkis.workspace.filesystem.hdfsuserrootpath.suffix=/
 
 ##UDF
 wds.linkis.storage.is.share.node=true
-wds.linkis.udf.hive.exec.path=/appcom/hive-exec-1.2.1.jar
+wds.linkis.gateway.ip=127.0.0.1
+wds.linkis.gateway.port=9001