This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 025957049 fix: fix the error code field map error (#4032)
025957049 is described below
commit 02595704900020cd3cd45d56c3b3d76c2515854a
Author: Jack Xu <[email protected]>
AuthorDate: Wed Dec 21 20:58:18 2022 +0800
fix: fix the error code field map error (#4032)
---
.../org/apache/linkis/ecm/server/util/ECMUtils.scala | 3 ++-
.../package/conf/linkis-ps-publicservice.properties | 2 +-
.../apache/linkis/bml/restful/BmlProjectRestful.java | 12 ++++++++----
.../linkis/bml/service/impl/VersionServiceImpl.java | 1 +
.../linkis/errorcode/common/LinkisErrorCode.scala | 4 ++--
.../errorcode/server/dao/impl/ErrorCodeMapper.xml | 18 ++++++++++++++++--
6 files changed, 30 insertions(+), 10 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
index 184b5e3c9..2cdd1fc7e 100644
---
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
+++
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/util/ECMUtils.scala
@@ -45,8 +45,9 @@ object ECMUtils {
} else {
response = client.downloadShareResource(userName,
resource.getResourceId, resource.getVersion)
}
- if (!response.isSuccess)
+ if (!response.isSuccess) {
throw new ECMErrorException(FAILED_TO_DOWNLOAD.getErrorCode,
FAILED_TO_DOWNLOAD.getErrorDesc)
+ }
val map = new util.HashMap[String, Object]
map.put("path", response.fullFilePath)
map.put("is", response.inputStream)
diff --git a/linkis-dist/package/conf/linkis-ps-publicservice.properties
b/linkis-dist/package/conf/linkis-ps-publicservice.properties
index d644ebbe8..fab495f7a 100644
--- a/linkis-dist/package/conf/linkis-ps-publicservice.properties
+++ b/linkis-dist/package/conf/linkis-ps-publicservice.properties
@@ -19,7 +19,7 @@ wds.linkis.server.mdm.service.instance.expire-in-seconds=1800
wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server
[...]
##mybatis
-wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xm
[...]
+wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xm
[...]
wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity,org.apache.linkis.bml.Entity,org.apache
[...]
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao,org.apache.linkis.basedataman
[...]
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
index 652e393c5..900dfca21 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
@@ -387,13 +387,17 @@ public class BmlProjectRestful {
user,
user,
resourceId,
- version);
+ version,
+ t);
downloadModel.setEndTime(new Date());
downloadModel.setState(1);
downloadService.addDownloadRecord(downloadModel);
- throw new ErrorException(
- 73561,
- "Sorry, the background service error caused you to download the
resources failed (抱歉，后台服务出错导致您本次下载资源失败)");
+ ErrorException errorException =
+ new ErrorException(
+ 73561,
+ "Sorry, the background service error caused you to download the
resources failed (抱歉，后台服务出错导致您本次下载资源失败)");
+ errorException.initCause(t);
+ throw errorException;
} finally {
IOUtils.closeQuietly(resp.getOutputStream());
}
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
index f055c75e2..b2d9479c5 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
@@ -185,6 +185,7 @@ public class VersionServiceImpl implements VersionService {
// }
// 分页查询
+ @Override
public List<Version> selectVersionByPage(int currentPage, int pageSize,
String resourceId) {
List<Version> rvList = null;
if (StringUtils.isNotEmpty(resourceId)) {
diff --git
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
index 8344eb4f9..24c0e1159 100644
---
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
+++
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
@@ -54,9 +54,9 @@ class LinkisErrorCode extends AbstractErrorCode {
def setErrorRegex(errorRegex: Regex): Unit = this.errorRegex = errorRegex
- def setType(errorType: Integer): Unit = this.errorType = errorType
+ def setErrorType(errorType: Integer): Unit = this.errorType = errorType
- def getType: Int = this.errorType
+ def getErrorType: Int = this.errorType
def setErrorRegexStr(errorRegexStr: String): Unit = {
this.errorRegexStr = errorRegexStr
diff --git
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
index 696bee645..e3ff65c7b 100644
---
a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
+++
b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/impl/ErrorCodeMapper.xml
@@ -20,9 +20,23 @@
<mapper namespace="org.apache.linkis.errorcode.server.dao.ErrorCodeMapper">
+ <resultMap id="BaseResultMap"
type="org.apache.linkis.errorcode.common.LinkisErrorCode">
+ <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
+ <result property="errorDesc" column="error_desc" jdbcType="VARCHAR"/>
+ <result property="errorRegexStr" column="error_regex"
jdbcType="VARCHAR"/>
+ <result property="errorType" column="error_type" jdbcType="INTEGER"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,error_code,error_desc,
+ error_regex,error_type
+ </sql>
+
<select id="getAllErrorCodes"
- resultType="org.apache.linkis.errorcode.common.LinkisErrorCode">
- SELECT * FROM linkis_ps_error_code
+ resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List"></include>
+ FROM linkis_ps_error_code
</select>
</mapper>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
