You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/07 06:50:32 UTC
[incubator-linkis] branch dev-1.1.0-datasource updated (017b283 -> f999701)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 017b283 fix jdbc engine postgresql unsupport sql "show databases;" lead to exec fail (#1610)
new 982bc83 web build version
new 414ba0c build set useStrictFiltering to false
new ce95354 adjust classpath load order for mg-eureka
new 197c480 optimize start/install script
new f2193db adjust distribution.xml for datasource module
new 668dc49 upgrade spring.boot.version from 2.2.13 to 2.3.12
new a5eb711 optimize util of RestfulApiHelper:the attribute method is uniformly obtained through AOP
new 97b423e web adjust dataSourceApi.js url path
new ecb368f adjust known-dependencies.txt
new f999701 datasource:adjust dataSourceId parameter is unified as long type
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../conf/linkis-ps-data-source-manager.properties | 2 +-
.../conf/linkis-ps-metadatamanager.properties | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../assembly-combined/sbin/common.sh | 2 +
.../assembly-combined/sbin/ext/linkis-mg-eureka | 2 +-
.../sbin/ext/linkis-ps-data-source-manager | 4 +-
.../sbin/ext/linkis-ps-metadatamanager | 58 +----
.../assembly-combined/sbin/linkis-start-all.sh | 60 +++--
.../assembly-combined/sbin/linkis-stop-all.sh | 29 ++-
assembly-combined-package/bin/install.sh | 13 +-
assembly-combined-package/deploy-config/db.sh | 9 +-
.../deploy-config/linkis-env.sh | 36 +--
linkis-commons/linkis-hadoop-common/pom.xml | 12 +-
.../src/main/assembly/distribution.xml | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../io_file/src/main/assembly/distribution.xml | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../request/DataSourceTestConnectAction.scala | 8 +-
.../client/request/ExpireDataSourceAction.scala | 8 +-
.../request/MetadataGetPartitionsAction.scala | 8 +-
.../request/PublishDataSourceVersionAction.scala | 8 +-
.../client/request/UpdateDataSourceAction.scala | 8 +-
.../request/UpdateDataSourceParameterAction.scala | 8 +-
.../linkis-datasource-manager/server/pom.xml | 30 +--
.../server/src/main/assembly/distribution.xml | 147 +++++++++++-
.../core/restful/DataSourceAdminRestfulApi.java | 6 -
.../core/restful/DataSourceCoreRestfulApi.java | 22 +-
.../core/restful/DataSourceOperateRestfulApi.java | 1 -
.../core/restful/RestfulApiHelper.java | 31 ++-
.../server/src/main/assembly/distribution.xml | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../kafka/src/main/assembly/distribution.xml | 2 +-
.../mysql/src/main/assembly/distribution.xml | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
pom.xml | 7 +-
tool/dependencies/known-dependencies.txt | 260 ++++++++++-----------
web/.env | 2 +-
web/package.json | 2 +-
.../apps/linkis/module/datasource/dataSourceApi.js | 58 ++---
web/src/apps/linkis/module/header/index.vue | 8 +-
web/vue.config.js | 5 +-
41 files changed, 508 insertions(+), 368 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/10: build set useStrictFiltering to false
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 414ba0c1c58ad6fccc230cd3ab31472d7fc6b9cd
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 2 23:57:15 2022 +0800
build set useStrictFiltering to false
---
.../public-module-combined/src/main/assembly/distribution.xml | 2 +-
.../linkis-engineconn-manager-server/src/main/assembly/distribution.xml | 2 +-
.../linkis-application-manager/src/main/assembly/distribution.xml | 2 +-
.../engineconn-plugins/io_file/src/main/assembly/distribution.xml | 2 +-
.../linkis-engineconn-plugin-server/src/main/assembly/distribution.xml | 2 +-
.../linkis-datasource-manager/server/src/main/assembly/distribution.xml | 2 +-
.../linkis-metadata-manager/server/src/main/assembly/distribution.xml | 2 +-
.../service/elasticsearch/src/main/assembly/distribution.xml | 2 +-
.../service/kafka/src/main/assembly/distribution.xml | 2 +-
.../service/mysql/src/main/assembly/distribution.xml | 2 +-
.../linkis-gateway-server-support/src/main/assembly/distribution.xml | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/assembly-combined-package/assembly-combined/public-module-combined/src/main/assembly/distribution.xml b/assembly-combined-package/assembly-combined/public-module-combined/src/main/assembly/distribution.xml
index d9cdcc6..a714575 100644
--- a/assembly-combined-package/assembly-combined/public-module-combined/src/main/assembly/distribution.xml
+++ b/assembly-combined-package/assembly-combined/public-module-combined/src/main/assembly/distribution.xml
@@ -35,7 +35,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<!-- <exclude>io.netty:netty-buffer*</exclude>-->
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
index d828bc1..25ac4de 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
@@ -35,7 +35,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>com.google.code.findbugs:annotations:jar</exclude>
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml
index 552159a..469d78e 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml
@@ -35,7 +35,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>com.google.code.findbugs:annotations:jar</exclude>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
index 5677abc..7a9341b 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
@@ -36,7 +36,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
</dependencySets>
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
index d84ddce..37195bc 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
@@ -35,7 +35,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<!-- <exclude>commons-httpclient:commons-httpclient:jar</exclude>-->
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
index d7fa030..0ee951a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
@@ -36,7 +36,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
</dependencySets>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml
index 4ce2921..9b7bcce 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml
@@ -36,7 +36,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
</dependencySets>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml
index eb8c1eb..b972b01 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml
@@ -36,7 +36,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
</dependencySets>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml
index efb3a66..c63e503 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml
@@ -36,7 +36,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml
index e8c3b46..8382a36 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml
@@ -36,7 +36,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
</dependencySets>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml
index 0a97434..ff0d278 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml
@@ -35,7 +35,7 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
- <useStrictFiltering>true</useStrictFiltering>
+ <useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet>
</dependencySets>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 10/10: datasource:adjust dataSourceId parameter is unified as long type
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit f999701692d0456b13734d498f336f9660026ed0
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 12:28:49 2022 +0800
datasource:adjust dataSourceId parameter is unified as long type
---
.../datasource/client/request/DataSourceTestConnectAction.scala | 8 ++++----
.../linkis/datasource/client/request/ExpireDataSourceAction.scala | 8 ++++----
.../datasource/client/request/MetadataGetPartitionsAction.scala | 8 ++++----
.../client/request/PublishDataSourceVersionAction.scala | 8 ++++----
.../linkis/datasource/client/request/UpdateDataSourceAction.scala | 8 ++++----
.../client/request/UpdateDataSourceParameterAction.scala | 8 ++++----
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
index 49d45cf..3704db2 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.httpclient.request.PutAction
class DataSourceTestConnectAction private() extends PutAction with DataSourceAction {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var version: String = _
@@ -34,7 +34,7 @@ class DataSourceTestConnectAction private() extends PutAction with DataSourceAct
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId, version, "op", "connect")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, version, "op", "connect")
override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
}
@@ -43,7 +43,7 @@ object DataSourceTestConnectAction {
class Builder private[DataSourceTestConnectAction]() {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var version: String = _
def setUser(user: String): Builder = {
@@ -51,7 +51,7 @@ object DataSourceTestConnectAction {
this
}
- def setDataSourceId(dataSourceId: String): Builder = {
+ def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
index ef20f16..0200b7d 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
@@ -27,26 +27,26 @@ class ExpireDataSourceAction extends PutAction with DataSourceAction {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
override def setUser(user: String): Unit = this.user = user
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId, "expire")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId.toString, "expire")
}
object ExpireDataSourceAction{
def builder(): Builder = new Builder
class Builder private[ExpireDataSourceAction]() {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
def setUser(user: String): Builder = {
this.user = user
this
}
- def setDataSourceId(dataSourceId: String): Builder = {
+ def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
index 9bbde2e..def90b3 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
@@ -23,11 +23,11 @@ import org.apache.linkis.httpclient.request.GetAction
class MetadataGetPartitionsAction extends GetAction with DataSourceAction {
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var database: String = _
private var table: String = _
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "partitions", dataSourceId, "db", database, "table", table)
+ override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "partitions", dataSourceId.toString, "db", database, "table", table)
private var user: String = _
@@ -41,7 +41,7 @@ object MetadataGetPartitionsAction {
def builder(): Builder = new Builder
class Builder private[MetadataGetPartitionsAction]() {
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var database: String = _
private var table: String = _
private var system: String = _
@@ -52,7 +52,7 @@ object MetadataGetPartitionsAction {
this
}
- def setDataSourceId(dataSourceId: String): Builder = {
+ def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
index e6a7b8e..404abd5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
@@ -26,21 +26,21 @@ import org.apache.linkis.httpclient.request.POSTAction
class PublishDataSourceVersionAction extends POSTAction with DataSourceAction{
override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var versionId: String = _
override def setUser(user: String): Unit = this.user = user
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "publish", dataSourceId, versionId)
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "publish", dataSourceId.toString, versionId)
}
object PublishDataSourceVersionAction {
def builder(): Builder = new Builder
class Builder private[PublishDataSourceVersionAction]() {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var versionId: String = _
def setUser(user: String): Builder = {
@@ -48,7 +48,7 @@ object PublishDataSourceVersionAction {
this
}
- def setDataSourceId(dataSourceId: String): Builder = {
+ def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
index 051d80f..9ef5cd0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
@@ -30,20 +30,20 @@ class UpdateDataSourceAction extends PutAction with DataSourceAction{
override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
override def setUser(user: String): Unit = this.user = user
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId, "json")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId.toString, "json")
}
object UpdateDataSourceAction {
def builder(): Builder = new Builder
class Builder private[UpdateDataSourceAction]() {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var payload: util.Map[String, Any] = new util.HashMap[String, Any]
def setUser(user: String): Builder = {
@@ -51,7 +51,7 @@ object UpdateDataSourceAction {
this
}
- def setDataSourceId(dataSourceId: String): Builder = {
+ def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
index ee38dea..8392262 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
@@ -29,20 +29,20 @@ class UpdateDataSourceParameterAction extends POSTAction with DataSourceAction {
override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
override def setUser(user: String): Unit = this.user = user
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "parameter", dataSourceId, "json")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "parameter", dataSourceId.toString, "json")
}
object UpdateDataSourceParameterAction {
def builder(): Builder = new Builder
class Builder private[UpdateDataSourceParameterAction]() {
private var user: String = _
- private var dataSourceId: String = _
+ private var dataSourceId: Long = _
private var payload: util.Map[String, Any] = new util.HashMap[String, Any]
def setUser(user: String): Builder = {
@@ -50,7 +50,7 @@ object UpdateDataSourceParameterAction {
this
}
- def setDataSourceId(dataSourceId: String): Builder = {
+ def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/10: optimize start/install script
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 197c48035eb4a3ffa05c83a6ee91d8bd6efa11fb
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 03:05:22 2022 +0800
optimize start/install script
---
.../conf/linkis-ps-data-source-manager.properties | 2 +-
.../conf/linkis-ps-metadatamanager.properties | 2 +-
.../assembly-combined/sbin/common.sh | 2 +
.../sbin/ext/linkis-ps-data-source-manager | 4 +-
.../sbin/ext/linkis-ps-metadatamanager | 58 +++------------------
.../assembly-combined/sbin/linkis-start-all.sh | 60 +++++++++++++++-------
.../assembly-combined/sbin/linkis-stop-all.sh | 29 ++++++++---
assembly-combined-package/bin/install.sh | 13 ++++-
assembly-combined-package/deploy-config/db.sh | 9 +++-
.../deploy-config/linkis-env.sh | 36 +++++++------
10 files changed, 118 insertions(+), 97 deletions(-)
diff --git a/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties b/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties
index 0d374b0..b4f0d63 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis-ps-data-source-manager.properties
@@ -31,7 +31,7 @@ hive.meta.password=
wds.linkis.metadata.hive.encode.enabled=false
##Spring
-spring.server.port=9106
+spring.server.port=9109
spring.spring.main.allow-bean-definition-overriding=true
spring.spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
diff --git a/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties b/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
index 1336c86..3a34831 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
@@ -18,4 +18,4 @@ wds.linkis.server.restful.scan.packages=org.apache.linkis.metadatamanager.server
wds.linkis.server.dsm.app.name=linkis-ps-data-source-manager
##Spring
-spring.server.port=8399
+spring.server.port=9110
diff --git a/assembly-combined-package/assembly-combined/sbin/common.sh b/assembly-combined-package/assembly-combined/sbin/common.sh
index 6d79a25..866d74b 100644
--- a/assembly-combined-package/assembly-combined/sbin/common.sh
+++ b/assembly-combined-package/assembly-combined/sbin/common.sh
@@ -17,6 +17,8 @@
#Actively load user env
source ~/.bash_profile
+source $LINKIS_CONF_DIR/linkis-env.sh
+
export local_host="`hostname --fqdn`"
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager
index 2b95cfa..200305b 100644
--- a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager
+++ b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-data-source-manager
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# description: cs start cmd
+# description: data-source-manager start cmd
#
# Modified for Linkis 1.1.0
#
@@ -22,7 +22,7 @@
export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-data-source-manager"
-export DEBUG_PORT=10019
+#export DEBUG_PORT=
export SERVER_CLASS=org.apache.linkis.datasourcemanager.core.LinkisDataSourceManagerApplication
diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
index c6a666f..d7b78f6 100644
--- a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
+++ b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
@@ -13,63 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# description: cs start cmd
+# description: ps-metadatamanager start cmd
#
# Modified for Linkis 1.1.0
#
-source $LINKIS_CONF_DIR/linkis-env.sh
-
-SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadatamanager"
+export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadatamanager"
+#export DEBUG_PORT=
export SERVER_CLASS=org.apache.linkis.metadatamanager.server.LinkisMetadataManagerApplication
-export LINKIS_LOG_DIR=$LINKIS_HOME/logs
-if test -z "$SERVER_HEAP_SIZE"
-then
- export SERVER_HEAP_SIZE="512M"
-fi
-
-if [ "$DEBUG_PORT" ];
-then
- export DEBUG_CMD="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT"
-fi
-
-if test -z "$SERVER_JAVA_OPTS"
-then
- export SERVER_JAVA_OPTS=" -DserviceName=$SERVER_NAME -Xmx$SERVER_HEAP_SIZE -XX:+UseG1GC -Xloggc:$LINKIS_LOG_DIR/${SERVER_NAME}-gc.log $DEBUG_CMD "
-fi
-
-## conf dir
-export SERVER_CONF_PATH=$LINKIS_CONF_DIR
-
-## commons lib
-export LINKIS_COMMONS_LIB=$LINKIS_HOME/$LINKIS_PUBLIC_MODULE
-if [ ! -r "$LINKIS_COMMONS_LIB" ] ; then
- echo "linkis commons lib not exists $LINKIS_COMMONS_LIB"
- exit 1
-fi
-
-## server lib
-export SERVER_LIB=$LINKIS_HOME/lib/$SERVER_SUFFIX
-if [ ! -r "$SERVER_LIB" ] ; then
- echo "server lib not exists $SERVER_LIB"
- exit 1
-fi
-# set the wds.linkis.server.mdm.service.lib.dir to ${SERVER_LIB}/service
-SERVER_JAVA_OPTS=" -Dwds.linkis.server.mdm.service.lib.dir=${SERVER_LIB}/service"${SERVER_JAVA_OPTS}
-
-## set class path
-export SERVER_CLASS_PATH=$SERVER_CONF_PATH:$LINKIS_COMMONS_LIB/*:$SERVER_LIB/*
-
-nohup java $SERVER_JAVA_OPTS -cp $SERVER_CLASS_PATH $SERVER_CLASS $SPRING_ARGS 2>&1 > $LINKIS_LOG_DIR/${SERVER_NAME}.out &
-pid=$!
-sleep 2
-if [[ -z "${pid}" ]]; then
- echo "server $SERVER_NAME start failed!"
+export COMMON_START_BIN=$LINKIS_HOME/sbin/ext/linkis-common-start
+if [[ ! -f "${COMMON_START_BIN}" ]]; then
+ echo "The $COMMON_START_BIN does not exist!"
exit 1
else
- echo "server $SERVER_NAME start succeeded!"
- echo $pid > $SERVER_PID
-fi
+ sh $COMMON_START_BIN
+fi
\ No newline at end of file
diff --git a/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh b/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
index bf7520f..b48d251 100644
--- a/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
+++ b/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
@@ -58,18 +58,18 @@ sleep 3
}
-#eureka
+#linkis-mg-eureka
export SERVER_NAME="mg-eureka"
SERVER_IP=$EUREKA_INSTALL_IP
startApp
-#gateway
+#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
startApp
-#publicenservice
+#linkis-ps-publicservice
SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
startApp
@@ -77,7 +77,7 @@ startApp
-#manager
+#linkis-cg-linkismanage
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
startApp
@@ -85,27 +85,43 @@ startApp
sleep 15
-#cs-server
+#linkis-ps-cs
SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
startApp
-#entrnace
+#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
startApp
-#ecm
+#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
startApp
-#ecp
+#linkis-cg-engineplugin(ecp)
SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
startApp
+
+if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_IP
+ startApp
+
+ #linkis-ps-metadatamanager
+ SERVER_NAME="ps-metadatamanager"
+ SERVER_IP=$METADATA_MANAGER_PORT
+ startApp
+fi
+
+
+
+
echo "start-all shell script executed completely"
echo "Start to check all linkis microservice"
@@ -136,50 +152,58 @@ echo "<-------------------------------->"
sleep 3
}
-#eureka
+#linkis-mg-eureka
export SERVER_NAME="mg-eureka"
SERVER_IP=$EUREKA_INSTALL_IP
checkServer
-#gateway
+#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
checkServer
-#publicenhancements
+#linkis-ps-publicservice
SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
checkServer
-#cs-server
+#linkis-ps-cs
SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
checkServer
-#manager
+#linkis-cg-linkismanager
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
checkServer
-#entrnace
+#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
checkServer
-#ecm
+#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
checkServer
-#ecp
+#linkis-cg-engineplugin(ecp)
SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
checkServer
+if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_IP
+ checkServer
-
-
+ #linkis-ps-metadatamanager
+ SERVER_NAME="ps-metadatamanager"
+ SERVER_IP=$METADATA_MANAGER_IP
+ checkServer
+fi
echo "Linkis started successfully"
diff --git a/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh b/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
index e17030e..0054208 100644
--- a/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
+++ b/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
@@ -55,43 +55,56 @@ echo "<-------------------------------->"
-#gateway
+#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
stopApp
-#cs-server
+#linkis-ps-cs
SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
stopApp
-#ecm
+if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_IP
+ stopApp
+
+ #linkis-ps-metadatamanager
+ SERVER_NAME="ps-metadatamanager"
+ SERVER_IP=$METADATA_MANAGER_IP
+ stopApp
+fi
+
+
+#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
stopApp
-#entrnace
+#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
stopApp
-#ecp
+#linkis-cg-engineplugin(ecp)
SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
stopApp
-#publicservice
+#linkis-ps-publicservice
SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
stopApp
-#manager
+#linkis-cg-linkismanager
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
stopApp
-#eureka
+#linkis-mg-eureka
export SERVER_NAME="mg-eureka"
SERVER_IP=$EUREKA_INSTALL_IP
stopApp
diff --git a/assembly-combined-package/bin/install.sh b/assembly-combined-package/bin/install.sh
index d10f3d6..54056b9 100644
--- a/assembly-combined-package/bin/install.sh
+++ b/assembly-combined-package/bin/install.sh
@@ -357,9 +357,20 @@ then
sed -i ${txt} "s#spring.server.port.*#spring.server.port=$PUBLICSERVICE_PORT#g" $publicservice_conf
fi
+metadatamanage_conf=$LINKIS_HOME/conf/linkis-ps-metadatamanager.properties
+if [ "$METADATA_MANAGER_PORT" != "" ]
+then
+ sed -i ${txt} "s#spring.server.port.*#spring.server.port=$METADATA_MANAGER_PORT#g" $metadatamanage_conf
+fi
+
##datasource
-datasource_conf=$LINKIS_HOME/conf/linkis-ps-publicservice.properties
+datasource_conf=$LINKIS_HOME/conf/linkis-ps-data-source-manager.properties
+if [ "$DATASOURCE_MANAGER_PORT" != "" ]
+then
+ sed -i ${txt} "s#spring.server.port.*#spring.server.port=$DATASOURCE_MANAGER_PORT#g" $datasource_conf
+fi
+
echo "update conf $datasource_conf"
if [ "$HIVE_META_URL" != "" ]
then
diff --git a/assembly-combined-package/deploy-config/db.sh b/assembly-combined-package/deploy-config/db.sh
index 0d6ec69..2da3d5f 100644
--- a/assembly-combined-package/deploy-config/db.sh
+++ b/assembly-combined-package/deploy-config/db.sh
@@ -19,4 +19,11 @@ MYSQL_HOST=
MYSQL_PORT=
MYSQL_DB=
MYSQL_USER=
-MYSQL_PASSWORD=
\ No newline at end of file
+MYSQL_PASSWORD=
+
+
+### Provide the DB information of Hive metadata database.
+### Attention! If there are special characters like "&", they need to be enclosed in quotation marks.
+HIVE_META_URL=""
+HIVE_META_USER=""
+HIVE_META_PASSWORD=""
\ No newline at end of file
diff --git a/assembly-combined-package/deploy-config/linkis-env.sh b/assembly-combined-package/deploy-config/linkis-env.sh
index a5412db..a9b678b 100644
--- a/assembly-combined-package/deploy-config/linkis-env.sh
+++ b/assembly-combined-package/deploy-config/linkis-env.sh
@@ -45,12 +45,6 @@ ENGINECONN_ROOT_PATH=/appcom/tmp
### Path to store job ResultSet:file or hdfs path
RESULT_SET_ROOT_PATH=hdfs:///tmp/linkis ##hdfs:// required
-### Provide the DB information of Hive metadata database.
-### Attention! If there are special characters like "&", they need to be enclosed in quotation marks.
-HIVE_META_URL=""
-HIVE_META_USER=""
-HIVE_META_PASSWORD=""
-
##YARN REST URL spark engine required
YARN_RESTFUL_URL=http://127.0.0.1:8088
@@ -74,7 +68,7 @@ SPARK_CONF_DIR=/appcom/config/spark-config
#SPARK_VERSION
#SPARK_VERSION=2.4.3
##HIVE_VERSION
-#HIVE_VERSION=1.2.1
+#HIVE_VERSION=2.3.3
#PYTHON_VERSION=python2
################### The install Configuration of all Micro-Services #####################
@@ -92,36 +86,45 @@ SPARK_CONF_DIR=/appcom/config/spark-config
EUREKA_PORT=20303
export EUREKA_PREFER_IP=false
-### Gateway install information
+##linkis-mg-gateway
#GATEWAY_INSTALL_IP=127.0.0.1
GATEWAY_PORT=9001
-### ApplicationManager
+##linkis-cg-linkismanager
#MANAGER_INSTALL_IP=127.0.0.1
MANAGER_PORT=9101
-### EngineManager
+##linkis-cg-engineconnmanager
#ENGINECONNMANAGER_INSTALL_IP=127.0.0.1
ENGINECONNMANAGER_PORT=9102
-
-### EnginePluginServer
+##linkis-cg-engineplugin
#ENGINECONN_PLUGIN_SERVER_INSTALL_IP=127.0.0.1
ENGINECONN_PLUGIN_SERVER_PORT=9103
-### LinkisEntrance
+##linkis-cg-entrance
#ENTRANCE_INSTALL_IP=127.0.0.1
ENTRANCE_PORT=9104
-### publicservice
+##linkis-ps-publicservice
#PUBLICSERVICE_INSTALL_IP=127.0.0.1
PUBLICSERVICE_PORT=9105
-### cs
+##linkis-ps-cs
#CS_INSTALL_IP=127.0.0.1
CS_PORT=9108
+
+##linkis-ps-data-source-manager
+#DATASOURCE_MANAGER_IP=127.0.0.1
+DATASOURCE_MANAGER_PORT=9109
+
+##linkis-ps-metadatamanager
+#METADATA_MANAGER_IP=127.0.0.1
+METADATA_MANAGER_PORT=9110
+
+
########################################################################################
## LDAP is for enterprise authorization, if you just want to have a try, ignore it.
@@ -142,3 +145,6 @@ LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
## If SKYWALKING_AGENT_PATH is set, the Linkis components will be started with Skywalking agent
#SKYWALKING_AGENT_PATH=/appcom/config/skywalking-agent/skywalking-agent.jar
+
+#If you want to start metadata related microservices, you can set this export ENABLE_METADATA_MANAGE=true
+export ENABLE_METADATA_MANAGER=false
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 09/10: adjust known-dependencies.txt
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit ecb368f586dbd21acdbb718a0fc9f06783fa972f
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 12:01:46 2022 +0800
adjust known-dependencies.txt
---
tool/dependencies/known-dependencies.txt | 260 +++++++++++++++----------------
1 file changed, 126 insertions(+), 134 deletions(-)
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index b346004..2123457 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -34,18 +34,17 @@ bcpkix-jdk15on-1.64.jar
bcprov-jdk15on-1.64.jar
bonecp-0.8.0.RELEASE.jar
caffeine-2.8.4.jar
-caffeine-2.8.5.jar
+caffeine-2.8.8.jar
calcite-core-1.10.0.jar
calcite-druid-1.10.0.jar
calcite-linq4j-1.10.0.jar
cglib-2.2.2.jar
checker-qual-3.4.0.jar
-checker-qual-3.4.1.jar
checker-qual-3.5.0.jar
+checker-qual-3.8.0.jar
chill-java-0.7.6.jar
chill_2.11-0.7.6.jar
classmate-1.5.1.jar
-commons-beanutils-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-beanutils-core-1.8.0.jar
commons-cli-1.2.jar
@@ -54,7 +53,7 @@ commons-codec-1.10.jar
commons-codec-1.14.jar
commons-collections-3.2.2.jar
commons-collections4-4.4.jar
-commons-compiler-3.1.2.jar
+commons-compiler-3.1.4.jar
commons-compress-1.20.jar
commons-compress-1.21.jar
commons-compress-1.4.1.jar
@@ -103,16 +102,16 @@ eigenbase-properties-1.1.5.jar
elasticsearch-rest-client-6.7.1.jar
error_prone_annotations-2.3.4.jar
error_prone_annotations-2.4.0.jar
-eureka-client-1.10.11.jar
-eureka-core-1.10.11.jar
+eureka-client-1.10.14.jar
+eureka-core-1.10.14.jar
evictor-1.0.0.jar
excel-streaming-reader-3.6.0.jar
failureaccess-1.0.1.jar
-feign-core-10.10.1.jar
+feign-core-10.12.jar
feign-form-3.8.0.jar
feign-form-spring-3.8.0.jar
-feign-hystrix-10.10.1.jar
-feign-slf4j-10.10.1.jar
+feign-hystrix-10.12.jar
+feign-slf4j-10.12.jar
flink-annotations-1.12.2.jar
flink-clients_2.11-1.12.2.jar
flink-connector-base-1.12.2.jar
@@ -146,7 +145,7 @@ flink-table-planner-blink_2.11-1.12.2.jar
flink-table-runtime-blink_2.11-1.12.2.jar
flink-yarn_2.11-1.12.2.jar
force-shading-1.12.2.jar
-freemarker-2.3.30.jar
+freemarker-2.3.31.jar
geronimo-annotation_1.0_spec-1.1.1.jar
geronimo-jaspic_1.0_spec-1.0.jar
geronimo-jta_1.1_spec-1.1.1.jar
@@ -174,7 +173,7 @@ hadoop-yarn-server-common-2.7.2.jar
hamcrest-2.2.jar
hamcrest-core-2.2.jar
hibernate-validator-5.1.2.Final.jar
-hibernate-validator-6.1.5.Final.jar
+hibernate-validator-6.1.7.Final.jar
hive-common-1.2.1.jar
hive-common-2.3.3.jar
hive-exec-2.3.3.jar
@@ -189,36 +188,34 @@ hive-storage-api-2.4.0.jar
hive-vector-code-gen-2.3.3.jar
htrace-core-3.1.0-incubating.jar
httpasyncclient-4.1.4.jar
-httpclient-4.5.12.jar
httpclient-4.5.13.jar
-httpcore-4.4.13.jar
httpcore-4.4.14.jar
-httpcore-nio-4.4.13.jar
-httpmime-4.5.12.jar
+httpcore-nio-4.4.14.jar
+httpmime-4.5.13.jar
httpmime-4.5.4.jar
hystrix-core-1.5.18.jar
-istack-commons-runtime-3.0.11.jar
+istack-commons-runtime-3.0.12.jar
ivy-2.4.0.jar
j2objc-annotations-1.3.jar
-jackson-annotations-2.11.1.jar
jackson-annotations-2.11.3.jar
-jackson-core-2.11.1.jar
+jackson-annotations-2.11.4.jar
+jackson-core-2.11.4.jar
jackson-core-asl-1.9.13.jar
jackson-core-asl-1.9.2.jar
-jackson-databind-2.11.1.jar
jackson-databind-2.11.3.jar
-jackson-dataformat-xml-2.11.1.jar
-jackson-datatype-jdk8-2.11.1.jar
-jackson-datatype-jsr310-2.11.1.jar
+jackson-databind-2.11.4.jar
+jackson-dataformat-xml-2.11.4.jar
+jackson-datatype-jdk8-2.11.4.jar
+jackson-datatype-jsr310-2.11.4.jar
jackson-jaxrs-1.9.13.jar
jackson-jaxrs-1.9.2.jar
jackson-mapper-asl-1.9.13.jar
jackson-mapper-asl-1.9.2.jar
-jackson-module-jaxb-annotations-2.11.1.jar
-jackson-module-parameter-names-2.11.1.jar
-jackson-module-paranamer-2.11.1.jar
-jackson-module-scala_2.11-2.11.1.jar
+jackson-module-jaxb-annotations-2.11.4.jar
+jackson-module-parameter-names-2.11.4.jar
+jackson-module-paranamer-2.11.4.jar
jackson-module-scala_2.11-2.11.3.jar
+jackson-module-scala_2.11-2.11.4.jar
jackson-xc-1.9.13.jar
jackson-xc-1.9.2.jar
jakarta.activation-1.2.2.jar
@@ -231,28 +228,25 @@ jakarta.validation-api-2.0.2.jar
jakarta.websocket-api-1.1.2.jar
jakarta.ws.rs-api-2.1.6.jar
jakarta.xml.bind-api-2.3.3.jar
-janino-3.1.2.jar
+janino-3.1.4.jar
javassist-3.19.0-GA.jar
javassist-3.24.0-GA.jar
-javax-websocket-client-impl-9.4.30.v20200611.jar
-javax-websocket-server-impl-9.4.30.v20200611.jar
+javassist-3.27.0-GA.jar
+javax-websocket-client-impl-9.4.42.v20210604.jar
+javax-websocket-server-impl-9.4.42.v20210604.jar
javax.activation-api-1.2.0.jar
javax.annotation-api-1.3.2.jar
-javax.el-2.2.4.jar
-javax.el-api-2.2.4.jar
javax.inject-1.jar
-javax.inject-2.4.0-b09.jar
javax.inject-2.4.0-b34.jar
javax.servlet-3.0.0.v201112011016.jar
javax.servlet-api-4.0.1.jar
javax.ws.rs-api-2.0.1.jar
jaxb-api-2.3.1.jar
jaxb-impl-2.2.3-1.jar
-jaxb-runtime-2.3.3.jar
-jboss-logging-3.4.1.Final.jar
+jaxb-runtime-2.3.4.jar
+jboss-logging-3.4.2.Final.jar
jdo-api-3.0.1.jar
jersey-apache-client4-1.19.1.jar
-jersey-bean-validation-2.16.jar
jersey-client-1.19.1.jar
jersey-client-1.19.4.jar
jersey-client-1.9.jar
@@ -275,18 +269,19 @@ jettison-1.1.jar
jettison-1.4.0.jar
jetty-6.1.26.jar
jetty-all-7.6.0.v20120127.jar
-jetty-client-9.4.30.v20200611.jar
-jetty-http-9.4.30.v20200611.jar
-jetty-io-9.4.30.v20200611.jar
-jetty-security-9.4.30.v20200611.jar
-jetty-server-9.4.30.v20200611.jar
+jetty-client-9.4.42.v20210604.jar
+jetty-http-9.4.42.v20210604.jar
+jetty-io-9.4.42.v20210604.jar
+jetty-security-9.4.42.v20210604.jar
+jetty-server-9.4.42.v20210604.jar
jetty-server-9.4.44.v20210927.jar
-jetty-servlet-9.4.30.v20200611.jar
+jetty-servlet-9.4.42.v20210604.jar
jetty-util-6.1.26.jar
-jetty-util-9.4.30.v20200611.jar
-jetty-webapp-9.4.30.v20200611.jar
+jetty-util-9.4.42.v20210604.jar
+jetty-util-ajax-9.4.42.v20210604.jar
+jetty-webapp-9.4.42.v20210604.jar
jetty-webapp-9.4.44.v20210927.jar
-jetty-xml-9.4.30.v20200611.jar
+jetty-xml-9.4.42.v20210604.jar
jline-0.9.94.jar
jline-2.12.jar
joda-time-2.3.jar
@@ -309,8 +304,8 @@ jsr305-3.0.2.jar
jsr311-api-1.1.1.jar
jta-1.1.jar
jul-to-slf4j-1.7.30.jar
-junit-4.13.jar
-kafka-clients-2.5.0.jar
+junit-4.13.2.jar
+kafka-clients-2.5.1.jar
kafka-clients-2.7.0.jar
kryo-2.24.0.jar
leveldbjni-all-1.8.jar
@@ -339,10 +334,10 @@ lz4-java-1.6.0.jar
lz4-java-1.7.1.jar
mail-1.4.1.jar
mchange-commons-java-0.2.15.jar
-metrics-core-4.1.11.jar
-metrics-json-4.1.11.jar
-metrics-jvm-4.1.11.jar
-micrometer-core-1.5.3.jar
+metrics-core-4.1.22.jar
+metrics-json-4.1.22.jar
+metrics-jvm-4.1.22.jar
+micrometer-core-1.5.14.jar
minlog-1.3.0.jar
mybatis-3.5.6.jar
mybatis-plus-3.4.1.jar
@@ -351,28 +346,26 @@ mybatis-plus-boot-starter-3.4.1.jar
mybatis-plus-core-3.4.1.jar
mybatis-plus-extension-3.4.1.jar
mybatis-spring-2.0.5.jar
-mysql-connector-java-5.1.34.jar
-mysql-connector-java-5.1.49.jar
netflix-commons-util-0.3.0.jar
netflix-eventbus-0.3.0.jar
netflix-infix-0.3.0.jar
netflix-statistics-0.1.1.jar
netty-3.6.2.Final.jar
netty-3.7.0.Final.jar
-netty-all-4.1.51.Final.jar
-netty-all-4.1.60.Final.jar
-netty-buffer-4.1.51.Final.jar
-netty-codec-4.1.51.Final.jar
-netty-codec-http-4.1.51.Final.jar
-netty-codec-http2-4.1.51.Final.jar
-netty-codec-socks-4.1.51.Final.jar
-netty-common-4.1.51.Final.jar
-netty-handler-4.1.51.Final.jar
-netty-handler-proxy-4.1.51.Final.jar
-netty-resolver-4.1.51.Final.jar
-netty-transport-4.1.51.Final.jar
-netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar
-netty-transport-native-unix-common-4.1.51.Final.jar
+netty-all-4.1.65.Final.jar
+netty-all-4.1.68.Final.jar
+netty-buffer-4.1.65.Final.jar
+netty-codec-4.1.65.Final.jar
+netty-codec-http-4.1.65.Final.jar
+netty-codec-http2-4.1.65.Final.jar
+netty-codec-socks-4.1.65.Final.jar
+netty-common-4.1.65.Final.jar
+netty-handler-4.1.65.Final.jar
+netty-handler-proxy-4.1.65.Final.jar
+netty-resolver-4.1.65.Final.jar
+netty-transport-4.1.65.Final.jar
+netty-transport-native-epoll-4.1.65.Final-linux-x86_64.jar
+netty-transport-native-unix-common-4.1.65.Final.jar
nio-multipart-parser-1.1.0.jar
nio-stream-storage-1.1.3.jar
objenesis-3.2.jar
@@ -388,7 +381,7 @@ poi-5.2.1.jar
poi-ooxml-5.2.1.jar
poi-ooxml-lite-5.2.1.jar
poi-shared-strings-2.5.1.jar
-protobuf-java-3.13.0.jar
+protobuf-java-3.14.0.jar
protostuff-api-1.6.2.jar
protostuff-collectionschema-1.6.2.jar
protostuff-core-1.6.2.jar
@@ -396,9 +389,9 @@ protostuff-runtime-1.6.2.jar
py4j-0.10.4.jar
quartz-2.3.2.jar
reactive-streams-1.0.3.jar
-reactor-core-3.3.8.RELEASE.jar
-reactor-extra-3.3.3.RELEASE.jar
-reactor-netty-0.9.10.RELEASE.jar
+reactor-core-3.3.17.RELEASE.jar
+reactor-extra-3.3.6.RELEASE.jar
+reactor-netty-0.9.20.RELEASE.jar
reactor-netty-0.9.7.RELEASE.jar
reflections-0.9.10.jar
ribbon-2.3.0.jar
@@ -427,79 +420,78 @@ snappy-java-1.0.4.1.jar
snappy-java-1.0.5.jar
snappy-java-1.1.4.jar
snappy-java-1.1.7.7.jar
-spring-aop-5.2.8.RELEASE.jar
-spring-beans-5.2.8.RELEASE.jar
-spring-boot-2.3.2.RELEASE.jar
-spring-boot-actuator-2.3.2.RELEASE.jar
-spring-boot-actuator-autoconfigure-2.3.2.RELEASE.jar
-spring-boot-autoconfigure-2.3.2.RELEASE.jar
-spring-boot-starter-2.3.2.RELEASE.jar
-spring-boot-starter-actuator-2.3.2.RELEASE.jar
-spring-boot-starter-aop-2.3.2.RELEASE.jar
-spring-boot-starter-cache-2.3.2.RELEASE.jar
-spring-boot-starter-freemarker-2.3.2.RELEASE.jar
-spring-boot-starter-jdbc-2.3.2.RELEASE.jar
-spring-boot-starter-jetty-2.3.2.RELEASE.jar
-spring-boot-starter-json-2.3.2.RELEASE.jar
-spring-boot-starter-log4j2-2.3.2.RELEASE.jar
-spring-boot-starter-logging-2.3.2.RELEASE.jar
-spring-boot-starter-quartz-2.3.2.RELEASE.jar
-spring-boot-starter-reactor-netty-2.3.2.RELEASE.jar
-spring-boot-starter-tomcat-2.3.2.RELEASE.jar
-spring-boot-starter-validation-2.3.2.RELEASE.jar
-spring-boot-starter-web-2.3.2.RELEASE.jar
-spring-boot-starter-webflux-2.3.2.RELEASE.jar
-spring-cloud-commons-2.2.7.RELEASE.jar
-spring-cloud-config-client-2.2.7.RELEASE.jar
-spring-cloud-context-2.2.7.RELEASE.jar
-spring-cloud-gateway-core-2.2.7.RELEASE.jar
-spring-cloud-gateway-server-2.2.7.RELEASE.jar
-spring-cloud-loadbalancer-2.2.7.RELEASE.jar
-spring-cloud-netflix-archaius-2.2.7.RELEASE.jar
-spring-cloud-netflix-eureka-client-2.2.7.RELEASE.jar
-spring-cloud-netflix-eureka-server-2.2.7.RELEASE.jar
-spring-cloud-netflix-hystrix-2.2.7.RELEASE.jar
-spring-cloud-netflix-ribbon-2.2.7.RELEASE.jar
-spring-cloud-openfeign-core-2.2.7.RELEASE.jar
-spring-cloud-starter-2.2.7.RELEASE.jar
-spring-cloud-starter-config-2.2.7.RELEASE.jar
-spring-cloud-starter-gateway-2.2.7.RELEASE.jar
-spring-cloud-starter-loadbalancer-2.2.7.RELEASE.jar
-spring-cloud-starter-netflix-archaius-2.2.7.RELEASE.jar
-spring-cloud-starter-netflix-eureka-client-2.2.7.RELEASE.jar
-spring-cloud-starter-netflix-eureka-server-2.2.7.RELEASE.jar
-spring-cloud-starter-netflix-ribbon-2.2.7.RELEASE.jar
-spring-cloud-starter-openfeign-2.2.7.RELEASE.jar
-spring-context-5.2.8.RELEASE.jar
-spring-context-support-5.2.8.RELEASE.jar
-spring-core-5.2.8.RELEASE.jar
-spring-expression-5.2.8.RELEASE.jar
-spring-jcl-5.2.8.RELEASE.jar
-spring-jdbc-5.2.8.RELEASE.jar
-spring-security-crypto-5.3.3.RELEASE.jar
+spring-aop-5.2.15.RELEASE.jar
+spring-beans-5.2.15.RELEASE.jar
+spring-boot-2.3.12.RELEASE.jar
+spring-boot-actuator-2.3.12.RELEASE.jar
+spring-boot-actuator-autoconfigure-2.3.12.RELEASE.jar
+spring-boot-autoconfigure-2.3.12.RELEASE.jar
+spring-boot-starter-2.3.12.RELEASE.jar
+spring-boot-starter-actuator-2.3.12.RELEASE.jar
+spring-boot-starter-aop-2.3.12.RELEASE.jar
+spring-boot-starter-cache-2.3.12.RELEASE.jar
+spring-boot-starter-freemarker-2.3.12.RELEASE.jar
+spring-boot-starter-jdbc-2.3.12.RELEASE.jar
+spring-boot-starter-jetty-2.3.12.RELEASE.jar
+spring-boot-starter-json-2.3.12.RELEASE.jar
+spring-boot-starter-log4j2-2.3.12.RELEASE.jar
+spring-boot-starter-logging-2.3.12.RELEASE.jar
+spring-boot-starter-quartz-2.3.12.RELEASE.jar
+spring-boot-starter-reactor-netty-2.3.12.RELEASE.jar
+spring-boot-starter-tomcat-2.3.12.RELEASE.jar
+spring-boot-starter-validation-2.3.12.RELEASE.jar
+spring-boot-starter-web-2.3.12.RELEASE.jar
+spring-boot-starter-webflux-2.3.12.RELEASE.jar
+spring-cloud-commons-2.2.9.RELEASE.jar
+spring-cloud-config-client-2.2.8.RELEASE.jar
+spring-cloud-context-2.2.9.RELEASE.jar
+spring-cloud-gateway-core-2.2.9.RELEASE.jar
+spring-cloud-gateway-server-2.2.9.RELEASE.jar
+spring-cloud-loadbalancer-2.2.9.RELEASE.jar
+spring-cloud-netflix-archaius-2.2.9.RELEASE.jar
+spring-cloud-netflix-eureka-client-2.2.9.RELEASE.jar
+spring-cloud-netflix-eureka-server-2.2.9.RELEASE.jar
+spring-cloud-netflix-hystrix-2.2.9.RELEASE.jar
+spring-cloud-netflix-ribbon-2.2.9.RELEASE.jar
+spring-cloud-openfeign-core-2.2.9.RELEASE.jar
+spring-cloud-starter-2.2.9.RELEASE.jar
+spring-cloud-starter-config-2.2.8.RELEASE.jar
+spring-cloud-starter-gateway-2.2.9.RELEASE.jar
+spring-cloud-starter-loadbalancer-2.2.9.RELEASE.jar
+spring-cloud-starter-netflix-archaius-2.2.9.RELEASE.jar
+spring-cloud-starter-netflix-eureka-client-2.2.9.RELEASE.jar
+spring-cloud-starter-netflix-eureka-server-2.2.9.RELEASE.jar
+spring-cloud-starter-netflix-ribbon-2.2.9.RELEASE.jar
+spring-cloud-starter-openfeign-2.2.9.RELEASE.jar
+spring-context-5.2.15.RELEASE.jar
+spring-context-support-5.2.15.RELEASE.jar
+spring-core-5.2.15.RELEASE.jar
+spring-expression-5.2.15.RELEASE.jar
+spring-jcl-5.2.15.RELEASE.jar
+spring-jdbc-5.2.15.RELEASE.jar
+spring-security-crypto-5.3.9.RELEASE.jar
spring-security-rsa-1.0.9.RELEASE.jar
-spring-tx-5.2.8.RELEASE.jar
-spring-web-5.2.8.RELEASE.jar
-spring-webflux-5.2.8.RELEASE.jar
-spring-webmvc-5.2.8.RELEASE.jar
+spring-tx-5.2.15.RELEASE.jar
+spring-web-5.2.15.RELEASE.jar
+spring-webflux-5.2.15.RELEASE.jar
+spring-webmvc-5.2.15.RELEASE.jar
ssl-config-core_2.11-0.3.7.jar
stax2-api-4.2.1.jar
-stax2-api-4.2.jar
stringtemplate-3.2.1.jar
-tomcat-embed-core-9.0.37.jar
-tomcat-embed-websocket-9.0.37.jar
-txw2-2.3.3.jar
+tomcat-embed-core-9.0.46.jar
+tomcat-embed-websocket-9.0.46.jar
+txw2-2.3.4.jar
validation-api-2.0.1.Final.jar
velocity-1.5.jar
-websocket-api-9.4.30.v20200611.jar
-websocket-client-9.4.30.v20200611.jar
+websocket-api-9.4.42.v20210604.jar
+websocket-client-9.4.42.v20210604.jar
websocket-client-9.4.44.v20210927.jar
-websocket-common-9.4.30.v20200611.jar
-websocket-server-9.4.30.v20200611.jar
+websocket-common-9.4.42.v20210604.jar
+websocket-server-9.4.42.v20210604.jar
websocket-server-9.4.44.v20210927.jar
-websocket-servlet-9.4.30.v20200611.jar
+websocket-servlet-9.4.42.v20210604.jar
websocket-servlet-9.4.44.v20210927.jar
-woodstox-core-5.3.0.jar
+woodstox-core-6.2.1.jar
xercesImpl-2.9.1.jar
xml-apis-1.3.04.jar
xmlbeans-5.0.3.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/10: web build version
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 982bc8346910435f73575c649f117b490631704a
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 02:55:27 2022 +0800
web build version
---
web/.env | 2 +-
web/package.json | 2 +-
web/src/apps/linkis/module/header/index.vue | 8 ++++----
web/vue.config.js | 5 +----
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/web/.env b/web/.env
index 40e905e..99bcd3e 100644
--- a/web/.env
+++ b/web/.env
@@ -1,4 +1,4 @@
VUE_APP_HOST=
VUE_APP_MN_CONFIG_PREFIX=
VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
-VUE_APP_VERSION=v1.1.0
+VUE_APP_VERSION=1.1.0
diff --git a/web/package.json b/web/package.json
index cfea27b..7248e18 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "linkis",
- "version": "1.0.3",
+ "version": "1.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/web/src/apps/linkis/module/header/index.vue b/web/src/apps/linkis/module/header/index.vue
index 88db343..d62eaef 100644
--- a/web/src/apps/linkis/module/header/index.vue
+++ b/web/src/apps/linkis/module/header/index.vue
@@ -5,16 +5,16 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
<template>
<div>
<div class="layout-header">
@@ -27,7 +27,7 @@
src=""
:alt="$t('message.common.logoName')"
>
- <span class="version">{{sysVersion}}</span>
+ <span class="version">v{{sysVersion}}</span>
</div>
</div>
<div
diff --git a/web/vue.config.js b/web/vue.config.js
index 5702f81..a609fc8 100644
--- a/web/vue.config.js
+++ b/web/vue.config.js
@@ -26,10 +26,7 @@ const VirtualModulesPlugin = require('webpack-virtual-modules');
const apps = require('./src/config.json')
const getVersion = () => {
- const pkgPath = path.join(__dirname, './package.json')
- let pkg = fs.readFileSync(pkgPath);
- pkg = JSON.parse(pkg);
- return pkg.version;
+ return process.env.VUE_APP_VERSION
}
// 指定module打包, 不指定则打包全部子应用
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/10: adjust distribution.xml for datasource module
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit f2193db43305ef711c84655b0ab590915cade02d
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 03:06:17 2022 +0800
adjust distribution.xml for datasource module
---
.../linkis-datasource-manager/server/pom.xml | 30 +----
.../server/src/main/assembly/distribution.xml | 145 +++++++++++++++++++++
2 files changed, 149 insertions(+), 26 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
index fea631c..43ec443 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
@@ -56,34 +56,12 @@
</exclusion>
</exclusions>
</dependency>
- <!--jersey bean validation-->
<dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- <version>${jersey.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>javax.ws.rs-api</artifactId>
- <groupId>javax.ws.rs</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hk2-locator</artifactId>
- <groupId>org.glassfish.hk2</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hk2-api</artifactId>
- <groupId>org.glassfish.hk2</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jersey-server</artifactId>
- <groupId>org.glassfish.jersey.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jersey-common</artifactId>
- <groupId>org.glassfish.jersey.core</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.1.2.Final</version>
</dependency>
+
<!--bml client-->
<dependency>
<groupId>org.apache.linkis</groupId>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
index 0ee951a..3f23a21 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
@@ -38,6 +38,151 @@
<unpack>false</unpack>
<useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>antlr:antlr:jar</exclude>
+ <exclude>aopalliance:aopalliance:jar</exclude>
+ <exclude>asm:asm:jar</exclude>
+ <exclude>cglib:cglib:jar</exclude>
+ <exclude>com.amazonaws:*:jar</exclude>
+ <exclude>com.fasterxml.jackson.*:*:jar</exclude>
+ <exclude>com.github.andrewoma.dexx:dexx-collections:jar</exclude>
+ <exclude>com.github.vlsi.compactmap:compactmap:jar</exclude>
+ <exclude>com.google.code.findbugs:annotations:jar</exclude>
+ <exclude>com.google.code.findbugs:jsr305:jar</exclude>
+ <exclude>com.google.code.gson:gson:jar</exclude>
+ <exclude>com.google.guava:guava:jar</exclude>
+ <exclude>com.google.inject:guice:jar</exclude>
+ <exclude>com.google.protobuf:protobuf-java:jar</exclude>
+ <exclude>com.netflix.*:*:jar</exclude>
+ <exclude>com.ning:async-http-client:jar</exclude>
+ <exclude>com.sun.jersey.*:*:jar</exclude>
+ <exclude>com.sun.jersey:*:jar</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude>
+ <exclude>com.thoughtworks.paranamer:paranamer:jar</exclude>
+ <exclude>com.thoughtworks.xstream:xstream:jar</exclude>
+ <exclude>org.apache.linkis:linkis-common:jar</exclude>
+ <exclude>org.apache.linkis:linkis-module:jar</exclude>
+ <exclude>commons-beanutils:commons-beanutils:jar</exclude>
+ <exclude>commons-beanutils:commons-beanutils-core:jar</exclude>
+ <exclude>commons-cli:commons-cli:jar</exclude>
+ <exclude>commons-codec:commons-codec:jar</exclude>
+ <exclude>commons-collections:commons-collections:jar</exclude>
+ <exclude>commons-configuration:commons-configuration:jar</exclude>
+ <exclude>commons-daemon:commons-daemon:jar</exclude>
+ <exclude>commons-dbcp:commons-dbcp:jar</exclude>
+ <exclude>commons-digester:commons-digester:jar</exclude>
+ <exclude>commons-httpclient:commons-httpclient:jar</exclude>
+ <exclude>commons-io:commons-io:jar</exclude>
+ <exclude>commons-jxpath:commons-jxpath:jar</exclude>
+ <exclude>commons-lang:commons-lang:jar</exclude>
+ <exclude>commons-logging:commons-logging:jar</exclude>
+ <exclude>commons-net:commons-net:jar</exclude>
+ <exclude>commons-pool:commons-pool:jar</exclude>
+ <exclude>io.micrometer:micrometer-core:jar</exclude>
+ <exclude>io.netty:*:jar</exclude>
+ <exclude>io.reactivex:*:jar</exclude>
+ <exclude>javax.activation:activation:jar</exclude>
+ <exclude>javax.annotation:javax.annotation-api:jar</exclude>
+ <exclude>javax.inject:javax.inject:jar</exclude>
+ <exclude>javax.servlet:javax.servlet-api:jar</exclude>
+ <exclude>javax.servlet.jsp:jsp-api:jar</exclude>
+ <exclude>javax.websocket:javax.websocket-api:jar</exclude>
+ <exclude>javax.ws.rs:javax.ws.rs-api:jar</exclude>
+ <exclude>javax.xml.bind:jaxb-api:jar</exclude>
+ <exclude>javax.xml.stream:stax-api:jar</exclude>
+ <exclude>joda-time:joda-time:jar</exclude>
+ <exclude>log4j:*:jar</exclude>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>net.databinder.dispatch:*:jar</exclude>
+ <exclude>org.antlr:antlr-runtime:jar</exclude>
+ <exclude>org.antlr:stringtemplate:jar</exclude>
+ <exclude>org.apache.commons:commons-compress:jar</exclude>
+ <exclude>org.apache.commons:commons-math:jar</exclude>
+ <exclude>org.apache.commons:commons-math3:jar</exclude>
+ <exclude>org.apache.curator:*:jar</exclude>
+ <exclude>org.apache.directory.*:*:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-annotations:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-auth:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-common:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-hdfs:jar</exclude>
+ <exclude>org.apache.htrace:htrace-core:jar</exclude>
+ <exclude>org.apache.httpcomponents:*:jar</exclude>
+ <exclude>org.apache.logging.log4j:*:jar</exclude>
+ <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
+ <exclude>org.aspectj:aspectjweaver:jar</exclude>
+ <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+ <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
+ <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
+ <exclude>org.codehaus.jettison:jettison:jar</exclude>
+ <exclude>org.codehaus.woodstox:stax2-api:jar</exclude>
+ <exclude>org.codehaus.woodstox:woodstox-core-asl:jar</exclude>
+ <exclude>org.eclipse.jetty:*:jar</exclude>
+ <exclude>org.eclipse.jetty.*:*:jar</exclude>
+ <exclude>org.fusesource.leveldbjni:leveldbjni-all:jar</exclude>
+ <exclude>org.glassfish.hk2:*:jar</exclude>
+ <exclude>org.glassfish.hk2.*:*:jar</exclude>
+ <exclude>org.glassfish.jersey.*:*:jar</exclude>
+ <exclude>org.hdrhistogram:HdrHistogram:jar</exclude>
+ <exclude>org.javassist:javassist:jar</exclude>
+ <exclude>org.json4s:*:jar</exclude>
+ <exclude>org.jsoup:jsoup:jar</exclude>
+ <exclude>org.jvnet.mimepull:mimepull:jar</exclude>
+ <exclude>org.jvnet:tiger-types:jar</exclude>
+ <exclude>org.latencyutils:LatencyUtils:jar</exclude>
+ <exclude>org.mortbay.jasper:apache-el:jar</exclude>
+ <exclude>org.mortbay.jetty:jetty:jar</exclude>
+ <exclude>org.mortbay.jetty:jetty-util:jar</exclude>
+ <exclude>org.ow2.asm:asm-analysis:jar</exclude>
+ <exclude>org.ow2.asm:asm-commons:jar</exclude>
+ <exclude>org.ow2.asm:asm-tree:jar</exclude>
+ <exclude>org.reflections:reflections:jar</exclude>
+ <exclude>org.scala-lang.modules:scala-parser-combinators_2.11:jar</exclude>
+ <exclude>org.scala-lang.modules:scala-xml_2.11:jar</exclude>
+ <exclude>org.scala-lang:*:jar</exclude>
+ <exclude>org.slf4j:*:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-actuator:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-actuator-autoconfigure:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-autoconfigure:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter-actuator:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter-aop:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter-jetty:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter-json:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter-log4j2:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot-starter-web:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-commons:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-config-client:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-context:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-netflix-archaius:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-netflix-core:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-netflix-eureka-client:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-netflix-ribbon:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-starter:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-starter-config:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-starter-eureka:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-starter-netflix-archaius:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:jar</exclude>
+ <exclude>org.springframework.cloud:spring-cloud-starter-netflix-ribbon:jar</exclude>
+ <exclude>org.springframework.security:spring-security-crypto:jar</exclude>
+ <exclude>org.springframework.security:spring-security-rsa:jar</exclude>
+ <exclude>org.springframework:spring-aop:jar</exclude>
+ <exclude>org.springframework:spring-beans:jar</exclude>
+ <exclude>org.springframework:spring-context:jar</exclude>
+ <exclude>org.springframework:spring-core:jar</exclude>
+ <exclude>org.springframework:spring-expression:jar</exclude>
+ <exclude>org.springframework:spring-jcl:jar</exclude>
+ <exclude>org.springframework:spring-web:jar</exclude>
+ <exclude>org.springframework:spring-webmvc:jar</exclude>
+ <exclude>org.tukaani:xz:jar</exclude>
+ <exclude>org.yaml:snakeyaml:jar</exclude>
+ <exclude>software.amazon.ion:ion-java:jar</exclude>
+ <exclude>xerces:xercesImpl:jar</exclude>
+ <exclude>xmlenc:xmlenc:jar</exclude>
+ <exclude>xmlpull:xmlpull:jar</exclude>
+ <exclude>xpp3:xpp3_min:jar</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/10: adjust classpath load order for mg-eureka
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit ce953549439e0abbb1ca64c599676f14b2d8ce74
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 2 23:59:21 2022 +0800
adjust classpath load order for mg-eureka
---
assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-eureka | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-eureka b/assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-eureka
index 6dced4a..63ba5c1 100644
--- a/assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-eureka
+++ b/assembly-combined-package/assembly-combined/sbin/ext/linkis-mg-eureka
@@ -70,7 +70,7 @@ if [ ! -r "$SERVER_LIB" ] ; then
fi
## set class path
-export SERVER_CLASS_PATH=$SERVER_CONF_PATH:$LINKIS_COMMONS_LIB/*:$SERVER_LIB/*
+export SERVER_CLASS_PATH=$SERVER_CONF_PATH:$SERVER_LIB/*:$LINKIS_COMMONS_LIB/*
SERVER_IP="`hostname --fqdn`"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 06/10: upgrade spring.boot.version from 2.2.13 to 2.3.12
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 668dc49e5e69ca35dcc6c7dd67254d663c19a25b
Author: casionone <ca...@gmail.com>
AuthorDate: Sun Mar 6 22:59:38 2022 +0800
upgrade spring.boot.version from 2.2.13 to 2.3.12
---
linkis-commons/linkis-hadoop-common/pom.xml | 12 +++++++++++-
pom.xml | 7 ++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/linkis-commons/linkis-hadoop-common/pom.xml b/linkis-commons/linkis-hadoop-common/pom.xml
index 6c6cf44..fec044a 100644
--- a/linkis-commons/linkis-hadoop-common/pom.xml
+++ b/linkis-commons/linkis-hadoop-common/pom.xml
@@ -38,6 +38,13 @@
<scope>provided</scope>
</dependency>
+ <!-- for upgrade hadoop-commom-->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -133,7 +140,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
-
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 7f1f4fe..b1c2e77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<properties>
<linkis.version>1.1.0</linkis.version>
<hadoop.version>2.7.2</hadoop.version>
- <spring.boot.version>2.3.2.RELEASE</spring.boot.version>
+ <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
<guava.version>30.0-jre</guava.version>
<gson.version>2.8.5</gson.version>
<fasterxml.jackson.version>2.11.3</fasterxml.jackson.version>
@@ -109,7 +109,7 @@
<jdk.compile.version>1.8</jdk.compile.version>
<plugin.scala.version>2.15.2</plugin.scala.version>
<scala.binary.version>2.11</scala.binary.version>
- <netty.version>4.1.60.Final</netty.version>
+ <netty.version>4.1.68.Final</netty.version>
<json4s.version>3.5.3</json4s.version>
<jersey.version>2.16</jersey.version>
<jersey.servlet.version>2.23.1</jersey.servlet.version>
@@ -129,6 +129,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-io.version>2.11.0</commons-io.version>
+ <commons-beanutils.version>1.9.4</commons-beanutils.version>
<druid.version>1.1.22</druid.version>
<apache-rat-plugin.version>0.13</apache-rat-plugin.version>
<assembly.package.rootpath>${basedir}</assembly.package.rootpath>
@@ -251,7 +252,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
- <version>Hoxton.SR10</version>
+ <version>Hoxton.SR12</version>
<type>pom</type>
<scope>import</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 07/10: optimize util of RestfulApiHelper:the attribute method is uniformly obtained through AOP
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit a5eb7119203cb715cd428ef4488bc7a0e8be6808
Author: casionone <ca...@gmail.com>
AuthorDate: Sun Mar 6 23:17:04 2022 +0800
optimize util of RestfulApiHelper:the attribute method is uniformly obtained through AOP
---
.../core/restful/DataSourceAdminRestfulApi.java | 6 -----
.../core/restful/DataSourceCoreRestfulApi.java | 22 +++------------
.../core/restful/DataSourceOperateRestfulApi.java | 1 -
.../core/restful/RestfulApiHelper.java | 31 +++++++++++++++++-----
4 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java
index dce2f07..ebb21ee 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java
@@ -84,7 +84,6 @@ public class DataSourceAdminRestfulApi {
insertDataSourceEnv(dataSourceEnv);
return Message.ok().data("insert_id", dataSourceEnv.getId());
},
- "/data-source-manager/env/json",
"Fail to insert data source environment[新增数据源环境失败]");
}
@@ -96,7 +95,6 @@ public class DataSourceAdminRestfulApi {
dataSourceInfoService.listDataSourceEnvByType(typeId);
return Message.ok().data("env_list", envList);
},
- "/data-source-manager/env_list/all/type/" + typeId,
"Fail to get data source environment list[获取数据源环境清单失败]");
}
@@ -107,7 +105,6 @@ public class DataSourceAdminRestfulApi {
DataSourceEnv dataSourceEnv = dataSourceInfoService.getDataSourceEnv(envId);
return Message.ok().data("env", dataSourceEnv);
},
- "/data-source-manager/env/" + envId,
"Fail to get data source environment[获取数据源环境信息失败]");
}
@@ -128,7 +125,6 @@ public class DataSourceAdminRestfulApi {
}
return Message.ok().data("remove_id", removeId);
},
- "/data-source-manager/env/" + envId,
"Fail to remove data source environment[删除数据源环境信息失败]");
}
@@ -166,7 +162,6 @@ public class DataSourceAdminRestfulApi {
updateDataSourceEnv(dataSourceEnv, storedDataSourceEnv);
return Message.ok().data("update_id", envId);
},
- "/data-source-manager/env/" + envId + "/json",
"Fail to update data source environment[更新数据源环境失败]");
}
@@ -186,7 +181,6 @@ public class DataSourceAdminRestfulApi {
dataSourceInfoService.queryDataSourceEnvPage(dataSourceEnvVo);
return Message.ok().data("query_list", queryList);
},
- "/data-source-manager/env",
"Fail to query page of data source environment[查询数据源环境失败]");
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index bf1d0ab..4d7bc9e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -51,7 +51,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -86,7 +85,6 @@ public class DataSourceCoreRestfulApi {
dataSourceRelateService.getAllDataSourceTypes();
return Message.ok().data("type_list", dataSourceTypes);
},
- "/data-source-manager/type/all",
"Fail to get all types of data source[获取数据源类型列表失败]");
}
@@ -98,7 +96,6 @@ public class DataSourceCoreRestfulApi {
dataSourceRelateService.getKeyDefinitionsByType(dataSourceTypeId);
return Message.ok().data("key_define", keyDefinitions);
},
- "/data-source-manager/key_define/type/" + dataSourceTypeId,
"Fail to get key definitions of data source type[查询数据源参数键值对失败]");
}
@@ -126,7 +123,6 @@ public class DataSourceCoreRestfulApi {
insertDataSource(dataSource);
return Message.ok().data("insert_id", dataSource.getId());
},
- "/data-source-manager/info/json",
"Fail to insert data source[新增数据源失败]");
}
@@ -169,7 +165,6 @@ public class DataSourceCoreRestfulApi {
dataSourceInfoService.updateDataSourceInfo(dataSource);
return Message.ok().data("update_id", dataSourceId);
},
- "/data-source-manager/info/" + dataSourceId + "/json",
"Fail to update data source[更新数据源失败]");
}
@@ -219,7 +214,6 @@ public class DataSourceCoreRestfulApi {
return Message.ok().data("version", versionId);
},
- "/data-source-manager/parameter/" + datasourceId + "/json",
"Fail to insert data source parameter [保存数据源参数失败]");
}
@@ -249,7 +243,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok().data("info", dataSource);
},
- "/data-source-manager/info/" + dataSourceId,
"Fail to access data source[获取数据源信息失败]");
}
@@ -273,7 +266,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok().data("info", dataSource);
},
- "/data-source-manager/info/name/" + URLEncoder.encode(dataSourceName, "UTF-8"),
"Fail to access data source[获取数据源信息失败]");
}
@@ -306,7 +298,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok().data("info", dataSource);
},
- "/data-source-manager/info/" + dataSourceId + "/" + version,
"Fail to access data source[获取数据源信息失败]");
}
@@ -342,7 +333,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok().data("versions", versions);
},
- "/data-source-manager/" + dataSourceId + "/versions",
"Fail to access data source[获取数据源信息失败]");
}
@@ -367,7 +357,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok();
},
- "/data-source-manager/publish/" + dataSourceId + "/" + versionId,
"Fail to publish datasource[数据源版本发布失败]");
}
@@ -396,7 +385,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok().data("remove_id", removeId);
},
- "/data-source-manager/info/" + dataSourceId,
"Fail to remove data source[删除数据源信息失败]");
}
@@ -419,7 +407,6 @@ public class DataSourceCoreRestfulApi {
}
return Message.ok().data("expire_id", expireId);
},
- "/data-source-manager/info/" + dataSourceId + "/expire",
"Fail to expire data source[数据源过期失败]");
}
@@ -448,7 +435,6 @@ public class DataSourceCoreRestfulApi {
connectParams);
return Message.ok().data("connectParams", connectParams);
},
- "/data-source-manager/" + dataSourceId + "/connect_params",
"Fail to connect data source[连接数据源失败]");
}
@@ -471,9 +457,9 @@ public class DataSourceCoreRestfulApi {
connectParams);
return Message.ok().data("connectParams", connectParams);
},
- "/data-source-manager/name/"
- + URLEncoder.encode(dataSourceName, "UTF-8")
- + "/connect_params",
+ // "/data-source-manager/name/"
+ // + URLEncoder.encode(dataSourceName, "UTF-8")
+ // + "/connect_params",
"Fail to connect data source[连接数据源失败]");
}
@@ -507,7 +493,6 @@ public class DataSourceCoreRestfulApi {
dataSource.getConnectParams());
return Message.ok().data("ok", true);
},
- "/data_source/" + dataSourceId + "/" + version + "/op/connect",
"Fail to connect data source[连接数据源失败]");
}
@@ -539,7 +524,6 @@ public class DataSourceCoreRestfulApi {
.data("query_list", queryList)
.data("totalPage", pageInfo.getTotal());
},
- "/data-source-manager/info",
"Fail to query page of data source[查询数据源失败]");
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java
index e598a13..9645599 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java
@@ -85,7 +85,6 @@ public class DataSourceOperateRestfulApi {
doConnect(operator, dataSource);
return Message.ok().data("ok", true);
},
- "/data-source-manager/op/connect/json",
"");
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
index 9cd130a..2d0960b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
@@ -94,22 +94,41 @@ public class RestfulApiHelper {
* @param tryOperation operate function
* @param failMessage message
*/
- public static Message doAndResponse(
- TryOperation tryOperation, String method, String failMessage) {
+ public static Message doAndResponse(TryOperation tryOperation, String failMessage) {
try {
Message message = tryOperation.operateAndGetMessage();
- return setMethod(message, method);
+ return message;
} catch (ParameterValidateException e) {
- return setMethod(Message.error(e.getMessage()), method);
+ return Message.error(e.getMessage());
} catch (ConstraintViolationException e) {
return new BeanValidationExceptionMapper().toResponse(e);
} catch (WarnException e) {
- return setMethod(Message.warn(e.getMessage()), method);
+ return Message.warn(e.getMessage());
} catch (Exception e) {
- return setMethod(Message.error(failMessage, e), method);
+ return Message.error(failMessage, e);
}
}
+ // /**
+ // * @param tryOperation operate function
+ // * @param failMessage message
+ // */
+ // public static Message doAndResponse(
+ // TryOperation tryOperation, String method, String failMessage) {
+ // try {
+ // Message message = tryOperation.operateAndGetMessage();
+ // return setMethod(message, method);
+ // } catch (ParameterValidateException e) {
+ // return setMethod(Message.error(e.getMessage()), method);
+ // } catch (ConstraintViolationException e) {
+ // return new BeanValidationExceptionMapper().toResponse(e);
+ // } catch (WarnException e) {
+ // return setMethod(Message.warn(e.getMessage()), method);
+ // } catch (Exception e) {
+ // return setMethod(Message.error(failMessage, e), method);
+ // }
+ // }
+
private static Message setMethod(Message message, String method) {
message.setMethod(method);
return message;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 08/10: web adjust dataSourceApi.js url path
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 97b423e828579939b2cd23f43aa04f143e5c5bb4
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 03:09:25 2022 +0800
web adjust dataSourceApi.js url path
---
.../apps/linkis/module/datasource/dataSourceApi.js | 58 +++++++++++-----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/web/src/apps/linkis/module/datasource/dataSourceApi.js b/web/src/apps/linkis/module/datasource/dataSourceApi.js
index 34f7b66..a7a3ca3 100644
--- a/web/src/apps/linkis/module/datasource/dataSourceApi.js
+++ b/web/src/apps/linkis/module/datasource/dataSourceApi.js
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,8 +37,8 @@ const getKeyDefine = (id)=>{
/**
* createDataSource
- * @param {*} realFormData
- * @returns
+ * @param {*} realFormData
+ * @returns
*/
const createDataSource = (realFormData)=>{
return api.fetch('data-source-manager/info/json', realFormData)
@@ -46,63 +46,63 @@ const createDataSource = (realFormData)=>{
/**
* createDataSource formdata
- * @param {*} realFormData
- * @returns
+ * @param {*} realFormData
+ * @returns
*/
const createDataSourceForm = (realFormData)=>{
return api.fetch('data-source-manager/info/form', realFormData, {methed: 'post', 'Content-Type': 'text/plain'})
}
/**
- * @param {*} datasourceId
- * @param {*} data
- * @returns
+ * @param {*} datasourceId
+ * @param {*} data
+ * @returns
*/
const updateDataSource = (data, datasourceId)=>{
return api.fetch(`data-source-manager/info/${datasourceId}/json`, data, 'put')
}
/**
- *
- * @param datasourceId
- * @param data
- * @returns
+ *
+ * @param datasourceId
+ * @param data
+ * @returns
*/
const saveConnectParams = (datasourceId, data, comment)=>{
return api.fetch(`/data-source-manager/parameter/${datasourceId}/json`, {connectParams: data, comment})//{connectParams: data, comment}
}
/**
- * @param {*} realFormData
- * @returns
+ * @param {*} realFormData
+ * @returns
*/
const saveConnectParamsForm = (datasourceId, data, comment)=>{
const formData = serialize({connectParams: data, comment});
return api.fetch(`/data-source-manager/parameter/${datasourceId}/form`, formData, {methed: 'post', 'Content-Type': 'text/plain'})
}
-
+
/**
- * @param datasourceId
- * @returns
+ * @param datasourceId
+ * @returns
*/
const getDataSourceByIdAndVersion = (datasourceId, version)=>{
return api.fetch(`/data-source-manager/info/${datasourceId}/${version}`, {}, 'get')
}
/**
- * @param datasourceId
- * @returns
+ * @param datasourceId
+ * @returns
*/
const getVersionListByDatasourceId = (datasourceId)=>{
return api.fetch(`/data-source-manager/${datasourceId}/versions`, {}, 'get')
}
-
+
/**
- * @param datasourceId
- * @returns
+ * @param datasourceId
+ * @returns
*/
const expire = (datasourceId)=>{
return api.fetch(`/data-source-manager/info/${datasourceId}/expire`, {}, 'put')
@@ -110,17 +110,17 @@ const expire = (datasourceId)=>{
/**
* publish datasource
- * @param {*} datasourceId
- * @param {*} versionId
- * @returns
+ * @param {*} datasourceId
+ * @param {*} versionId
+ * @returns
*/
const publish = (datasourceId, versionId)=>{
return api.fetch(`data-source-manager/publish/${datasourceId}/${versionId}`, {}, 'post')
}
/**
- * @param data
- * @returns
+ * @param data
+ * @returns
*/
const connect = (data)=> {
return api.fetch(`data-source-manager/op/connect/json`, data);
@@ -141,4 +141,4 @@ export {
createDataSourceForm,
getVersionListByDatasourceId,
saveConnectParamsForm
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org