diff --git a/backend/pom.xml b/backend/pom.xml
index 4e47a0a..76666a7 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -195,8 +195,6 @@
2.9.1
-
com.ipsos
plugin-interface
@@ -253,6 +251,12 @@
postgresql
42.2.14
+
+ com.ipsos
+ plugin-common
+ 1.3-LOCAL
+ compile
+
diff --git a/backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java b/backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java
index e1f409c..069be81 100644
--- a/backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java
+++ b/backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java
@@ -7,7 +7,7 @@ import com.ipsos.base.domain.SysMenu;
import com.ipsos.base.domain.SysMenuExample;
import com.ipsos.base.mapper.SysMenuMapper;
import com.ipsos.base.mapper.ext.ExtPluginSysMenuMapper;
-import com.ipsos.plugins.common.dto.PluginSysMenu;
+import com.ipsos.common.dto.PluginSysMenu;
import com.ipsos.plugins.util.PluginUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/com/ipsos/base/mapper/ext/ExtPluginSysMenuMapper.java b/backend/src/main/java/com/ipsos/base/mapper/ext/ExtPluginSysMenuMapper.java
index 978690d..b65e03d 100644
--- a/backend/src/main/java/com/ipsos/base/mapper/ext/ExtPluginSysMenuMapper.java
+++ b/backend/src/main/java/com/ipsos/base/mapper/ext/ExtPluginSysMenuMapper.java
@@ -1,6 +1,6 @@
package com.ipsos.base.mapper.ext;
-import com.ipsos.plugins.common.dto.PluginSysMenu;
+import com.ipsos.common.dto.PluginSysMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/backend/src/main/java/com/ipsos/config/MybatisConfig.java b/backend/src/main/java/com/ipsos/config/MybatisConfig.java
index dce70c5..b55d266 100644
--- a/backend/src/main/java/com/ipsos/config/MybatisConfig.java
+++ b/backend/src/main/java/com/ipsos/config/MybatisConfig.java
@@ -5,7 +5,6 @@ import com.ipsos.base.domain.Datasource;
import com.ipsos.commons.utils.CompressUtils;
import com.ipsos.commons.utils.MybatisInterceptorConfig;
import com.ipsos.interceptor.MybatisInterceptor;
-import com.ipsos.base.domain.*;
import com.ipsos.base.domain.AuthSource;
import com.ipsos.base.domain.FileContent;
import org.mybatis.spring.annotation.MapperScan;
diff --git a/backend/src/main/java/com/ipsos/controller/sys/request/LdapAddRequest.java b/backend/src/main/java/com/ipsos/controller/sys/request/LdapAddRequest.java
index 208833d..4266c07 100644
--- a/backend/src/main/java/com/ipsos/controller/sys/request/LdapAddRequest.java
+++ b/backend/src/main/java/com/ipsos/controller/sys/request/LdapAddRequest.java
@@ -1,6 +1,6 @@
package com.ipsos.controller.sys.request;
-import com.ipsos.plugins.common.entity.XpackLdapUserEntity;
+import com.ipsos.common.entity.XpackLdapUserEntity;
import lombok.Data;
import java.io.Serializable;
diff --git a/backend/src/main/java/com/ipsos/plugins/loader/ModuleClassLoader.java b/backend/src/main/java/com/ipsos/plugins/loader/ModuleClassLoader.java
index 6317404..443dbeb 100644
--- a/backend/src/main/java/com/ipsos/plugins/loader/ModuleClassLoader.java
+++ b/backend/src/main/java/com/ipsos/plugins/loader/ModuleClassLoader.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.loader;
-import com.ipsos.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import com.ipsos.plugins.config.SpringContextUtil;
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/backend/src/main/java/com/ipsos/plugins/server/PluginCommonServer.java b/backend/src/main/java/com/ipsos/plugins/server/PluginCommonServer.java
index d7025b7..2830dcc 100644
--- a/backend/src/main/java/com/ipsos/plugins/server/PluginCommonServer.java
+++ b/backend/src/main/java/com/ipsos/plugins/server/PluginCommonServer.java
@@ -1,9 +1,9 @@
package com.ipsos.plugins.server;
import com.ipsos.commons.utils.ServletUtils;
-import com.ipsos.plugins.common.dto.PluginSysMenu;
-import com.ipsos.plugins.common.service.PluginComponentService;
-import com.ipsos.plugins.common.service.PluginMenuService;
+import com.ipsos.common.dto.PluginSysMenu;
+import com.ipsos.common.service.PluginComponentService;
+import com.ipsos.common.service.PluginMenuService;
import com.ipsos.plugins.config.SpringContextUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/backend/src/main/java/com/ipsos/plugins/server/XDeptServer.java b/backend/src/main/java/com/ipsos/plugins/server/XDeptServer.java
index c7e6562..bb18df8 100644
--- a/backend/src/main/java/com/ipsos/plugins/server/XDeptServer.java
+++ b/backend/src/main/java/com/ipsos/plugins/server/XDeptServer.java
@@ -3,7 +3,7 @@ package com.ipsos.plugins.server;
import com.ipsos.controller.sys.response.DeptNodeResponse;
import com.ipsos.commons.utils.BeanUtils;
-import com.ipsos.plugins.common.entity.XpackGridRequest;
+import com.ipsos.common.entity.XpackGridRequest;
import com.ipsos.plugins.config.SpringContextUtil;
import com.ipsos.plugins.xpack.dept.dto.request.XpackCreateDept;
import com.ipsos.plugins.xpack.dept.dto.request.XpackDeleteDept;
diff --git a/backend/src/main/java/com/ipsos/plugins/server/XLdapServer.java b/backend/src/main/java/com/ipsos/plugins/server/XLdapServer.java
index 8da9822..7345ccd 100644
--- a/backend/src/main/java/com/ipsos/plugins/server/XLdapServer.java
+++ b/backend/src/main/java/com/ipsos/plugins/server/XLdapServer.java
@@ -1,7 +1,7 @@
package com.ipsos.plugins.server;
-import com.ipsos.plugins.common.entity.XpackLdapUserEntity;
+import com.ipsos.common.entity.XpackLdapUserEntity;
import com.ipsos.plugins.config.SpringContextUtil;
import com.ipsos.plugins.xpack.display.dto.response.SysSettingDto;
import com.ipsos.plugins.xpack.ldap.dto.response.LdapInfo;
diff --git a/backend/src/main/java/com/ipsos/plugins/server/XRoleServer.java b/backend/src/main/java/com/ipsos/plugins/server/XRoleServer.java
index 4996076..ddca176 100644
--- a/backend/src/main/java/com/ipsos/plugins/server/XRoleServer.java
+++ b/backend/src/main/java/com/ipsos/plugins/server/XRoleServer.java
@@ -5,7 +5,7 @@ import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.ipsos.commons.utils.PageUtils;
import com.ipsos.commons.utils.Pager;
-import com.ipsos.plugins.common.entity.XpackGridRequest;
+import com.ipsos.common.entity.XpackGridRequest;
import com.ipsos.plugins.config.SpringContextUtil;
import com.ipsos.plugins.xpack.role.dto.response.XpackRoleDto;
import com.ipsos.plugins.xpack.role.dto.response.XpackRoleItemDto;
diff --git a/backend/src/main/java/com/ipsos/plugins/util/PluginUtils.java b/backend/src/main/java/com/ipsos/plugins/util/PluginUtils.java
index 07370f5..a594e7c 100644
--- a/backend/src/main/java/com/ipsos/plugins/util/PluginUtils.java
+++ b/backend/src/main/java/com/ipsos/plugins/util/PluginUtils.java
@@ -3,8 +3,8 @@ package com.ipsos.plugins.util;
import com.ipsos.plugins.config.SpringContextUtil;
import com.ipsos.commons.license.DefaultLicenseService;
import com.ipsos.commons.license.F2CLicenseResponse;
-import com.ipsos.plugins.common.dto.PluginSysMenu;
-import com.ipsos.plugins.common.service.PluginMenuService;
+import com.ipsos.common.dto.PluginSysMenu;
+import com.ipsos.common.service.PluginMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
diff --git a/backend/src/main/java/com/ipsos/service/sys/SysUserService.java b/backend/src/main/java/com/ipsos/service/sys/SysUserService.java
index e8759f5..a06d4ea 100644
--- a/backend/src/main/java/com/ipsos/service/sys/SysUserService.java
+++ b/backend/src/main/java/com/ipsos/service/sys/SysUserService.java
@@ -1,6 +1,7 @@
package com.ipsos.service.sys;
import com.ipsos.auth.api.dto.CurrentUserDto;
+import com.ipsos.common.entity.XpackLdapUserEntity;
import com.ipsos.controller.sys.base.BaseGridRequest;
import com.ipsos.controller.sys.request.LdapAddRequest;
import com.ipsos.controller.sys.request.SysUserCreateRequest;
@@ -21,7 +22,6 @@ import com.ipsos.commons.utils.AuthUtils;
import com.ipsos.commons.utils.BeanUtils;
import com.ipsos.commons.utils.CodingUtil;
import com.ipsos.i18n.Translator;
-import com.ipsos.plugins.common.entity.XpackLdapUserEntity;
import com.ipsos.plugins.xpack.oidc.dto.SSOUserInfo;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 523c4e1..ade2b40 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -28,34 +28,34 @@
install node and npm
- install-node-and-npm
+ install-node-and-yarn
v15.12.0
- 7.6.3
+ v1.22.17
npm install
- npm
+ yarn
https://registry.npm.taobao.org
- install --force --verbose
+ install --verbose
npm run build
- npm
+ yarn
- run build
+ build
diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java
index eada3ce..d6ebe6c 100644
--- a/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java
+++ b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java
@@ -4,15 +4,15 @@ import lombok.Data;
@Data
public class XpackLdapUserEntity {
- /*
+ /*
private String userName;
private String nickName;
*/
- private String username;
+ private String userName;
- private String nickname;
+ private String nickName;
private String email;
diff --git a/plugins/plugin-interface/pom.xml b/plugins/plugin-interface/pom.xml
index 017e98a..c60730d 100644
--- a/plugins/plugin-interface/pom.xml
+++ b/plugins/plugin-interface/pom.xml
@@ -13,9 +13,9 @@
- io.dataease
- dataease-plugin-common
- 1.3
+ com.ipsos
+ plugin-common
+ 1.3-LOCAL
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java
index 0c1faa1..0f12fd3 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.request;
-import io.dataease.plugins.common.constants.PluginSystemConstants;
+import com.ipsos.common.constants.PluginSystemConstants;
import lombok.Data;
@Data
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java
index 66fe0ec..78816cd 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.io.Serializable;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java
index 14f602b..6234b4e 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.util.List;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java
index cdb7b67..fe80aef 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.io.Serializable;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java
index de3c9ea..4f85836 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
/**
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java
index 96390fa..4f19e77 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.io.Serializable;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java
index 2bb6854..440ce7d 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.auth.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.util.List;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java
index d19a544..d1d3fa5 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java
@@ -1,7 +1,7 @@
package com.ipsos.plugins.xpack.auth.service;
import com.ipsos.plugins.xpack.auth.dto.response.XpackVAuthModelDTO;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.service.PluginMenuService;
import com.ipsos.plugins.xpack.auth.dto.request.XpackBaseTreeRequest;
import com.ipsos.plugins.xpack.auth.dto.request.XpackSysAuthRequest;
import com.ipsos.plugins.xpack.auth.dto.response.XpackSysAuthDetail;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java
index c4e8a31..9e47c6f 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java
@@ -1,7 +1,7 @@
package com.ipsos.plugins.xpack.dept.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
@Data
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java
index 3ce7b51..e77dcd7 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java
@@ -5,8 +5,8 @@ import com.ipsos.plugins.xpack.dept.dto.request.XpackDeleteDept;
import com.ipsos.plugins.xpack.dept.dto.request.XpackMoveDept;
import com.ipsos.plugins.xpack.dept.dto.response.XpackDeptTreeNode;
import com.ipsos.plugins.xpack.dept.dto.response.XpackSysDept;
-import io.dataease.plugins.common.entity.XpackGridRequest;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.entity.XpackGridRequest;
+import com.ipsos.common.service.PluginMenuService;
import java.util.List;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java
index 603026f..8cdf5a5 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java
@@ -6,8 +6,8 @@ import com.ipsos.plugins.xpack.display.dto.response.SysSettingDto;
import com.ipsos.plugins.xpack.ldap.dto.request.LdapValidateRequest;
import com.ipsos.plugins.xpack.ldap.dto.response.LdapInfo;
import com.ipsos.plugins.xpack.ldap.dto.response.ValidateResult;
-import io.dataease.plugins.common.entity.XpackLdapUserEntity;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.entity.XpackLdapUserEntity;
+import com.ipsos.common.service.PluginMenuService;
public abstract class LdapXpackService extends PluginMenuService{
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java
index d0848fc..b3f0a0c 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.role.dto.response;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.io.Serializable;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java
index d20f9c1..54703ea 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java
@@ -2,8 +2,8 @@ package com.ipsos.plugins.xpack.role.service;
import com.ipsos.plugins.xpack.role.dto.response.XpackRoleDto;
import com.ipsos.plugins.xpack.role.dto.response.XpackRoleItemDto;
-import io.dataease.plugins.common.entity.XpackGridRequest;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.entity.XpackGridRequest;
+import com.ipsos.common.service.PluginMenuService;
import java.util.List;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java
index 97cb4f0..689a4c3 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java
@@ -1,6 +1,6 @@
package com.ipsos.plugins.xpack.ukey.dto.request;
-import io.dataease.plugins.common.annotation.PluginResultMap;
+import com.ipsos.common.annotation.PluginResultMap;
import lombok.Data;
import java.io.Serializable;
diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java
index 6c3dbd4..c3c6eb3 100644
--- a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java
+++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java
@@ -1,7 +1,7 @@
package com.ipsos.plugins.xpack.ukey.service;
import com.ipsos.plugins.xpack.ukey.dto.request.XpackUkeyDto;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.service.PluginMenuService;
import java.util.List;
diff --git a/pom.xml b/pom.xml
index ab7f046..1f044e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
ipsos-bi
- frontend
quartz-spring-boot-starter
plugins
+ frontend
backend
diff --git a/quartz-spring-boot-starter/pom.xml b/quartz-spring-boot-starter/pom.xml
index e9a22d6..1c12d8b 100644
--- a/quartz-spring-boot-starter/pom.xml
+++ b/quartz-spring-boot-starter/pom.xml
@@ -72,26 +72,6 @@
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.5
-
-
- verify
-
- sign
-
-
-
-
-
-
- --pinentry-mode
- loopback
-
-
-
org.apache.maven.plugins
maven-compiler-plugin