diff --git a/zdxt-common/zdxt-common-doc/pom.xml b/zdxt-common/zdxt-common-doc/pom.xml index 0d1a9b6f..65903664 100644 --- a/zdxt-common/zdxt-common-doc/pom.xml +++ b/zdxt-common/zdxt-common-doc/pom.xml @@ -32,7 +32,7 @@ com.github.xiaoymin - knife4j-openapi3-spring-boot-starter + knife4j-openapi3-jakarta-spring-boot-starter diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java index fd6a891e..f799b7f9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java @@ -3,7 +3,6 @@ package com.zdxt.enforcementcode.service.enterprise.impl; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; @@ -11,7 +10,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zdxt.enforcementcode.common.util.*; -import com.zdxt.enforcementcode.domain.*; +import com.zdxt.enforcementcode.domain.EnterpriseInformation; +import com.zdxt.enforcementcode.domain.EnterpriseUser; +import com.zdxt.enforcementcode.domain.EnterpriseUserRef; import com.zdxt.enforcementcode.domain.bo.QrCodeGenerateHistoryBo; import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo; import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper; @@ -27,14 +28,8 @@ import org.dromara.common.core.exception.base.BaseException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.mapper.SysUserPostMapper; import org.dromara.system.mapper.SysUserRoleMapper; -import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -43,8 +38,10 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.TimeUnit; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; /**