diff --git a/core/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java b/core/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java index 7087f1b1e3..14cc852806 100644 --- a/core/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java +++ b/core/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 3684ff8869..c1a6e88be0 100644 --- a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java b/core/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java index 7d91965883..7a26886eae 100644 --- a/core/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java +++ b/core/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java index a6ebbf2736..5b45d27765 100644 --- a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java +++ b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/commons/utils/ServletUtils.java b/core/backend/src/main/java/io/dataease/commons/utils/ServletUtils.java index acbfc40417..7becef9dd6 100644 --- a/core/backend/src/main/java/io/dataease/commons/utils/ServletUtils.java +++ b/core/backend/src/main/java/io/dataease/commons/utils/ServletUtils.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 55826bd92b..0e1d7ff6a2 100644 --- a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/listener/CasStatusListener.java b/core/backend/src/main/java/io/dataease/listener/CasStatusListener.java index aa4c1abcd1..ec63875394 100644 --- a/core/backend/src/main/java/io/dataease/listener/CasStatusListener.java +++ b/core/backend/src/main/java/io/dataease/listener/CasStatusListener.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/listener/DatasetCheckListener.java b/core/backend/src/main/java/io/dataease/listener/DatasetCheckListener.java index f37831e077..5dc52c4dcb 100644 --- a/core/backend/src/main/java/io/dataease/listener/DatasetCheckListener.java +++ b/core/backend/src/main/java/io/dataease/listener/DatasetCheckListener.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java b/core/backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java index c8de41274a..04dcae6db7 100644 --- a/core/backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java +++ b/core/backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/listener/RowPermissionMergeListener.java b/core/backend/src/main/java/io/dataease/listener/RowPermissionMergeListener.java index 800d5f15f7..5ce3ca731b 100644 --- a/core/backend/src/main/java/io/dataease/listener/RowPermissionMergeListener.java +++ b/core/backend/src/main/java/io/dataease/listener/RowPermissionMergeListener.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/listener/SystemInitListener.java b/core/backend/src/main/java/io/dataease/listener/SystemInitListener.java index fa4ac76e55..104d7f8e14 100644 --- a/core/backend/src/main/java/io/dataease/listener/SystemInitListener.java +++ b/core/backend/src/main/java/io/dataease/listener/SystemInitListener.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java b/core/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java index a0e0745a18..fb3e2b01c1 100644 --- a/core/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java +++ b/core/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java b/core/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java index 45d57624bb..d8d5c839ea 100644 --- a/core/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java +++ b/core/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java b/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java index bb8d7fe090..8d56190766 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java b/core/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java index dc32281171..1d88bbb8f3 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java b/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java index 55e8c6c716..d407888475 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/SSOServer.java b/core/backend/src/main/java/io/dataease/plugins/server/SSOServer.java index 199ca15787..675a2dbf0b 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/SSOServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/SSOServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java b/core/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java index e1802e3190..88cbd6baea 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java @@ -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:系统主题") diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java index 9c1e1efbcd..61e4094dce 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XCasServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XCasServer.java index a41476e0ce..dae67bfc21 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XCasServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XCasServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java index 76c1236bc9..69794aac61 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java index 9a3964d444..4710947160 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java index ef987a473c..595ffd3213 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java index ee5e5335a7..ffb7f95c26 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java index 79f6fefbe0..3ba784fabb 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java index 7754416fd9..e840daadde 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java index 2e66c91e6d..243741c59b 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java index 042207e088..558e52c45a 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java index 89c21d583f..b2d138ae3a 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java index 49ec24422e..70738bda5e 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java @@ -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.*; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XUserServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XUserServer.java index d4ce11e3ed..fe20c8e055 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XUserServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XUserServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XWatermarkServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XWatermarkServer.java index 0a1740fcb6..cf9b381323 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XWatermarkServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XWatermarkServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java index 79fd7d769e..727a9de03d 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java b/core/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java index 94e33239aa..7965db4ac9 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/util/PluginUtils.java b/core/backend/src/main/java/io/dataease/plugins/util/PluginUtils.java index ffbecb5d67..baf93ef8af 100644 --- a/core/backend/src/main/java/io/dataease/plugins/util/PluginUtils.java +++ b/core/backend/src/main/java/io/dataease/plugins/util/PluginUtils.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/provider/ProviderFactory.java b/core/backend/src/main/java/io/dataease/provider/ProviderFactory.java index 6a5a12de4f..03c4371cd4 100644 --- a/core/backend/src/main/java/io/dataease/provider/ProviderFactory.java +++ b/core/backend/src/main/java/io/dataease/provider/ProviderFactory.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index bd75627656..ed6218f281 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java index a0eafb69f1..e021b349f9 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 1ac62f60d3..7e52ef1a6d 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/dataset/PermissionService.java b/core/backend/src/main/java/io/dataease/service/dataset/PermissionService.java index 7d9a13c001..ac33131844 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/PermissionService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/PermissionService.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java b/core/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java index 040e26d6fe..fc242c376f 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 60dcda1468..d69165c1c8 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendDingtalk.java b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendDingtalk.java index 3f428d71aa..976455cee0 100644 --- a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendDingtalk.java +++ b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendDingtalk.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLark.java b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLark.java index 1c400ec3c9..e7014031fa 100644 --- a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLark.java +++ b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLark.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java index d5f49cfc77..d3f6179bf8 100644 --- a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java +++ b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendWecom.java b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendWecom.java index 4ccdf141e0..cf0eca85f8 100644 --- a/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendWecom.java +++ b/core/backend/src/main/java/io/dataease/service/message/service/strategy/SendWecom.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index 91a6033d92..f4c5bc0207 100644 --- a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -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; diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java index d067905573..7a392b73fe 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java +++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java @@ -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"; } diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseConstants.java b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseConstants.java index ecb89b31c5..6a9fa94409 100644 --- a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseConstants.java +++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseConstants.java @@ -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"; } diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java index 51ab017a64..05e13b06fd 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java +++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java @@ -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"; } diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java index b7b80fdf69..26e1835eb8 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java @@ -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"; } diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongoConstants.java b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongoConstants.java index a6610fad69..4f7270ce66 100644 --- a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongoConstants.java +++ b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongoConstants.java @@ -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)"; diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java index a71916ecfb..696319e9bc 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java +++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java @@ -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"; } diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java index 55d05e2620..e90992814a 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/loader/ClassloaderResponsity.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ClassloaderResponsity.java similarity index 54% rename from core/backend/src/main/java/io/dataease/plugins/loader/ClassloaderResponsity.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ClassloaderResponsity.java index 1ed8e86bb8..edc384b108 100644 --- a/core/backend/src/main/java/io/dataease/plugins/loader/ClassloaderResponsity.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ClassloaderResponsity.java @@ -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 responsityMap = new ConcurrentHashMap<>(); - - - - public void addClassLoader(String moduleName,ModuleClassLoader moduleClassLoader){ - responsityMap.put(moduleName,moduleClassLoader); + private ClassloaderResponsity() { } - public boolean containsClassLoader(String key){ + + private Map 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 getAllClassLoader() { + return responsityMap.values(); + } + + public void removeClassLoader(String moduleName) { ModuleClassLoader moduleClassLoader = responsityMap.get(moduleName); try { List 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; } } diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ConstantsUtil.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ConstantsUtil.java index 383f5f3d92..eb5afcf379 100644 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ConstantsUtil.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ConstantsUtil.java @@ -27,9 +27,8 @@ public class ConstantsUtil { }*/ public static List getAllSQLConstants() { - if (CollectionUtils.isEmpty(SQLConstantsCache)){ - Set>> 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 allSQLConstantsClass = ConstantsUtil.getAllSQLConstants(); + Object result; + List 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> 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; } diff --git a/core/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ModuleClassLoader.java similarity index 98% rename from core/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ModuleClassLoader.java index ab29523fe4..9710bf279b 100644 --- a/core/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/ModuleClassLoader.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/loader/MyScanner.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MyScanner.java similarity index 92% rename from core/backend/src/main/java/io/dataease/plugins/loader/MyScanner.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MyScanner.java index fa099f7f27..2457e50308 100644 --- a/core/backend/src/main/java/io/dataease/plugins/loader/MyScanner.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MyScanner.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/loader/MybatisLoader.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MybatisLoader.java similarity index 90% rename from core/backend/src/main/java/io/dataease/plugins/loader/MybatisLoader.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MybatisLoader.java index 888600ae4d..9ef6f5825d 100644 --- a/core/backend/src/main/java/io/dataease/plugins/loader/MybatisLoader.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/MybatisLoader.java @@ -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; diff --git a/core/backend/src/main/java/io/dataease/plugins/config/SpringContextUtil.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/SpringContextUtil.java similarity index 98% rename from core/backend/src/main/java/io/dataease/plugins/config/SpringContextUtil.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/SpringContextUtil.java index cd9bb49691..a23d1e20f7 100644 --- a/core/backend/src/main/java/io/dataease/plugins/config/SpringContextUtil.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/SpringContextUtil.java @@ -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;