ligang
/
apelet_xhgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

master
齊 6 days ago
parent
a817943dde
commit
7f15cb1074
7 changed files with 89 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      application-tenant/tenant-admin/pom.xml
  2. 6
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/DeployPluginController.java
  3. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
  4. 3
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/service/impl/SysUserServiceImpl.java
  5. 17
      common/common-qy/pom.xml
  6. 10
      common/pom.xml
  7. 10
      pom.xml

118
application-tenant/tenant-admin/pom.xml
Unescape View File

@ -21,43 +21,74 @@
<version>${ajcaptcha.version}</version> <version>${ajcaptcha.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>com.baomidou</groupId>
<artifactId>common-qy</artifactId> <artifactId>mybatis-plus-generator</artifactId>
<version>1.0.0</version> <version>${mybatisplus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>cn.afterturn</groupId>
<artifactId>common-redis</artifactId> <artifactId>easypoi-base</artifactId>
<version>1.0.0</version> <version>4.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>cn.afterturn</groupId>
<artifactId>common-ext</artifactId> <artifactId>easypoi-web</artifactId>
<version>1.0.0</version> <version>4.4.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.1</version>
</dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.2</version> <!-- 确保使用最新的稳定版本 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-dict</artifactId> <artifactId>common-core</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-datafilter</artifactId> <artifactId>common-redis</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-mobile</artifactId> <artifactId>common-log</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-core</artifactId> <artifactId>common-online</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-log</artifactId> <artifactId>common-report</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
@ -67,10 +98,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-aliyun-oss</artifactId> <artifactId>common-datafilter</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-dbutil</artifactId> <artifactId>common-dbutil</artifactId>
@ -78,66 +108,48 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-swagger</artifactId> <artifactId>common-tenant</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-generator</artifactId> <artifactId>common-dict</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-eas</artifactId> <artifactId>common-mobile</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-online</artifactId> <artifactId>common-flow-online</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>apelet</groupId>
<artifactId>mybatis-plus-generator</artifactId> <artifactId>common-flow</artifactId>
<version>${mybatisplus.version}</version> <version>1.0.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xuxueli</groupId> <groupId>apelet</groupId>
<artifactId>xxl-job-core</artifactId> <artifactId>common-botp</artifactId>
<version>2.3.1</version> <version>1.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>apelet</groupId>
<artifactId>spring-boot-starter-quartz</artifactId> <artifactId>common-orm</artifactId>
<version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>apelet</groupId>
<artifactId>quartz</artifactId> <artifactId>common-ext</artifactId>
<version>2.3.2</version> <!-- 确保使用最新的稳定版本 --> <version>1.0.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

6
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/DeployPluginController.java
Unescape View File

@ -1,12 +1,10 @@
package apelet.tenantadmin.tenant.controller; package apelet.tenantadmin.tenant.controller;
import apelet.common.aliyun.oss.util.AliyunOssUpDownloader;
import apelet.common.core.annotation.MyRequestBody; import apelet.common.core.annotation.MyRequestBody;
import apelet.common.core.constant.ErrorCodeEnum; import apelet.common.core.constant.ErrorCodeEnum;
import apelet.common.core.object.*; import apelet.common.core.object.*;
import apelet.common.core.upload.*; import apelet.common.core.upload.*;
import apelet.common.core.util.MyCommonUtil; import apelet.common.core.util.MyCommonUtil;
import apelet.common.core.util.MyModelUtil;
import apelet.common.core.util.MyPageUtil; import apelet.common.core.util.MyPageUtil;
import apelet.common.core.validator.UpdateGroup; import apelet.common.core.validator.UpdateGroup;
import apelet.common.log.annotation.OperationLog; 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.model.DeployPlugin;
import apelet.tenantadmin.tenant.plugin.PluginService; import apelet.tenantadmin.tenant.plugin.PluginService;
import apelet.tenantadmin.tenant.service.IDeployPluginService; 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.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.page.PageMethod; import com.github.pagehelper.page.PageMethod;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
Unescape View File

@ -60,6 +60,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
@ -69,7 +70,6 @@ import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import apelet.common.eas.util.EasUtil;
/** /**
* 登录接口控制器类。 * 登录接口控制器类。
* *

3
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/service/impl/SysUserServiceImpl.java
Unescape View File

@ -1,6 +1,5 @@
package apelet.tenantadmin.upms.service.impl; 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.dao.BaseDaoMapper;
import apelet.common.core.base.service.BaseService; import apelet.common.core.base.service.BaseService;
import apelet.common.core.constant.GlobalDeletedFlag; 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.base.BizWidgetDatasource;
import apelet.common.ext.constant.BizWidgetDatasourceType; import apelet.common.ext.constant.BizWidgetDatasourceType;
import apelet.common.ext.util.BizWidgetDatasourceExtHelper; import apelet.common.ext.util.BizWidgetDatasourceExtHelper;
import apelet.common.generator.utils.OrmGenDataSourceUtil;
import apelet.common.sequence.wrapper.IdGeneratorWrapper; import apelet.common.sequence.wrapper.IdGeneratorWrapper;
import apelet.tenantadmin.upms.controller.SysUserController;
import apelet.tenantadmin.upms.dao.*; import apelet.tenantadmin.upms.dao.*;
import apelet.tenantadmin.upms.model.*; import apelet.tenantadmin.upms.model.*;
import apelet.tenantadmin.upms.model.constant.SysUserStatus; import apelet.tenantadmin.upms.model.constant.SysUserStatus;

17
common/common-qy/pom.xml
Unescape View File

@ -17,9 +17,22 @@
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.28</version>
</dependency>
<dependency>
<groupId>apelet</groupId>
<artifactId>common-generator</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>apelet</groupId>
<artifactId>common-orm</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies> </dependencies>

10
common/pom.xml
Unescape View File

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>common</artifactId> <artifactId>apelet_saas</artifactId>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
@ -16,32 +16,28 @@
</modules> </modules>
<version>1.0.0</version> <version>1.0.0</version>
<dependencies> <dependencies>
<dependency> <!--<dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-generator</artifactId> <artifactId>common-generator</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<artifactId>common-online</artifactId> <artifactId>common-online</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>common-orm</artifactId> <artifactId>common-orm</artifactId>
<groupId>apelet</groupId> <groupId>apelet</groupId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
-->
</dependencies> </dependencies>
</project> </project>

10
pom.xml
Unescape View File

@ -11,7 +11,7 @@
<properties> <properties>
<spring-cloud.version>2021.0.6</spring-cloud.version> <spring-cloud.version>2021.0.6</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version> <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
<spring-boot.version>2.7.10</spring-boot.version> <spring-boot.version>2.7.10</spring-boot.version>
<spring-boot-admin.version>2.7.10</spring-boot-admin.version> <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -70,15 +70,15 @@
<properties> <properties>
<profile.name>dev</profile.name> <profile.name>dev</profile.name>
<!-- 注册中心地址 --> <!-- 注册中心地址 -->
<discovery.server-addr>localhost:8848</discovery.server-addr> <discovery.server-addr>192.168.100.25:8848</discovery.server-addr>
<!-- 配置中心地址 --> <!-- 配置中心地址 -->
<config.server-addr>localhost:8848</config.server-addr> <config.server-addr>192.168.100.25:8848</config.server-addr>
<!-- 配置中心的分组和名字空间 --> <!-- 配置中心的分组和名字空间 -->
<config.group>DEFAULT_GROUP</config.group> <config.group>DEFAULT_GROUP</config.group>
<!-- 如果是public可以保持为空，否则一定要填写名字空间id，而非名称 --> <!-- 如果是public可以保持为空，否则一定要填写名字空间id，而非名称 -->
<config.namespace></config.namespace> <config.namespace>9f355e7b-925d-471a-89a1-d65a0a812099</config.namespace>
<!-- 仅为日志配置文件中使用的kafka地址 --> <!-- 仅为日志配置文件中使用的kafka地址 -->
<kafka.log-server-addr>localhost:9092</kafka.log-server-addr> <kafka.log-server-addr>192.168.100.25:9092</kafka.log-server-addr>
</properties> </properties>
</profile> </profile>
<!-- 测试环境 --> <!-- 测试环境 -->

Write Preview
Loading…
Cancel
Save