From d836b0ad8b7f731afd6c3acf99f9c590766359f4 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 15 Sep 2021 10:30:11 +0800 Subject: [PATCH 01/19] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=B5=8B=E8=AF=95main=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/commons/utils/DateUtils.java | 4 ++-- .../main/java/io/dataease/commons/utils/ExcelReaderUtil.java | 4 ++-- .../io/dataease/service/system/SystemParameterService.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/DateUtils.java b/backend/src/main/java/io/dataease/commons/utils/DateUtils.java index e750ced0c6..4da7f5721b 100644 --- a/backend/src/main/java/io/dataease/commons/utils/DateUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/DateUtils.java @@ -95,7 +95,7 @@ public class DateUtils { } - public static void main(String[] args) throws Exception { + /* public static void main(String[] args) throws Exception { // System.out.println("start:"); Date paramTime = getTime(getTimeString(new Long("1607672440731"))); @@ -110,7 +110,7 @@ public class DateUtils { // System.out.println(getTimeString(--countTimeLong)); - } + } */ /** diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java index 53249d256b..c2f80fbdff 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java @@ -68,8 +68,8 @@ public class ExcelReaderUtil { } } - public static void main(String[] args) throws Exception { + /* public static void main(String[] args) throws Exception { String file ="Metersphere_case_DataEase功能用例.xlsx"; ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file)); - } + } */ } diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index fd868cb3c7..aa4c0c41ca 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -229,9 +229,9 @@ public class SystemParameterService { } - public static void main(String[] args) { + /* public static void main(String[] args) { String info="[{\"paramKey\":\"base.url\",\"paramValue\":null,\"type\":\"text\",\"sort\":1,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.title\",\"paramValue\":\"DataEase Title\",\"type\":\"text\",\"sort\":3,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.logo\",\"paramValue\":\"DataEase\",\"type\":\"text\",\"sort\":4,\"file\":null,\"fileName\":\"favicon.icon.png\"}]"; List temp = JSON.parseArray(info,SystemParameterDTO.class); // System.out.println("===>"); - } + } */ } From 4ef83c477ecfa1c861c5a2d9c471c37e585e622b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 15 Sep 2021 14:41:06 +0800 Subject: [PATCH 02/19] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0sso=E7=94=A8?= =?UTF-8?q?=E6=88=B7flyway,=E5=AE=8C=E5=96=84=E5=8D=95=E7=82=B9=E7=99=BB?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/auth/server/AuthServer.java | 7 +- .../auth/service/AuthUserService.java | 2 + .../service/impl/AuthUserServiceImpl.java | 5 ++ .../service/impl/DynamicMenuServiceImpl.java | 1 - .../java/io/dataease/base/domain/SysUser.java | 2 + .../dataease/base/domain/SysUserExample.java | 70 +++++++++++++++++++ .../io/dataease/base/mapper/SysUserMapper.xml | 27 +++++-- .../dataease/base/mapper/ext/AuthMapper.java | 2 + .../dataease/base/mapper/ext/AuthMapper.xml | 4 ++ .../commons/constants/AuthConstants.java | 1 + .../io/dataease/plugins/server/SSOServer.java | 4 +- .../dataease/service/sys/SysUserService.java | 3 +- .../resources/db/migration/V26__de1.3.sql | 18 ++++- frontend/src/settings.js | 3 + frontend/src/utils/auth.js | 10 +++ frontend/src/utils/request.js | 6 +- 16 files changed, 150 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 03925bb8b8..57bce9fbaa 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -119,8 +119,11 @@ public class AuthServer implements AuthApi { if (isOpenOidc()) { HttpServletRequest request = ServletUtils.request(); String idToken = request.getHeader("IdToken"); - OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class); - oidcXpackService.logout(idToken); + if (StringUtils.isNotBlank(idToken)) { + OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class); + oidcXpackService.logout(idToken); + } + } if (StringUtils.isEmpty(token) || StringUtils.equals("null", token) || StringUtils.equals("undefined", token)) { return "success"; diff --git a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java index 2c2c6cf08b..22462d5fe9 100644 --- a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java +++ b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java @@ -13,6 +13,8 @@ public interface AuthUserService { SysUserEntity getUserByName(String username); + SysUserEntity getUserBySub(String sub); + List roles(Long userId); List permissions(Long userId); diff --git a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java index 614d6d54f2..fe11af4de1 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java @@ -52,6 +52,11 @@ public class AuthUserServiceImpl implements AuthUserService { return authMapper.findUserByName(username); } + @Override + public SysUserEntity getUserBySub(String sub) { + return authMapper.findUserBySub(sub); + } + @Override public List roles(Long userId){ return authMapper.roleCodes(userId); diff --git a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java index 70b7f9f280..667aaa09e6 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java @@ -13,7 +13,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysUser.java b/backend/src/main/java/io/dataease/base/domain/SysUser.java index e07c73e757..8867cc75c4 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUser.java +++ b/backend/src/main/java/io/dataease/base/domain/SysUser.java @@ -39,5 +39,7 @@ public class SysUser implements Serializable { private Integer from; + private String sub; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java index 800cfe3d76..1b8fc36618 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java +++ b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java @@ -1213,6 +1213,76 @@ public class SysUserExample { addCriterion("`from` not between", value1, value2, "from"); return (Criteria) this; } + + public Criteria andSubIsNull() { + addCriterion("sub is null"); + return (Criteria) this; + } + + public Criteria andSubIsNotNull() { + addCriterion("sub is not null"); + return (Criteria) this; + } + + public Criteria andSubEqualTo(String value) { + addCriterion("sub =", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubNotEqualTo(String value) { + addCriterion("sub <>", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubGreaterThan(String value) { + addCriterion("sub >", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubGreaterThanOrEqualTo(String value) { + addCriterion("sub >=", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubLessThan(String value) { + addCriterion("sub <", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubLessThanOrEqualTo(String value) { + addCriterion("sub <=", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubLike(String value) { + addCriterion("sub like", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubNotLike(String value) { + addCriterion("sub not like", value, "sub"); + return (Criteria) this; + } + + public Criteria andSubIn(List values) { + addCriterion("sub in", values, "sub"); + return (Criteria) this; + } + + public Criteria andSubNotIn(List values) { + addCriterion("sub not in", values, "sub"); + return (Criteria) this; + } + + public Criteria andSubBetween(String value1, String value2) { + addCriterion("sub between", value1, value2, "sub"); + return (Criteria) this; + } + + public Criteria andSubNotBetween(String value1, String value2) { + addCriterion("sub not between", value1, value2, "sub"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml index d2f11fdd43..b779a3a538 100644 --- a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml @@ -19,6 +19,7 @@ + @@ -81,7 +82,7 @@ user_id, dept_id, username, nick_name, gender, phone, email, `password`, is_admin, enabled, create_by, update_by, pwd_reset_time, create_time, update_time, `language`, - `from` + `from`, sub @@ -296,6 +305,9 @@ `from` = #{record.from,jdbcType=INTEGER}, + + sub = #{record.sub,jdbcType=VARCHAR}, + @@ -319,7 +331,8 @@ create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, `language` = #{record.language,jdbcType=VARCHAR}, - `from` = #{record.from,jdbcType=INTEGER} + `from` = #{record.from,jdbcType=INTEGER}, + sub = #{record.sub,jdbcType=VARCHAR} @@ -375,6 +388,9 @@ `from` = #{from,jdbcType=INTEGER}, + + sub = #{sub,jdbcType=VARCHAR}, + where user_id = #{userId,jdbcType=BIGINT} @@ -395,7 +411,8 @@ create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, `language` = #{language,jdbcType=VARCHAR}, - `from` = #{from,jdbcType=INTEGER} + `from` = #{from,jdbcType=INTEGER}, + sub = #{sub,jdbcType=VARCHAR} where user_id = #{userId,jdbcType=BIGINT} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java index d082a0faea..2b1355256f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java @@ -25,6 +25,8 @@ public interface AuthMapper { SysUserEntity findUserByName(@Param("username") String username); + SysUserEntity findUserBySub(@Param("sub") String sub); + List roles(@Param("userId") Long userId); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml index 981dfc5c93..3492d7ec10 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml @@ -28,6 +28,10 @@ select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where username = #{username} + + - * - - @@ -383,7 +371,7 @@ export default { float: right; height: 35px; line-height: 35px; - min-width: 900px; + min-width: 500px; /*background: #fff;*/ /*border-bottom: 1px solid #ddd;*/ diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index 46370c74d9..ae045bcd1c 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -79,6 +79,9 @@ const data = { }, setCanvasStyle(state, style) { + if (style) { + style['selfAdaption'] = true + } state.canvasStyleData = style }, diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 683ee0bef9..8575355a59 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -96,7 +96,6 @@
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index f6490ca8dc..e3f5385e06 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -56,7 +56,7 @@
- +
From e1b32c6895ab790a4c2405c70a0b0914d514e354 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 15 Sep 2021 18:20:31 +0800 Subject: [PATCH 09/19] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E7=9B=B4?= =?UTF-8?q?=E8=BF=9E=E6=A8=A1=E5=BC=8F=EF=BC=88ch=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 10 +- .../io/dataease/base/domain/Datasource.java | 21 +- .../base/domain/DatasourceExample.java | 70 ++ .../dataease/base/mapper/DatasourceMapper.xml | 31 +- .../base/mapper/ext/ExtDataSourceMapper.xml | 4 +- .../datasource/constants/DatasourceTypes.java | 1 + .../datasource/dto/CHConfigration.java | 19 + .../datasource/provider/JdbcProvider.java | 33 +- .../datasource/provider/ProviderFactory.java | 2 + .../io/dataease/provider/ch/CHConstants.java | 41 + .../dataease/provider/ch/CHQueryProvider.java | 1002 +++++++++++++++++ .../resources/db/migration/V26__de1.3.sql | 2 + .../src/main/resources/generatorConfig.xml | 2 +- frontend/src/lang/en.js | 2 + frontend/src/lang/tw.js | 2 + frontend/src/lang/zh.js | 9 +- frontend/src/views/dataset/add/AddDB.vue | 12 +- frontend/src/views/dataset/add/AddSQL.vue | 18 +- .../src/views/system/datasource/DsTree.vue | 4 + frontend/src/views/system/datasource/form.vue | 36 +- 20 files changed, 1278 insertions(+), 43 deletions(-) create mode 100644 backend/src/main/java/io/dataease/datasource/dto/CHConfigration.java create mode 100644 backend/src/main/java/io/dataease/provider/ch/CHConstants.java create mode 100644 backend/src/main/java/io/dataease/provider/ch/CHQueryProvider.java diff --git a/backend/pom.xml b/backend/pom.xml index 2bb2b6b50d..c4bda7ce63 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -342,11 +342,11 @@ spring-boot-starter-data-ldap - + + ru.yandex.clickhouse + clickhouse-jdbc + 0.3.1 + diff --git a/backend/src/main/java/io/dataease/base/domain/Datasource.java b/backend/src/main/java/io/dataease/base/domain/Datasource.java index 86b2bca643..d8a2f6c4ac 100644 --- a/backend/src/main/java/io/dataease/base/domain/Datasource.java +++ b/backend/src/main/java/io/dataease/base/domain/Datasource.java @@ -1,29 +1,28 @@ package io.dataease.base.domain; import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class Datasource implements Serializable { - @ApiModelProperty("ID") private String id; - @ApiModelProperty("名称") + private String name; - @ApiModelProperty("描述") + private String desc; - @ApiModelProperty("类型") + private String type; - @ApiModelProperty("创建时间") + private Long createTime; - @ApiModelProperty("更新时间") + private Long updateTime; - @ApiModelProperty("创建者") + private String createBy; - @ApiModelProperty("状态") + private String status; - @ApiModelProperty("配置") + + private String computeType; + private String configuration; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java b/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java index c59e358431..c0fe88e1a8 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java +++ b/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java @@ -643,6 +643,76 @@ public class DatasourceExample { addCriterion("`status` not between", value1, value2, "status"); return (Criteria) this; } + + public Criteria andComputeTypeIsNull() { + addCriterion("compute_type is null"); + return (Criteria) this; + } + + public Criteria andComputeTypeIsNotNull() { + addCriterion("compute_type is not null"); + return (Criteria) this; + } + + public Criteria andComputeTypeEqualTo(String value) { + addCriterion("compute_type =", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeNotEqualTo(String value) { + addCriterion("compute_type <>", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeGreaterThan(String value) { + addCriterion("compute_type >", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeGreaterThanOrEqualTo(String value) { + addCriterion("compute_type >=", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeLessThan(String value) { + addCriterion("compute_type <", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeLessThanOrEqualTo(String value) { + addCriterion("compute_type <=", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeLike(String value) { + addCriterion("compute_type like", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeNotLike(String value) { + addCriterion("compute_type not like", value, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeIn(List values) { + addCriterion("compute_type in", values, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeNotIn(List values) { + addCriterion("compute_type not in", values, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeBetween(String value1, String value2) { + addCriterion("compute_type between", value1, value2, "computeType"); + return (Criteria) this; + } + + public Criteria andComputeTypeNotBetween(String value1, String value2) { + addCriterion("compute_type not between", value1, value2, "computeType"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml index 67713c420f..29abb1dcfb 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml @@ -10,6 +10,7 @@ + @@ -73,7 +74,7 @@ - id, `name`, `desc`, `type`, create_time, update_time, create_by, `status` + id, `name`, `desc`, `type`, create_time, update_time, create_by, `status`, compute_type configuration @@ -129,12 +130,12 @@ insert into datasource (id, `name`, `desc`, `type`, create_time, update_time, - create_by, `status`, configuration - ) + create_by, `status`, compute_type, + configuration) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{desc,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, - #{createBy,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{configuration,jdbcType=LONGVARCHAR} - ) + #{createBy,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{computeType,jdbcType=VARCHAR}, + #{configuration,jdbcType=LONGVARCHAR}) insert into datasource @@ -163,6 +164,9 @@ `status`, + + compute_type, + configuration, @@ -192,6 +196,9 @@ #{status,jdbcType=VARCHAR}, + + #{computeType,jdbcType=VARCHAR}, + #{configuration,jdbcType=LONGVARCHAR}, @@ -230,6 +237,9 @@ `status` = #{record.status,jdbcType=VARCHAR}, + + compute_type = #{record.computeType,jdbcType=VARCHAR}, + configuration = #{record.configuration,jdbcType=LONGVARCHAR}, @@ -248,6 +258,7 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, create_by = #{record.createBy,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, + compute_type = #{record.computeType,jdbcType=VARCHAR}, configuration = #{record.configuration,jdbcType=LONGVARCHAR} @@ -262,7 +273,8 @@ create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, create_by = #{record.createBy,jdbcType=VARCHAR}, - `status` = #{record.status,jdbcType=VARCHAR} + `status` = #{record.status,jdbcType=VARCHAR}, + compute_type = #{record.computeType,jdbcType=VARCHAR} @@ -291,6 +303,9 @@ `status` = #{status,jdbcType=VARCHAR}, + + compute_type = #{computeType,jdbcType=VARCHAR}, + configuration = #{configuration,jdbcType=LONGVARCHAR}, @@ -306,6 +321,7 @@ update_time = #{updateTime,jdbcType=BIGINT}, create_by = #{createBy,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, + compute_type = #{computeType,jdbcType=VARCHAR}, configuration = #{configuration,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -317,7 +333,8 @@ create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, create_by = #{createBy,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR} + `status` = #{status,jdbcType=VARCHAR}, + compute_type = #{computeType,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml index d2dd06d0b8..0c994290b9 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml @@ -8,7 +8,7 @@