Merge pull request #161 from peacewong/master

The publicservice module adds the import of the io-netty package for dispatch use in the client of the filesystem
apache · Nov 29, 2019 · cc4f8ff · cc4f8ff
2 parents 8c418ab + 40e3f8e
commit cc4f8ff
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git 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
+wds.linkis.gateway.admin.user=hadoop
+
+wds.linkis.gateway.conf.enable.token.auth=true
diff --git a/gateway/gateway-ujes-support/src/main/resources/token.properties b/gateway/gateway-ujes-support/src/main/resources/token.properties
@@ -0,0 +1,5 @@
+QML-AUTH=*
+BML-AUTH=*
+WS-AUTH=*
+dss-AUTH=*
+QUALITIS-AUTH=*
diff --git 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=

diff --git 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
 
diff --git 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
@@ -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>