diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index befc6f46..2494d00b 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -17,24 +17,12 @@ org.dromara.sms4j sms4j-spring-boot-starter - - - cn.hutool - hutool-core - - org.dromara.x-file-storage x-file-storage-spring - - - cn.hutool - hutool-core - - diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java index 57755006..eb486f80 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java @@ -16,26 +16,23 @@ package top.charles7c.continew.admin.common.util.helper; -import java.time.LocalDateTime; - -import jakarta.servlet.http.HttpServletRequest; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; - +import jakarta.servlet.http.HttpServletRequest; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.common.model.dto.LoginUser; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.IpUtils; -import top.charles7c.continew.starter.core.util.ServletUtils; import top.charles7c.continew.starter.extension.crud.base.CommonUserService; +import top.charles7c.continew.starter.web.util.ServletUtils; + +import java.time.LocalDateTime; /** * 登录助手 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java index 39f0bd8f..a5fcc61e 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java @@ -33,7 +33,7 @@ import top.charles7c.continew.admin.monitor.mapper.LogMapper; import top.charles7c.continew.admin.monitor.model.entity.LogDO; import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.model.R; +import top.charles7c.continew.starter.web.model.R; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.log.common.dao.LogDao; import top.charles7c.continew.starter.log.common.model.LogRecord; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java index 94cadbdf..6ab669b4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java @@ -38,11 +38,11 @@ import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.admin.system.service.FileService; import top.charles7c.continew.admin.system.service.StorageService; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.SpringUtils; import top.charles7c.continew.starter.core.util.URLUtils; import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl; +import top.charles7c.continew.starter.web.util.SpringWebUtils; import java.util.Collections; import java.util.List; @@ -130,7 +130,7 @@ public class StorageServiceImpl extends BaseServiceImpl { String accessKey = req.getAccessKey(); @@ -159,7 +159,7 @@ public class StorageServiceImpl extends BaseServiceImpl - + 2.3.0-SNAPSHOT @@ -76,6 +76,12 @@ + + + cn.hutool + hutool-all + + org.projectlombok