From d3ef935859a7382cf5ac6f563127fc489d75b6d2 Mon Sep 17 00:00:00 2001 From: CoderKK Date: Fri, 1 Aug 2025 16:04:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style(sa-base):=20=E5=88=A0=E9=99=A4=20Secu?= =?UTF-8?q?rityLoginService=20=E7=B1=BB=E4=B8=AD=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=88=86=E5=8F=B7=EF=BC=8C=E4=BF=AE=E6=AD=A3=E9=94=99?= =?UTF-8?q?=E5=88=AB=E5=AD=97=E2=80=9C=E7=99=BB=E9=99=86=E2=80=9D->?= =?UTF-8?q?=E2=80=9C=E7=99=BB=E5=BD=95=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/module/system/login/controller/LoginController.java | 2 +- .../sa/admin/module/system/login/service/LoginService.java | 4 ++-- .../support/securityprotect/service/SecurityLoginService.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java index 28aa85ed..a76dd67d 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java @@ -57,7 +57,7 @@ public class LoginController { return ResponseDTO.ok(loginResult); } - @Operation(summary = "退出登陆 @author 卓大") + @Operation(summary = "退出登录 @author 卓大") @GetMapping("/login/logout") public ResponseDTO logout() { return loginService.logout(SmartRequestUtil.getRequestUser()); diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index c5fa8c7d..b4329ff0 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -129,7 +129,7 @@ public class LoginService implements StpInterface { } /** - * 员工登陆 + * 员工登录 * * @return 返回用户登录信息 */ @@ -270,7 +270,7 @@ public class LoginService implements StpInterface { /** - * 根据登陆token 获取员请求工信息 + * 根据登录token 获取员请求工信息 */ public RequestEmployee getLoginEmployee(String loginId, HttpServletRequest request) { if (loginId == null) { diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java index c51eb0ce..cedb2759 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java @@ -171,5 +171,4 @@ public class SecurityLoginService { return ResponseDTO.ok(); } -} -; \ No newline at end of file +} \ No newline at end of file From 73cd7f196c2c4870507bafbc689fbc6e49b84cde Mon Sep 17 00:00:00 2001 From: CoderKK Date: Fri, 1 Aug 2025 17:38:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(sa-base):=20=E5=B0=86=20Java?= =?UTF-8?q?=E5=8E=9F=E7=94=9F=E7=9A=84=20UUID=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=9B=B4=E5=A5=BD=20Hutool=20=E5=BA=93=E7=9A=84=20IdUtil.fastS?= =?UTF-8?q?impleUUID()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa/base/module/support/captcha/CaptchaService.java | 5 ++--- .../service/CodeGeneratorTemplateService.java | 8 ++++++-- .../support/file/service/FileStorageCloudServiceImpl.java | 4 ++-- .../support/file/service/FileStorageLocalServiceImpl.java | 4 ++-- .../lab1024/sa/base/module/support/mail/MailService.java | 5 ++--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java index 2058b344..715f92c8 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java @@ -3,10 +3,10 @@ package net.lab1024.sa.base.module.support.captcha; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.LineCaptcha; import cn.hutool.core.img.ImgUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.base.common.constant.StringConst; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.SystemEnvironment; import net.lab1024.sa.base.constant.RedisKeyConst; @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import java.awt.*; import java.util.Objects; -import java.util.UUID; /** * 图形验证码 服务 @@ -70,7 +69,7 @@ public class CaptchaService { * 图片 base64格式 */ // uuid 唯一标识 - String uuid = UUID.randomUUID().toString().replace("-", StringConst.EMPTY); + String uuid = IdUtil.fastSimpleUUID(); CaptchaVO captchaVO = new CaptchaVO(); captchaVO.setCaptchaUuid(uuid); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java index d7675eee..18beb1b1 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ZipUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -34,7 +35,10 @@ import java.io.File; import java.io.OutputStream; import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -82,7 +86,7 @@ public class CodeGeneratorTemplateService { } public void zipGeneratedFiles(OutputStream outputStream, String tableName, CodeGeneratorConfigEntity codeGeneratorConfigEntity) { - String uuid = UUID.randomUUID().toString(); + String uuid = IdUtil.fastSimpleUUID(); File dir = new File(uuid); // 1、生产文件 diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java index 311f3d71..9fa16f1f 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java @@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.file.service; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.IdUtil; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; @@ -36,7 +37,6 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.UUID; /** * 云计算 实现 @@ -86,7 +86,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService { } String fileType = FilenameUtils.getExtension(originalFileName); - String uuid = UUID.randomUUID().toString().replaceAll("-", ""); + String uuid = IdUtil.fastSimpleUUID(); String time = LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_FORMATTER); String fileKey = path + uuid + "_" + time+ "." + fileType; diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java index b65244e5..383cc121 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java @@ -3,6 +3,7 @@ package net.lab1024.sa.base.module.support.file.service; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.net.NetUtil; +import cn.hutool.core.util.IdUtil; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.base.common.code.SystemErrorCode; @@ -23,7 +24,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.time.LocalDateTime; -import java.util.UUID; /** * 本地存储 实现 @@ -85,7 +85,7 @@ public class FileStorageLocalServiceImpl implements IFileStorageService { //原文件名 String originalFileName = multipartFile.getOriginalFilename(); //新文件名 - String uuid = UUID.randomUUID().toString().replaceAll("-", ""); + String uuid = IdUtil.fastSimpleUUID(); String time = LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_FORMATTER); String newFileName = uuid + "_" + time; String fileType = FilenameUtils.getExtension(originalFileName); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java index 18fac72a..777f89a8 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java @@ -1,7 +1,7 @@ package net.lab1024.sa.base.module.support.mail; -import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.IdUtil; import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; @@ -19,7 +19,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringSubstitutor; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; @@ -163,7 +162,7 @@ public class MailService { private String freemarkerResolverContent(String htmlTemplate, Map templateParamsMap) { Configuration configuration = new Configuration(Configuration.VERSION_2_3_23); StringTemplateLoader stringLoader = new StringTemplateLoader(); - String templateName = UUID.fastUUID().toString(true); + String templateName = IdUtil.fastSimpleUUID(); stringLoader.putTemplate(templateName, htmlTemplate); configuration.setTemplateLoader(stringLoader); try {