From 281caea95fe8f2b2de96b415d456edcf3469fbf8 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 26 Feb 2021 11:25:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20shiro=E4=BB=8Esession=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BAtoken=E6=A8=A1=E5=BC=8F=20=E5=A2=9E=E5=8A=A0j?= =?UTF-8?q?wt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 59 +- .../dataease/auth/api/dto/CurrentRoleDto.java | 15 + .../dataease/auth/api/dto/CurrentUserDto.java | 15 + .../io/dataease/auth/config/CorsConfig.java | 31 + .../io/dataease/base/domain/ChartGroup.java | 23 - .../base/domain/ChartGroupExample.java | 670 ------------------ .../base/mapper/ChartGroupMapper.java | 30 - .../dataease/base/mapper/ChartGroupMapper.xml | 243 ------- .../dataease/base/mapper/ext/AuthMapper.java | 26 + .../dataease/base/mapper/ext/AuthMapper.xml | 51 ++ .../base/mapper/ext/ExtUserMapper.java | 3 - .../base/mapper/ext/ExtUserMapper.xml | 12 - .../commons/constants/AuthConstants.java | 6 + .../commons/constants/ParamConstants.java | 1 - .../io/dataease/commons/utils/FileUtils.java | 2 +- .../dataease/commons/utils/ServletUtils.java | 40 ++ .../dataease/commons/utils/SessionUtils.java | 75 -- .../io/dataease/commons/utils/ShiroUtils.java | 61 -- .../io/dataease/commons/utils/XMLUtils.java | 47 -- .../java/io/dataease/config/ShiroConfig.java | 145 ---- .../java/io/dataease/config/WebConfig.java | 27 - .../dataease/controller/I18nController.java | 7 +- .../dataease/controller/IndexController.java | 4 +- .../dataease/controller/LoginController.java | 75 -- .../controller/OrganizationController.java | 71 -- .../dataease/controller/RoleController.java | 33 - .../ServiceIntegrationController.java | 38 - .../controller/SystemParameterController.java | 69 -- .../dataease/controller/TestController.java | 86 --- .../dataease/controller/UserController.java | 301 -------- .../controller/UserKeysController.java | 59 -- .../controller/UserRoleController.java | 41 -- .../controller/WorkspaceController.java | 111 --- .../controller/chart/ChartController.java | 26 - .../chart/ChartGroupController.java | 32 - .../RestControllerExceptionHandler.java | 10 +- .../request/chart/ChartGroupRequest.java | 11 - .../controller/sys/SysDeptController.java | 3 +- .../io/dataease/dto/SystemParameterDTO.java | 28 - .../io/dataease/dto/chart/ChartGroupDTO.java | 13 - .../excel/domain/TestCaseExcelDataCn.java | 65 -- .../domain/TestCaseExcelDataFactory.java | 18 - .../excel/domain/TestCaseExcelDataTw.java | 65 -- .../excel/domain/TestCaseExcelDataUs.java | 66 -- .../interceptor/MybatisInterceptor.java | 2 +- .../notice/controller/NoticeController.java | 36 - .../controller/request/MessageRequest.java | 11 - .../java/io/dataease/notice/domain/Mail.java | 18 - .../io/dataease/notice/domain/MailInfo.java | 15 - .../dataease/notice/domain/MessageDetail.java | 21 - .../notice/domain/MessageSettingDetail.java | 13 - .../io/dataease/notice/domain/UserDetail.java | 9 - .../dataease/notice/message/LinkMessage.java | 45 -- .../io/dataease/notice/message/Message.java | 5 - .../dataease/notice/message/TextMessage.java | 64 -- .../notice/sender/AbstractNoticeSender.java | 150 ---- .../dataease/notice/sender/NoticeModel.java | 51 -- .../dataease/notice/sender/NoticeSender.java | 9 - .../notice/sender/impl/MailNoticeSender.java | 50 -- .../notice/sender/impl/WeComNoticeSender.java | 39 - .../dataease/notice/service/MailService.java | 79 --- .../notice/service/NoticeSendService.java | 63 -- .../notice/service/NoticeService.java | 160 ----- .../io/dataease/notice/util/SendResult.java | 47 -- .../dataease/notice/util/WxChatbotClient.java | 50 -- .../io/dataease/security/ApiKeyFilter.java | 45 -- .../io/dataease/security/ApiKeyHandler.java | 64 -- .../security/ApiKeySessionHandler.java | 59 -- .../io/dataease/security/MsUserToken.java | 24 - .../UserModularRealmAuthenticator.java | 47 -- .../io/dataease/security/realm/LdapRealm.java | 102 --- .../dataease/security/realm/ShiroDBRealm.java | 139 ---- .../dataease/service/BaseDisplayService.java | 12 +- .../java/io/dataease/service/FileService.java | 6 +- .../dataease/service/IntegrationService.java | 79 --- .../service/NodeResourcePoolService.java | 97 --- .../dataease/service/OrganizationService.java | 181 ----- .../java/io/dataease/service/RoleService.java | 28 - .../java/io/dataease/service/SSOService.java | 5 - .../dataease/service/TestResourceService.java | 54 -- .../io/dataease/service/UserKeyService.java | 83 --- .../io/dataease/service/UserRoleService.java | 60 -- .../java/io/dataease/service/UserService.java | 616 ---------------- .../io/dataease/service/WorkspaceService.java | 285 -------- .../service/chart/ChartGroupService.java | 111 --- .../io/dataease/service/sys/MenuService.java | 3 +- .../dataease/service/sys/SysUserService.java | 4 +- .../system/SystemParameterService.java | 269 ------- .../websocket/ServerEndpointConfigurator.java | 5 +- .../resources/db/migration/V10__chart.sql | 12 - .../resources/db/migration/V8__system.sql | 1 + .../src/main/resources/generatorConfig.xml | 2 +- frontend/package.json | 3 +- frontend/src/assets/favicon.ico | Bin 109986 -> 0 bytes frontend/src/business/App.vue | 23 +- .../src/business/components/chart/Chart.vue | 45 -- .../business/components/chart/data/AddDB.vue | 148 ---- .../components/chart/data/ChartHome.vue | 25 - .../components/chart/data/TabDataPreview.vue | 62 -- .../components/chart/data/ViewTable.vue | 122 ---- .../business/components/chart/group/Group.vue | 540 -------------- .../src/business/components/chart/router.js | 18 - .../components/common/head/HeaderTopMenus.vue | 8 +- .../components/common/head/HeaderUser.vue | 9 +- .../components/common/router/router.js | 38 +- .../components/settings/CurrentUser.vue | 6 +- .../settings/personal/PersonSetting.vue | 14 +- .../business/components/settings/router.js | 10 +- .../components/settings/system/UiSetting.vue | 265 ------- frontend/src/business/index.html | 2 +- frontend/src/business/permission.js | 2 +- frontend/src/business/store.js | 18 +- frontend/src/common/js/ajax.js | 24 +- frontend/src/common/js/constants.js | 2 +- frontend/src/common/js/utils.js | 26 +- frontend/src/i18n/en-US.js | 14 +- frontend/src/i18n/zh-CN.js | 23 +- frontend/src/i18n/zh-TW.js | 14 +- frontend/src/login/Login.vue | 104 ++- frontend/src/login/login.html | 2 +- pom.xml | 3 +- 121 files changed, 415 insertions(+), 7299 deletions(-) create mode 100644 backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java create mode 100644 backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java create mode 100644 backend/src/main/java/io/dataease/auth/config/CorsConfig.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/ChartGroup.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml create mode 100644 backend/src/main/java/io/dataease/commons/constants/AuthConstants.java create mode 100644 backend/src/main/java/io/dataease/commons/utils/ServletUtils.java delete mode 100644 backend/src/main/java/io/dataease/commons/utils/SessionUtils.java delete mode 100644 backend/src/main/java/io/dataease/commons/utils/ShiroUtils.java delete mode 100644 backend/src/main/java/io/dataease/commons/utils/XMLUtils.java delete mode 100644 backend/src/main/java/io/dataease/config/ShiroConfig.java delete mode 100644 backend/src/main/java/io/dataease/config/WebConfig.java delete mode 100644 backend/src/main/java/io/dataease/controller/LoginController.java delete mode 100644 backend/src/main/java/io/dataease/controller/OrganizationController.java delete mode 100644 backend/src/main/java/io/dataease/controller/RoleController.java delete mode 100644 backend/src/main/java/io/dataease/controller/ServiceIntegrationController.java delete mode 100644 backend/src/main/java/io/dataease/controller/SystemParameterController.java delete mode 100644 backend/src/main/java/io/dataease/controller/TestController.java delete mode 100644 backend/src/main/java/io/dataease/controller/UserController.java delete mode 100644 backend/src/main/java/io/dataease/controller/UserKeysController.java delete mode 100644 backend/src/main/java/io/dataease/controller/UserRoleController.java delete mode 100644 backend/src/main/java/io/dataease/controller/WorkspaceController.java delete mode 100644 backend/src/main/java/io/dataease/controller/chart/ChartController.java delete mode 100644 backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java delete mode 100644 backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java delete mode 100644 backend/src/main/java/io/dataease/dto/SystemParameterDTO.java delete mode 100644 backend/src/main/java/io/dataease/dto/chart/ChartGroupDTO.java delete mode 100644 backend/src/main/java/io/dataease/excel/domain/TestCaseExcelDataCn.java delete mode 100644 backend/src/main/java/io/dataease/excel/domain/TestCaseExcelDataFactory.java delete mode 100644 backend/src/main/java/io/dataease/excel/domain/TestCaseExcelDataTw.java delete mode 100644 backend/src/main/java/io/dataease/excel/domain/TestCaseExcelDataUs.java delete mode 100644 backend/src/main/java/io/dataease/notice/controller/NoticeController.java delete mode 100644 backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/Mail.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/MailInfo.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/MessageDetail.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/UserDetail.java delete mode 100644 backend/src/main/java/io/dataease/notice/message/LinkMessage.java delete mode 100644 backend/src/main/java/io/dataease/notice/message/Message.java delete mode 100644 backend/src/main/java/io/dataease/notice/message/TextMessage.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/NoticeModel.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/NoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/service/MailService.java delete mode 100644 backend/src/main/java/io/dataease/notice/service/NoticeSendService.java delete mode 100644 backend/src/main/java/io/dataease/notice/service/NoticeService.java delete mode 100644 backend/src/main/java/io/dataease/notice/util/SendResult.java delete mode 100644 backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java delete mode 100644 backend/src/main/java/io/dataease/security/ApiKeyFilter.java delete mode 100644 backend/src/main/java/io/dataease/security/ApiKeyHandler.java delete mode 100644 backend/src/main/java/io/dataease/security/ApiKeySessionHandler.java delete mode 100644 backend/src/main/java/io/dataease/security/MsUserToken.java delete mode 100644 backend/src/main/java/io/dataease/security/UserModularRealmAuthenticator.java delete mode 100644 backend/src/main/java/io/dataease/security/realm/LdapRealm.java delete mode 100644 backend/src/main/java/io/dataease/security/realm/ShiroDBRealm.java delete mode 100644 backend/src/main/java/io/dataease/service/IntegrationService.java delete mode 100644 backend/src/main/java/io/dataease/service/NodeResourcePoolService.java delete mode 100644 backend/src/main/java/io/dataease/service/OrganizationService.java delete mode 100644 backend/src/main/java/io/dataease/service/RoleService.java delete mode 100644 backend/src/main/java/io/dataease/service/SSOService.java delete mode 100644 backend/src/main/java/io/dataease/service/TestResourceService.java delete mode 100644 backend/src/main/java/io/dataease/service/UserKeyService.java delete mode 100644 backend/src/main/java/io/dataease/service/UserRoleService.java delete mode 100644 backend/src/main/java/io/dataease/service/UserService.java delete mode 100644 backend/src/main/java/io/dataease/service/WorkspaceService.java delete mode 100644 backend/src/main/java/io/dataease/service/chart/ChartGroupService.java delete mode 100644 backend/src/main/java/io/dataease/service/system/SystemParameterService.java delete mode 100644 backend/src/main/resources/db/migration/V10__chart.sql delete mode 100644 frontend/src/assets/favicon.ico delete mode 100644 frontend/src/business/components/chart/Chart.vue delete mode 100644 frontend/src/business/components/chart/data/AddDB.vue delete mode 100644 frontend/src/business/components/chart/data/ChartHome.vue delete mode 100644 frontend/src/business/components/chart/data/TabDataPreview.vue delete mode 100644 frontend/src/business/components/chart/data/ViewTable.vue delete mode 100644 frontend/src/business/components/chart/group/Group.vue delete mode 100644 frontend/src/business/components/chart/router.js delete mode 100644 frontend/src/business/components/settings/system/UiSetting.vue diff --git a/backend/pom.xml b/backend/pom.xml index 198f58b0bf..8b1075bb04 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -16,6 +16,7 @@ 1.7.1 1.8 20.1.0 + 3.12.1 @@ -104,12 +105,22 @@ 5.0.3 + org.apache.shiro shiro-spring-boot-starter ${shiro.version} + + org.springframework.boot + spring-boot-starter-validation + + org.apache.commons commons-lang3 @@ -135,6 +146,12 @@ 1.2.72 + + com.auth0 + java-jwt + ${jwt.version} + + org.springdoc @@ -345,27 +362,27 @@ true - - - - - - - - - - - - - - - - - - - - - + + maven-clean-plugin + + + + src/main/resources/static + + ** + + false + + + src/main/resources/templates + + ** + + false + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java b/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java new file mode 100644 index 0000000000..1b9d86d16f --- /dev/null +++ b/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java @@ -0,0 +1,15 @@ +package io.dataease.auth.api.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CurrentRoleDto implements Serializable { + + private Long id; + + private String code; + + private String name; +} diff --git a/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java b/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java new file mode 100644 index 0000000000..49e0826aa8 --- /dev/null +++ b/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java @@ -0,0 +1,15 @@ +package io.dataease.auth.api.dto; + +import io.dataease.auth.entity.SysUserEntity; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +@Data +@NoArgsConstructor +public class CurrentUserDto extends SysUserEntity implements Serializable { + + private List roles; +} diff --git a/backend/src/main/java/io/dataease/auth/config/CorsConfig.java b/backend/src/main/java/io/dataease/auth/config/CorsConfig.java new file mode 100644 index 0000000000..8dbbe29f50 --- /dev/null +++ b/backend/src/main/java/io/dataease/auth/config/CorsConfig.java @@ -0,0 +1,31 @@ +package io.dataease.auth.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +import java.util.Collections; + +@Configuration +public class CorsConfig { + + @Bean + public CorsFilter corsFilter() { + CorsConfiguration corsConfiguration = new CorsConfiguration(); + //1,允许任何来源 + corsConfiguration.setAllowedOriginPatterns(Collections.singletonList("*")); + //2,允许任何请求头 + corsConfiguration.addAllowedHeader(CorsConfiguration.ALL); + //3,允许任何方法 + corsConfiguration.addAllowedMethod(CorsConfiguration.ALL); + //4,允许凭证 + corsConfiguration.setAllowCredentials(true); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", corsConfiguration); + return new CorsFilter(source); + } + +} diff --git a/backend/src/main/java/io/dataease/base/domain/ChartGroup.java b/backend/src/main/java/io/dataease/base/domain/ChartGroup.java deleted file mode 100644 index 4d2128a4b6..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/ChartGroup.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.dataease.base.domain; - -import java.io.Serializable; -import lombok.Data; - -@Data -public class ChartGroup implements Serializable { - private String id; - - private String name; - - private String pid; - - private Integer level; - - private String type; - - private String createBy; - - private Long createTime; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java b/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java deleted file mode 100644 index c3bf4973e6..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java +++ /dev/null @@ -1,670 +0,0 @@ -package io.dataease.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class ChartGroupExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ChartGroupExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("`name` is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("`name` is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("`name` =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("`name` <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("`name` >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("`name` >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("`name` <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("`name` <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("`name` like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("`name` not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("`name` in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("`name` not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("`name` between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("`name` not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andPidIsNull() { - addCriterion("pid is null"); - return (Criteria) this; - } - - public Criteria andPidIsNotNull() { - addCriterion("pid is not null"); - return (Criteria) this; - } - - public Criteria andPidEqualTo(String value) { - addCriterion("pid =", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotEqualTo(String value) { - addCriterion("pid <>", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidGreaterThan(String value) { - addCriterion("pid >", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidGreaterThanOrEqualTo(String value) { - addCriterion("pid >=", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLessThan(String value) { - addCriterion("pid <", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLessThanOrEqualTo(String value) { - addCriterion("pid <=", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLike(String value) { - addCriterion("pid like", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotLike(String value) { - addCriterion("pid not like", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidIn(List values) { - addCriterion("pid in", values, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotIn(List values) { - addCriterion("pid not in", values, "pid"); - return (Criteria) this; - } - - public Criteria andPidBetween(String value1, String value2) { - addCriterion("pid between", value1, value2, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotBetween(String value1, String value2) { - addCriterion("pid not between", value1, value2, "pid"); - return (Criteria) this; - } - - public Criteria andLevelIsNull() { - addCriterion("`level` is null"); - return (Criteria) this; - } - - public Criteria andLevelIsNotNull() { - addCriterion("`level` is not null"); - return (Criteria) this; - } - - public Criteria andLevelEqualTo(Integer value) { - addCriterion("`level` =", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelNotEqualTo(Integer value) { - addCriterion("`level` <>", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelGreaterThan(Integer value) { - addCriterion("`level` >", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelGreaterThanOrEqualTo(Integer value) { - addCriterion("`level` >=", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelLessThan(Integer value) { - addCriterion("`level` <", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelLessThanOrEqualTo(Integer value) { - addCriterion("`level` <=", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelIn(List values) { - addCriterion("`level` in", values, "level"); - return (Criteria) this; - } - - public Criteria andLevelNotIn(List values) { - addCriterion("`level` not in", values, "level"); - return (Criteria) this; - } - - public Criteria andLevelBetween(Integer value1, Integer value2) { - addCriterion("`level` between", value1, value2, "level"); - return (Criteria) this; - } - - public Criteria andLevelNotBetween(Integer value1, Integer value2) { - addCriterion("`level` not between", value1, value2, "level"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("`type` is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("`type` is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("`type` =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("`type` <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("`type` >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("`type` >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("`type` <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("`type` <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("`type` like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("`type` not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("`type` in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("`type` not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("`type` between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("`type` not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andCreateByIsNull() { - addCriterion("create_by is null"); - return (Criteria) this; - } - - public Criteria andCreateByIsNotNull() { - addCriterion("create_by is not null"); - return (Criteria) this; - } - - public Criteria andCreateByEqualTo(String value) { - addCriterion("create_by =", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotEqualTo(String value) { - addCriterion("create_by <>", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThan(String value) { - addCriterion("create_by >", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThanOrEqualTo(String value) { - addCriterion("create_by >=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThan(String value) { - addCriterion("create_by <", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThanOrEqualTo(String value) { - addCriterion("create_by <=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLike(String value) { - addCriterion("create_by like", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotLike(String value) { - addCriterion("create_by not like", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByIn(List values) { - addCriterion("create_by in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotIn(List values) { - addCriterion("create_by not in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByBetween(String value1, String value2) { - addCriterion("create_by between", value1, value2, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotBetween(String value1, String value2) { - addCriterion("create_by not between", value1, value2, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java deleted file mode 100644 index 92e6264833..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.ChartGroup; -import io.dataease.base.domain.ChartGroupExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface ChartGroupMapper { - long countByExample(ChartGroupExample example); - - int deleteByExample(ChartGroupExample example); - - int deleteByPrimaryKey(String id); - - int insert(ChartGroup record); - - int insertSelective(ChartGroup record); - - List selectByExample(ChartGroupExample example); - - ChartGroup selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") ChartGroup record, @Param("example") ChartGroupExample example); - - int updateByExample(@Param("record") ChartGroup record, @Param("example") ChartGroupExample example); - - int updateByPrimaryKeySelective(ChartGroup record); - - int updateByPrimaryKey(ChartGroup record); -} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml deleted file mode 100644 index 58f37d6da4..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, `name`, pid, `level`, `type`, create_by, create_time - - - - - delete from chart_group - where id = #{id,jdbcType=VARCHAR} - - - delete from chart_group - - - - - - insert into chart_group (id, `name`, pid, - `level`, `type`, create_by, - create_time) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, - #{level,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}) - - - insert into chart_group - - - id, - - - `name`, - - - pid, - - - `level`, - - - `type`, - - - create_by, - - - create_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{pid,jdbcType=VARCHAR}, - - - #{level,jdbcType=INTEGER}, - - - #{type,jdbcType=VARCHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - - - - update chart_group - - - id = #{record.id,jdbcType=VARCHAR}, - - - `name` = #{record.name,jdbcType=VARCHAR}, - - - pid = #{record.pid,jdbcType=VARCHAR}, - - - `level` = #{record.level,jdbcType=INTEGER}, - - - `type` = #{record.type,jdbcType=VARCHAR}, - - - create_by = #{record.createBy,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - - - - - - update chart_group - set id = #{record.id,jdbcType=VARCHAR}, - `name` = #{record.name,jdbcType=VARCHAR}, - pid = #{record.pid,jdbcType=VARCHAR}, - `level` = #{record.level,jdbcType=INTEGER}, - `type` = #{record.type,jdbcType=VARCHAR}, - create_by = #{record.createBy,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT} - - - - - - update chart_group - - - `name` = #{name,jdbcType=VARCHAR}, - - - pid = #{pid,jdbcType=VARCHAR}, - - - `level` = #{level,jdbcType=INTEGER}, - - - `type` = #{type,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=VARCHAR} - - - update chart_group - set `name` = #{name,jdbcType=VARCHAR}, - pid = #{pid,jdbcType=VARCHAR}, - `level` = #{level,jdbcType=INTEGER}, - `type` = #{type,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT} - where id = #{id,jdbcType=VARCHAR} - - \ 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 new file mode 100644 index 0000000000..59bab3da68 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java @@ -0,0 +1,26 @@ +package io.dataease.base.mapper.ext; + + + +import io.dataease.auth.api.dto.CurrentRoleDto; +import io.dataease.auth.entity.SysUserEntity; +import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + +public interface AuthMapper { + + + + List roleCodes(@Param("userId") Long userId); + + + + List permissions(@Param("userId") Long userId); + + + SysUserEntity findUser(@Param("username") String username); + + + 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 new file mode 100644 index 0000000000..6a2b567c0f --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java index c3dd55176b..65b40968fd 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java @@ -2,7 +2,6 @@ package io.dataease.base.mapper.ext; import io.dataease.base.domain.User; import io.dataease.controller.request.UserRequest; -import io.dataease.notice.domain.UserDetail; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; @@ -19,8 +18,6 @@ public interface ExtUserMapper { List searchUser(String condition); - List queryTypeByIds(List userIds); - @MapKey("id") Map queryNameByIds(List userIds); } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml index 8bc896e0dd..a2672df779 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml @@ -16,18 +16,6 @@ - -