From 517f628838fa99877c403c0734da9525616f3a04 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 5 Feb 2025 18:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=91=A8=E8=8F=9C=E8=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/oss/OssProperties.java | 22 ++ .../main/java/com/bonus/oss/OssTemplate.java | 42 ++++ .../java/com/bonus/service/EmailService.java | 54 ----- .../java/com/bonus/service/SmsService.java | 52 ----- .../java/com/bonus/service/TokenService.java | 217 ------------------ .../com/bonus/utils/SpringContextHolder.java | 51 ++++ .../bonus/core/common/enums/DelFlagEnum.java | 23 -- .../com/bonus/core/common/utils/SysUtil.java | 7 +- .../bonus/core/common/utils/SysUtilProxy.java | 1 - .../core/marketing/vo/MktEffectiveUserVO.java | 2 - .../core/menu/vo/AppletWeekCanteenVO.java | 2 - 11 files changed, 120 insertions(+), 353 deletions(-) create mode 100644 bonus-common-biz/src/main/java/com/bonus/oss/OssProperties.java create mode 100644 bonus-common-biz/src/main/java/com/bonus/oss/OssTemplate.java delete mode 100644 bonus-common-biz/src/main/java/com/bonus/service/EmailService.java delete mode 100644 bonus-common-biz/src/main/java/com/bonus/service/SmsService.java delete mode 100644 bonus-common-biz/src/main/java/com/bonus/service/TokenService.java create mode 100644 bonus-common-biz/src/main/java/com/bonus/utils/SpringContextHolder.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/enums/DelFlagEnum.java diff --git a/bonus-common-biz/src/main/java/com/bonus/oss/OssProperties.java b/bonus-common-biz/src/main/java/com/bonus/oss/OssProperties.java new file mode 100644 index 00000000..a930b891 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/oss/OssProperties.java @@ -0,0 +1,22 @@ +//package com.bonus.oss; +// +//import lombok.Data; +//import org.springframework.boot.context.properties.ConfigurationProperties; +// +//@ConfigurationProperties( +// prefix = "oss" +//) +//@Data +//public class OssProperties { +// private String endpoint; +// private String customDomain; +// private Boolean pathStyleAccess = true; +// private String appId; +// private String region; +// private String accessKey; +// private String secretKey; +// private String bucketName = "lnyst"; +// private Boolean useHttp = false; +// private Integer expiresTime = 604800; +// private Boolean useToken = false; +//} diff --git a/bonus-common-biz/src/main/java/com/bonus/oss/OssTemplate.java b/bonus-common-biz/src/main/java/com/bonus/oss/OssTemplate.java new file mode 100644 index 00000000..e6afb9b7 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/oss/OssTemplate.java @@ -0,0 +1,42 @@ +//package com.bonus.oss; +// +//import org.springframework.beans.factory.InitializingBean; +//import org.springframework.data.redis.core.convert.Bucket; +//import java.io.ByteArrayInputStream; +//import java.io.InputStream; +//import java.net.URL; +//import java.util.*; +// +//public class OssTemplate implements InitializingBean { +// private final OssProperties ossProperties; +// private AmazonS3 amazonS3; +// +// public InputStream getObject(String bucketName, String objectName) { +// try { +// return this.amazonS3.getObject(bucketName, objectName).getObjectContent(); +// } catch (Throwable var4) { +// throw var4; +// } +// } +// +// public void removeObject(String bucketName, String objectName) throws Exception { +// this.amazonS3.deleteObject(bucketName, objectName); +// } +// +// public void afterPropertiesSet() throws Exception { +// ClientConfiguration clientConfiguration = new ClientConfiguration(); +// AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(this.ossProperties.getEndpoint(), this.ossProperties.getRegion()); +// AWSCredentials awsCredentials = new BasicAWSCredentials(this.ossProperties.getAccessKey(), this.ossProperties.getSecretKey()); +// AWSCredentialsProvider awsCredentialsProvider = new AWSStaticCredentialsProvider(awsCredentials); +// if (this.ossProperties.getUseHttp()) { +// System.setProperty("com.amazonaws.sdk.disableCertChecking", "true"); +// } +// +// this.amazonS3 = (AmazonS3)((AmazonS3ClientBuilder)((AmazonS3ClientBuilder)((AmazonS3ClientBuilder)((AmazonS3ClientBuilder)((AmazonS3ClientBuilder)AmazonS3Client.builder().withEndpointConfiguration(endpointConfiguration)).withClientConfiguration(clientConfiguration)).withCredentials(awsCredentialsProvider)).disableChunkedEncoding()).withPathStyleAccessEnabled(this.ossProperties.getPathStyleAccess())).build(); +// } +// +// public OssTemplate(final OssProperties ossProperties) { +// this.ossProperties = ossProperties; +// } +// +//} diff --git a/bonus-common-biz/src/main/java/com/bonus/service/EmailService.java b/bonus-common-biz/src/main/java/com/bonus/service/EmailService.java deleted file mode 100644 index 3b08264f..00000000 --- a/bonus-common-biz/src/main/java/com/bonus/service/EmailService.java +++ /dev/null @@ -1,54 +0,0 @@ -//package com.bonus.service; -// -//import com.bonus.common.core.constant.CacheConstants; -//import com.bonus.common.core.utils.StringUtils; -//import com.bonus.common.core.utils.VerificationCodeUtils; -//import com.bonus.common.redis.service.RedisService; -//import com.bonus.common.security.config.VerificationCodeConfig; -//import org.springframework.mail.SimpleMailMessage; -//import org.springframework.mail.javamail.JavaMailSender; -//import org.springframework.stereotype.Service; -// -//import javax.annotation.Resource; -//import java.util.concurrent.TimeUnit; -// -//import static com.bonus.common.core.utils.VerificationCodeUtils.CodeType.NUMERIC; -// -///** -// * @author bonus -// */ -//@Service -//public class EmailService { -// @Resource -// private VerificationCodeConfig verificationCodeConfig; -// @Resource -// private RedisService redisService; -// @Resource -// private JavaMailSender mailSender; -// -// /** -// * 发送简单邮件 -// * -// * @param to 接收者邮箱地址 -// */ -// public String sendSimpleEmail(String to) { -// String code = VerificationCodeUtils.generateVerificationCode(NUMERIC); -// String str = verificationCodeConfig.getContent().replace("", code); -// str = str.replace("