dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 使用视图插件的和数据源插件，两者组合制作仪表板视图时，视图查看异常 #6223

Browse Source
This commit is contained in:
taojinlong 2023-11-21 18:28:26 +08:00
parent 80a5c893fd
commit fd0fe7dff4
60 changed files with 111 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java
View File

@ -2,7 +2,7 @@ package io.dataease.auth.handler;
import io.dataease.auth.entity.ASKToken;
import io.dataease.commons.utils.CodingUtil;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.ukey.dto.request.XpackUkeyDto;
import io.dataease.plugins.xpack.ukey.service.UkeyXpackService;
import org.apache.commons.lang3.StringUtils;

2
core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
View File

@ -19,7 +19,7 @@ import io.dataease.controller.sys.request.LdapAddRequest;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.entity.XpackLdapUserEntity;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.util.PluginUtils;
import io.dataease.plugins.xpack.cas.service.CasXpackService;
import io.dataease.plugins.xpack.ldap.dto.request.LdapValidateRequest;

2
core/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
View File

@ -17,7 +17,7 @@ import io.dataease.plugins.common.base.domain.SysUser;
import io.dataease.plugins.common.base.mapper.SysLoginLimitMapper;
import io.dataease.plugins.common.base.mapper.SysUserMapper;
import io.dataease.plugins.common.service.PluginCommonService;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.util.PluginUtils;
import io.dataease.plugins.xpack.cas.service.CasXpackService;
import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService;

2
core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
View File

@ -9,7 +9,7 @@ import io.dataease.commons.constants.DePermissionType;
import io.dataease.commons.constants.ResourceAuthLevel;
import io.dataease.commons.model.AuthURD;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.dto.request.XpackBaseTreeRequest;
import io.dataease.plugins.xpack.auth.dto.response.XpackVAuthModelDTO;
import io.dataease.plugins.xpack.auth.service.AuthXpackService;

2
core/backend/src/main/java/io/dataease/commons/utils/ServletUtils.java
View File

@ -1,7 +1,7 @@
package io.dataease.commons.utils;
import io.dataease.commons.constants.AuthConstants;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import org.springframework.core.env.Environment;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

2
core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
View File

@ -15,7 +15,7 @@ import io.dataease.job.sechedule.strategy.TaskHandler;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.common.entity.GlobalTaskEntity;
import io.dataease.plugins.common.entity.GlobalTaskInstance;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.dingtalk.dto.entity.DingtalkMsgResult;
import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService;
import io.dataease.plugins.xpack.email.dto.request.XpackEmailTaskRequest;

2
core/backend/src/main/java/io/dataease/listener/CasStatusListener.java
View File

@ -1,6 +1,6 @@
package io.dataease.listener;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.cas.service.CasXpackService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.boot.context.event.ApplicationReadyEvent;

3
core/backend/src/main/java/io/dataease/listener/DatasetCheckListener.java
View File

@ -4,7 +4,8 @@ import io.dataease.plugins.common.base.domain.DatasetTable;
import io.dataease.plugins.common.base.domain.DatasetTableExample;
import io.dataease.plugins.common.base.mapper.DatasetTableMapper;
import io.dataease.listener.util.CacheUtils;
import io.dataease.plugins.loader.ClassloaderResponsity;
import io.dataease.plugins.common.util.ClassloaderResponsity;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java
View File

@ -5,7 +5,7 @@ import io.dataease.job.sechedule.ScheduleManager;
import io.dataease.job.sechedule.strategy.TaskHandler;
import io.dataease.job.sechedule.strategy.TaskStrategyFactory;
import io.dataease.plugins.common.entity.GlobalTaskEntity;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.email.service.EmailXpackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;

4
core/backend/src/main/java/io/dataease/listener/RowPermissionMergeListener.java
View File

@ -2,8 +2,8 @@ package io.dataease.listener;
import io.dataease.plugins.common.base.domain.SysStartupJob;
import io.dataease.plugins.common.base.mapper.SysStartupJobMapper;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.loader.ClassloaderResponsity;
import io.dataease.plugins.common.util.ClassloaderResponsity;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.service.RowPermissionTreeService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;

2
core/backend/src/main/java/io/dataease/listener/SystemInitListener.java
View File

@ -3,7 +3,7 @@ package io.dataease.listener;
import io.dataease.plugins.common.base.domain.DataeaseCodeVersion;
import io.dataease.plugins.common.base.mapper.DataeaseCodeVersionMapper;
import io.dataease.ext.DEVersionMapper;
import io.dataease.plugins.loader.ClassloaderResponsity;
import io.dataease.plugins.common.util.ClassloaderResponsity;
import io.dataease.service.panel.PanelGroupService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

7
core/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java
View File

@ -1,10 +1,11 @@
package io.dataease.plugins.config;
import io.dataease.plugins.common.base.domain.MyPlugin;
import io.dataease.plugins.loader.ClassloaderResponsity;
import io.dataease.plugins.common.util.ClassloaderResponsity;
import io.dataease.plugins.common.util.ModuleClassLoader;
import io.dataease.plugins.common.util.MybatisLoader;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.loader.ControllerLoader;
import io.dataease.plugins.loader.ModuleClassLoader;
import io.dataease.plugins.loader.MybatisLoader;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
core/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java
View File

@ -2,7 +2,7 @@ package io.dataease.plugins.loader;
import io.dataease.commons.utils.LogUtil;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import org.springframework.stereotype.Component;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;

2
core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java
View File

@ -8,7 +8,7 @@ import io.dataease.commons.constants.ResourceAuthLevel;
import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager;
import io.dataease.i18n.Translator;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.dto.request.DataSetColumnPermissionsDTO;
import io.dataease.plugins.xpack.auth.dto.request.DatasetColumnPermissions;
import io.dataease.plugins.xpack.auth.service.ColumnPermissionService;

2
core/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
View File

@ -5,7 +5,7 @@ import io.dataease.plugins.common.dto.PluginSysMenu;
import io.dataease.plugins.common.dto.StaticResource;
import io.dataease.plugins.common.service.PluginComponentService;
import io.dataease.plugins.common.service.PluginMenuService;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

2
core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java
View File

@ -11,7 +11,7 @@ import io.dataease.commons.utils.Pager;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeRequest;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.dto.request.DataSetRowPermissionsDTO;
import io.dataease.plugins.xpack.auth.service.RowPermissionService;
import io.dataease.plugins.xpack.auth.service.RowPermissionTreeService;

3
core/backend/src/main/java/io/dataease/plugins/server/SSOServer.java
View File

@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.plugins.common.util.SpringContextUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -23,10 +24,8 @@ import io.dataease.auth.entity.TokenInfo;
import io.dataease.auth.service.AuthUserService;
import io.dataease.auth.util.JWTUtils;
import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.CodingUtil;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.oidc.dto.SSOToken;
import io.dataease.plugins.xpack.oidc.dto.SSOUserInfo;

2
core/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
View File

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.LogUtil;
import io.dataease.i18n.Translator;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.theme.service.ThemeXpackService;
@Api(tags = "xpack：系统主题")

2
core/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
View File

@ -10,7 +10,7 @@ import io.dataease.dto.SysLogDTO;
import io.dataease.listener.util.CacheUtils;
import io.dataease.plugins.common.dto.DatasourceBaseType;
import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.dto.request.XpackBaseTreeRequest;
import io.dataease.plugins.xpack.auth.dto.request.XpackSysAuthRequest;
import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetail;

2
core/backend/src/main/java/io/dataease/plugins/server/XCasServer.java
View File

@ -1,7 +1,7 @@
package io.dataease.plugins.server;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.cas.dto.CasSaveResult;
import io.dataease.plugins.xpack.cas.service.CasXpackService;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;

2
core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
View File

@ -20,7 +20,7 @@ import io.dataease.commons.utils.Pager;
import io.dataease.controller.sys.response.DeptNodeResponse;
import io.dataease.dto.SysLogDTO;
import io.dataease.listener.util.CacheUtils;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.dept.dto.request.*;
import io.dataease.plugins.xpack.dept.dto.response.DeptUserItemDTO;
import io.dataease.plugins.xpack.dept.dto.response.XpackDeptTreeNode;

2
core/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java
View File

@ -12,7 +12,7 @@ import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.dingtalk.dto.response.DingQrResult;
import io.dataease.plugins.xpack.dingtalk.dto.response.DingUserEntity;
import io.dataease.plugins.xpack.dingtalk.dto.response.DingtalkInfo;

2
core/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java
View File

@ -1,7 +1,7 @@
package io.dataease.plugins.server;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.display.service.DisplayXpackService;
import org.apache.shiro.authz.annotation.RequiresPermissions;

2
core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
View File

@ -14,7 +14,7 @@ import io.dataease.commons.utils.*;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.entity.GlobalTaskEntity;
import io.dataease.plugins.common.entity.GlobalTaskInstance;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.email.dto.request.*;
import io.dataease.plugins.xpack.email.dto.response.XpackTaskEntity;
import io.dataease.plugins.xpack.email.dto.response.XpackTaskGridDTO;

2
core/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
View File

@ -13,7 +13,7 @@ import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.lark.dto.entity.LarkAppUserEntity;

2
core/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java
View File

@ -12,7 +12,7 @@ import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.lark.dto.entity.LarkQrResult;
import io.dataease.plugins.xpack.lark.dto.response.LarkInfo;

2
core/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java
View File

@ -2,7 +2,7 @@ package io.dataease.plugins.server;
import io.dataease.plugins.common.entity.XpackLdapUserEntity;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.ldap.dto.response.LdapInfo;
import io.dataease.plugins.xpack.ldap.service.LdapXpackService;

2
core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
View File

@ -1,7 +1,7 @@
package io.dataease.plugins.server;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
import org.apache.commons.lang3.StringUtils;

2
core/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
View File

@ -17,7 +17,7 @@ import io.dataease.commons.utils.Pager;
import io.dataease.dto.SysLogDTO;
import io.dataease.listener.util.CacheUtils;
import io.dataease.plugins.common.request.KeywordRequest;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.role.dto.request.RoleUserMappingRequest;
import io.dataease.plugins.xpack.role.dto.request.RoleUserRequest;
import io.dataease.plugins.xpack.role.dto.response.RoleUserItem;

2
core/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java
View File

@ -3,7 +3,7 @@ package io.dataease.plugins.server;
import io.dataease.auth.annotation.DeLog;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.ukey.dto.request.XpackUkeyDto;
import io.dataease.plugins.xpack.ukey.service.UkeyXpackService;
import org.springframework.web.bind.annotation.*;

2
core/backend/src/main/java/io/dataease/plugins/server/XUserServer.java
View File

@ -2,7 +2,7 @@ package io.dataease.plugins.server;
import io.dataease.commons.constants.AuthConstants;
import io.dataease.commons.utils.LogUtil;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.user.service.UserXpackService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
core/backend/src/main/java/io/dataease/plugins/server/XWatermarkServer.java
View File

@ -1,6 +1,6 @@
package io.dataease.plugins.server;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.watermark.WatermarkService;
import io.dataease.plugins.xpack.watermark.dto.PanelWatermarkDTO;
import io.swagger.annotations.ApiOperation;

2
core/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
View File

@ -13,7 +13,7 @@ import io.dataease.commons.utils.ServletUtils;
import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.wecom.dto.entity.BaseQrResult;

2
core/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java
View File

@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.view.entity.PluginViewType;
import io.dataease.plugins.view.service.ViewPluginService;
import springfox.documentation.annotations.ApiIgnore;

2
core/backend/src/main/java/io/dataease/plugins/util/PluginUtils.java
View File

@ -4,7 +4,7 @@ import io.dataease.commons.license.DefaultLicenseService;
import io.dataease.commons.license.F2CLicenseResponse;
import io.dataease.plugins.common.dto.PluginSysMenu;
import io.dataease.plugins.common.service.PluginMenuService;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;

2
core/backend/src/main/java/io/dataease/provider/ProviderFactory.java
View File

@ -2,7 +2,7 @@ package io.dataease.provider;
import io.dataease.plugins.common.constants.DatasourceTypes;
import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.datasource.query.QueryProvider;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;

2
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -43,7 +43,7 @@ import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.plugins.datasource.query.QueryProvider;

2
core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
View File

@ -19,7 +19,7 @@ import io.dataease.dto.chart.ChartViewDTO;
import io.dataease.dto.panel.PanelGroupDTO;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.service.panel.PanelGroupService;
import java.io.File;

2
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -47,9 +47,9 @@ import io.dataease.plugins.common.dto.datasource.TableField;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeObj;
import io.dataease.plugins.common.util.ClassloaderResponsity;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.loader.ClassloaderResponsity;
import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem;
import io.dataease.provider.DDLProvider;
import io.dataease.provider.ProviderFactory;

2
core/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
View File

@ -11,7 +11,7 @@ import io.dataease.plugins.common.base.domain.DatasetTable;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.dto.chart.ChartCustomFilterItemDTO;
import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.dto.request.*;
import io.dataease.plugins.xpack.auth.dto.response.Item;
import io.dataease.plugins.xpack.auth.service.ColumnPermissionService;

2
core/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java
View File

@ -12,7 +12,7 @@ import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDT
import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeItem;
import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeObj;
import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeRequest;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.auth.service.RowPermissionTreeService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;

2
core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -40,7 +40,7 @@ import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.plugins.common.dto.datasource.TableDesc;
import io.dataease.plugins.common.entity.GlobalTaskEntity;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.datasource.entity.JdbcConfiguration;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.provider.ProviderFactory;

2
core/backend/src/main/java/io/dataease/service/message/service/strategy/SendDingtalk.java
View File

@ -2,7 +2,7 @@ package io.dataease.service.message.service.strategy;
import io.dataease.auth.service.AuthUserService;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService;
import io.dataease.service.message.service.SendService;
import io.dataease.service.sys.SysUserService;

2
core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLark.java
View File

@ -2,7 +2,7 @@ package io.dataease.service.message.service.strategy;
import io.dataease.auth.service.AuthUserService;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.lark.service.LarkXpackService;
import io.dataease.service.message.service.SendService;
import io.dataease.service.sys.SysUserService;

3
core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java
View File

@ -3,7 +3,8 @@ package io.dataease.service.message.service.strategy;
import io.dataease.auth.service.AuthUserService;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.larksuite.service.LarksuiteXpackService;
import io.dataease.service.message.service.SendService;
import io.dataease.service.sys.SysUserService;

2
core/backend/src/main/java/io/dataease/service/message/service/strategy/SendWecom.java
View File

@ -2,7 +2,7 @@ package io.dataease.service.message.service.strategy;
import io.dataease.auth.service.AuthUserService;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.wecom.service.WecomXpackService;
import io.dataease.service.message.service.SendService;
import io.dataease.service.sys.SysUserService;

3
core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
View File

@ -12,7 +12,7 @@ import io.dataease.plugins.common.base.domain.FileMetadata;
import io.dataease.plugins.common.base.domain.SystemParameter;
import io.dataease.plugins.common.base.domain.SystemParameterExample;
import io.dataease.plugins.common.base.mapper.SystemParameterMapper;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.cas.dto.CasSaveResult;
import io.dataease.plugins.xpack.cas.service.CasXpackService;
import io.dataease.plugins.xpack.display.service.DisplayXpackService;
@ -22,7 +22,6 @@ import io.dataease.service.datasource.DatasourceService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

2
extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java
View File

@ -55,7 +55,7 @@ public class DmConstants extends SQLConstants {
// public static final String GROUP_CONCAT = "vm_concat(%s)";
public static final String GROUP_CONCAT = "to_char(listagg(%s,',' ) within GROUP (order by (%s)))";
public static final String NAME = "oracle";
public static final String NAME = "dm";
}

2
extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseConstants.java
View File

@ -28,5 +28,5 @@ public class KingbaseConstants extends SQLConstants {
public static final String WHERE_BETWEEN = "'%s' AND '%s'";
public static final String BRACKETS = "(%s)";
public static final String GROUP_CONCAT = "to_char(listagg(%s,',' ) within GROUP (order by (%s)))";
public static final String NAME = "pg";
public static final String NAME = "kingbase";
}

2
extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java
View File

@ -32,7 +32,7 @@ public class KylinConstants extends SQLConstants {
public static final String BRACKETS = "(%s)";
public static final String NAME = "pg";
public static final String NAME = "kylin";
}

2
extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java
View File

@ -39,7 +39,7 @@ public class MaxConstants extends SQLConstants {
public static final String BRACKETS = "(%s)";
public static final String NAME = "pg";
public static final String NAME = "maxcompute";
}

2
extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongoConstants.java
View File

@ -42,7 +42,7 @@ public class MongoConstants extends SQLConstants {
public static final String BRACKETS = "(%s)";
public static final String NAME = "mysql";
public static final String NAME = "mongobi;
public static final String GROUP_CONCAT = "group_concat(%s)";

2
extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java
View File

@ -39,7 +39,7 @@ public class PrestoConstants extends SQLConstants {
public static final String BRACKETS = "(%s)";
public static final String NAME = "pg";
public static final String NAME = "presto";
}

1
extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java
View File

@ -1,6 +1,5 @@
package io.dataease.plugins.view.official.handler;
import com.google.gson.Gson;
import io.dataease.plugins.common.constants.datasource.SQLConstants;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
import io.dataease.plugins.common.util.ConstantsUtil;

44
core/backend/src/main/java/io/dataease/plugins/loader/ClassloaderResponsity.java → sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ClassloaderResponsity.java
View File

@ -1,10 +1,11 @@
package io.dataease.plugins.loader;
package io.dataease.plugins.common.util;
import io.dataease.plugins.config.SpringContextUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -14,32 +15,36 @@ public class ClassloaderResponsity {
private static Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class);
private ClassloaderResponsity(){}
private Map<String,ModuleClassLoader> responsityMap = new ConcurrentHashMap<>();
public void addClassLoader(String moduleName,ModuleClassLoader moduleClassLoader){
responsityMap.put(moduleName,moduleClassLoader);
private ClassloaderResponsity() {
}
public boolean containsClassLoader(String key){
private Map<String, ModuleClassLoader> responsityMap = new ConcurrentHashMap<>();
public void addClassLoader(String moduleName, ModuleClassLoader moduleClassLoader) {
responsityMap.put(moduleName, moduleClassLoader);
}
public boolean containsClassLoader(String key) {
return responsityMap.containsKey(key);
}
public ModuleClassLoader getClassLoader(String key){
public ModuleClassLoader getClassLoader(String key) {
return responsityMap.get(key);
}
public void removeClassLoader(String moduleName){
public Collection<ModuleClassLoader> getAllClassLoader() {
return responsityMap.values();
}
public void removeClassLoader(String moduleName) {
ModuleClassLoader moduleClassLoader = responsityMap.get(moduleName);
try {
List<String> registeredBean = moduleClassLoader.getRegisteredBean();
for (String beanName : registeredBean) {
logger.info("删除bean:"+beanName);
logger.info("删除bean:" + beanName);
SpringContextUtil.getBeanFactory().removeBeanDefinition(beanName);
}
@ -47,19 +52,16 @@ public class ClassloaderResponsity {
responsityMap.remove(moduleName);
} catch (IOException e) {
logger.error("删除"+moduleName+"模块发生错误");
logger.error("删除" + moduleName + "模块发生错误");
}
}
private static class ClassloaderResponsityHodler{
private static class ClassloaderResponsityHodler {
private static ClassloaderResponsity instamce = new ClassloaderResponsity();
}
public static ClassloaderResponsity getInstance(){
public static ClassloaderResponsity getInstance() {
return ClassloaderResponsityHodler.instamce;
}
}

29
sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ConstantsUtil.java
View File

@ -27,9 +27,8 @@ public class ConstantsUtil {
}*/
public static List<Class> getAllSQLConstants() {
if (CollectionUtils.isEmpty(SQLConstantsCache)){
Set<Class<? extends Class<?>>> classes = scanConstants(constsPackageName, SQLConstants.class);
SQLConstantsCache.addAll(classes);
if (CollectionUtils.isEmpty(SQLConstantsCache)) {
SQLConstantsCache.addAll(scanConstants(constsPackageName, SQLConstants.class));
}
return SQLConstantsCache;
}
@ -39,9 +38,10 @@ public class ConstantsUtil {
if (Stream.of(mysqlTreaties).collect(Collectors.toList()).contains(dsType)) {
dsType = "mysql";
}
List<Class> allSQLConstantsClass = ConstantsUtil.getAllSQLConstants();
Object result;
List<Class> allSQLConstantsClass = ConstantsUtil.getAllSQLConstants();
for (int i = 0; i < allSQLConstantsClass.size(); i++) {
Class classz = allSQLConstantsClass.get(i);
Object fieldValue = ReflectUtil.getFieldValue(classz, ConstantsUtil.TYPE_KEY_FIELD);
@ -50,6 +50,27 @@ public class ConstantsUtil {
return ObjectUtils.isNotEmpty(result) ? result.toString() : null;
}
}
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try {
for (ModuleClassLoader moduleClassLoader : ClassloaderResponsity.getInstance().getAllClassLoader()) {
Thread.currentThread().setContextClassLoader(moduleClassLoader);
for (Class<? extends Class<?>> scanConstant : scanConstants("io.dataease.plugins.datasource", SQLConstants.class)) {
Object fieldValue = ReflectUtil.getFieldValue(scanConstant, ConstantsUtil.TYPE_KEY_FIELD);
if (ObjectUtils.isNotEmpty(fieldValue) && StringUtils.equals(dsType, fieldValue.toString())) {
result = ReflectUtil.getFieldValue(scanConstant, constantKey);
return ObjectUtils.isNotEmpty(result) ? result.toString() : null;
}
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
}
return null;
}

3
core/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java → sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ModuleClassLoader.java
View File

@ -1,7 +1,6 @@
package io.dataease.plugins.loader;
package io.dataease.plugins.common.util;
import io.dataease.plugins.common.annotation.PluginResultMap;
import io.dataease.plugins.config.SpringContextUtil;
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.type.TypeAliasRegistry;

3
core/backend/src/main/java/io/dataease/plugins/loader/MyScanner.java → sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MyScanner.java
View File

@ -1,6 +1,5 @@
package io.dataease.plugins.loader;
package io.dataease.plugins.common.util;
import io.dataease.plugins.config.SpringContextUtil;
import org.mybatis.spring.mapper.MapperScannerConfigurer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

2
core/backend/src/main/java/io/dataease/plugins/loader/MybatisLoader.java → sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MybatisLoader.java
View File

@ -1,4 +1,4 @@
package io.dataease.plugins.loader;
package io.dataease.plugins.common.util;
import io.dataease.plugins.common.base.domain.MyPlugin;
import org.springframework.beans.factory.annotation.Autowired;

2
core/backend/src/main/java/io/dataease/plugins/config/SpringContextUtil.java → sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/SpringContextUtil.java
View File

@ -1,4 +1,4 @@
package io.dataease.plugins.config;
package io.dataease.plugins.common.util;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;