添加包修改包名

backend/pom.xml

@@ -195,8 +195,6 @@
             <version>2.9.1</version>
         </dependency>
 
-        <!--由于暂时插件接口未注册到公司仓库，请先down下代码安装到本地仓库
-        https://github.com/dataease/dataease-plugins-->
         <dependency>
             <groupId>com.ipsos</groupId>
             <artifactId>plugin-interface</artifactId>
@@ -253,6 +251,12 @@
             <artifactId>postgresql</artifactId>
             <version>42.2.14</version>
         </dependency>
+        <dependency>
+            <groupId>com.ipsos</groupId>
+            <artifactId>plugin-common</artifactId>
+            <version>1.3-LOCAL</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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;

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;

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;

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;

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;

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.common.dto.PluginSysMenu;
-import com.ipsos.plugins.common.service.PluginComponentService;
+import com.ipsos.common.service.PluginComponentService;
-import com.ipsos.plugins.common.service.PluginMenuService;
+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;

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;

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;

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;

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.common.dto.PluginSysMenu;
-import com.ipsos.plugins.common.service.PluginMenuService;
+import com.ipsos.common.service.PluginMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;

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;

frontend/pom.xml

@@ -28,34 +28,34 @@
           <execution>
             <id>install node and npm</id>
             <goals>
-              <goal>install-node-and-npm</goal>
+              <goal>install-node-and-yarn</goal>
             </goals>
             <configuration>
               <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
               <nodeVersion>v15.12.0</nodeVersion>
-              <npmVersion>7.6.3</npmVersion>
+              <yarnVersion>v1.22.17</yarnVersion>
             </configuration>
           </execution>
 
           <execution>
             <id>npm install</id>
             <goals>
-              <goal>npm</goal>
+              <goal>yarn</goal>
             </goals>
             <!-- Optional configuration which provides for running any npm command -->
             <configuration>
               <npmRegistryURL>https://registry.npm.taobao.org</npmRegistryURL>
-              <arguments>install --force --verbose</arguments>
+              <arguments>install --verbose</arguments>
             </configuration>
           </execution>
 
           <execution>
             <id>npm run build</id>
             <goals>
-              <goal>npm</goal>
+              <goal>yarn</goal>
             </goals>
             <configuration>
-              <arguments>run build</arguments>
+              <arguments>build</arguments>
             </configuration>
           </execution>
         </executions>

plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java

@@ -10,9 +10,9 @@ public class XpackLdapUserEntity {
     private String nickName;
     */
 
-    private String username;
+    private String userName;
 
-    private String nickname;
+    private String nickName;
     
     private String email;
 

plugins/plugin-interface/pom.xml

@@ -13,9 +13,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.dataease</groupId>
+            <groupId>com.ipsos</groupId>
-            <artifactId>dataease-plugin-common</artifactId>
+            <artifactId>plugin-common</artifactId>
-            <version>1.3</version>
+            <version>1.3-LOCAL</version>
         </dependency>
     </dependencies>
 

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

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;

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;

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;

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;
 
 /**

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;

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;

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;

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

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 com.ipsos.common.entity.XpackGridRequest;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.service.PluginMenuService;
 
 import java.util.List;
 

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 com.ipsos.common.entity.XpackLdapUserEntity;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.service.PluginMenuService;
 
 public abstract class LdapXpackService extends PluginMenuService{
 

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;

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 com.ipsos.common.entity.XpackGridRequest;
-import io.dataease.plugins.common.service.PluginMenuService;
+import com.ipsos.common.service.PluginMenuService;
 
 import java.util.List;
 

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;

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;
 

pom.xml

@@ -16,9 +16,9 @@
 
     <name>ipsos-bi</name>
     <modules>
-        <module>frontend</module>
         <module>quartz-spring-boot-starter</module>
         <module>plugins</module>
+        <module>frontend</module>
         <module>backend</module>
     </modules>
 

quartz-spring-boot-starter/pom.xml

@@ -72,26 +72,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <!-- 寻找 setting.xml 里配置的密码¬-->
-                <configuration>
-                    <gpgArguments>
-                        <arg>--pinentry-mode</arg>
-                        <arg>loopback</arg>
-                    </gpgArguments>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>