diff --git a/application-tenant/tenant-admin/pom.xml b/application-tenant/tenant-admin/pom.xml
index 2f65d87..c26be27 100644
--- a/application-tenant/tenant-admin/pom.xml
+++ b/application-tenant/tenant-admin/pom.xml
@@ -21,43 +21,74 @@
${ajcaptcha.version}
- apelet
- common-qy
- 1.0.0
+ com.baomidou
+ mybatis-plus-generator
+ ${mybatisplus.version}
- apelet
- common-redis
- 1.0.0
+ cn.afterturn
+ easypoi-base
+ 4.4.0
- apelet
- common-ext
- 1.0.0
+ cn.afterturn
+ easypoi-web
+ 4.4.0
+
+
+ cn.afterturn
+ easypoi-annotation
+ 4.4.0
+
+
+ org.jetbrains
+ annotations
+ 24.0.1
+
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.1
+
+
+ org.springframework.boot
+ spring-boot-starter-quartz
+
+
+ org.quartz-scheduler
+ quartz
+ 2.3.2
+ org.mybatis
+ mybatis-spring
+ 2.1.2
+
+
+
+
apelet
- common-dict
+ common-core
1.0.0
apelet
- common-datafilter
+ common-redis
1.0.0
apelet
- common-mobile
+ common-log
1.0.0
apelet
- common-core
+ common-online
1.0.0
apelet
- common-log
+ common-report
1.0.0
@@ -67,10 +98,9 @@
apelet
- common-aliyun-oss
+ common-datafilter
1.0.0
-
apelet
common-dbutil
@@ -78,66 +108,48 @@
apelet
- common-swagger
+ common-tenant
1.0.0
-
apelet
- common-generator
+ common-dict
1.0.0
apelet
- common-eas
+ common-mobile
1.0.0
apelet
- common-online
+ common-flow-online
1.0.0
- com.baomidou
- mybatis-plus-generator
- ${mybatisplus.version}
-
-
- cn.afterturn
- easypoi-base
- 4.4.0
-
-
- cn.afterturn
- easypoi-web
- 4.4.0
-
-
- cn.afterturn
- easypoi-annotation
- 4.4.0
-
-
- org.jetbrains
- annotations
- 24.0.1
+ apelet
+ common-flow
+ 1.0.0
- com.xuxueli
- xxl-job-core
- 2.3.1
- compile
+ apelet
+ common-botp
+ 1.0.0
- org.springframework.boot
- spring-boot-starter-quartz
+ apelet
+ common-orm
+ 1.0.0
- org.quartz-scheduler
- quartz
- 2.3.2
+ apelet
+ common-ext
+ 1.0.0
+
+
+
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/DeployPluginController.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/DeployPluginController.java
index bf886f5..130c687 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/DeployPluginController.java
+++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/DeployPluginController.java
@@ -1,12 +1,10 @@
package apelet.tenantadmin.tenant.controller;
-import apelet.common.aliyun.oss.util.AliyunOssUpDownloader;
import apelet.common.core.annotation.MyRequestBody;
import apelet.common.core.constant.ErrorCodeEnum;
import apelet.common.core.object.*;
import apelet.common.core.upload.*;
import apelet.common.core.util.MyCommonUtil;
-import apelet.common.core.util.MyModelUtil;
import apelet.common.core.util.MyPageUtil;
import apelet.common.core.validator.UpdateGroup;
import apelet.common.log.annotation.OperationLog;
@@ -17,11 +15,7 @@ import apelet.tenantadmin.config.ApplicationConfig;
import apelet.tenantadmin.tenant.model.DeployPlugin;
import apelet.tenantadmin.tenant.plugin.PluginService;
import apelet.tenantadmin.tenant.service.IDeployPluginService;
-import apelet.tenantadmin.upms.model.SysUser;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.BooleanUtil;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.page.PageMethod;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
index 67d5f77..a65d018 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
+++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
@@ -60,6 +60,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -69,7 +70,6 @@ import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import apelet.common.eas.util.EasUtil;
/**
* 登录接口控制器类。
*
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/service/impl/SysUserServiceImpl.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/service/impl/SysUserServiceImpl.java
index c56f557..1a38cfe 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/service/impl/SysUserServiceImpl.java
+++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,5 @@
package apelet.tenantadmin.upms.service.impl;
-import apelet.common.botp.db.util.DbUtil;
import apelet.common.core.base.dao.BaseDaoMapper;
import apelet.common.core.base.service.BaseService;
import apelet.common.core.constant.GlobalDeletedFlag;
@@ -13,9 +12,7 @@ import apelet.common.eas.service.impl.EASSyncService;
import apelet.common.ext.base.BizWidgetDatasource;
import apelet.common.ext.constant.BizWidgetDatasourceType;
import apelet.common.ext.util.BizWidgetDatasourceExtHelper;
-import apelet.common.generator.utils.OrmGenDataSourceUtil;
import apelet.common.sequence.wrapper.IdGeneratorWrapper;
-import apelet.tenantadmin.upms.controller.SysUserController;
import apelet.tenantadmin.upms.dao.*;
import apelet.tenantadmin.upms.model.*;
import apelet.tenantadmin.upms.model.constant.SysUserStatus;
diff --git a/common/common-qy/pom.xml b/common/common-qy/pom.xml
index b0d9f3e..88684a1 100644
--- a/common/common-qy/pom.xml
+++ b/common/common-qy/pom.xml
@@ -17,9 +17,22 @@
apelet
common-core
1.0.0
- compile
-
+
+ io.swagger.core.v3
+ swagger-annotations
+ 2.2.28
+
+
+ apelet
+ common-generator
+ 1.0.0
+
+
+ apelet
+ common-orm
+ 1.0.0
+
diff --git a/common/pom.xml b/common/pom.xml
index e31bfac..10162df 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- common
+ apelet_saas
apelet
1.0.0
@@ -16,32 +16,28 @@
1.0.0
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1fad44e..f3a2409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
2021.0.6
- 2021.1
+ 2021.0.5.0
2.7.10
2.7.10
UTF-8
@@ -70,15 +70,15 @@
dev
- localhost:8848
+ 192.168.100.25:8848
- localhost:8848
+ 192.168.100.25:8848
DEFAULT_GROUP
-
+ 9f355e7b-925d-471a-89a1-d65a0a812099
- localhost:9092
+ 192.168.100.25:9092