diff --git a/pom.xml b/pom.xml index 324809e..e3df1ad 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,13 @@ 1.5.2 + + + org.springdoc + springdoc-openapi-ui + 1.8.0 + + org.projectlombok @@ -81,11 +88,7 @@ compile - - io.swagger.core.v3 - swagger-annotations - 2.2.20 - + org.apache.commons commons-lang3 @@ -106,12 +109,6 @@ - - com.sun.mail - javax.mail - 1.6.2 - - org.springframework.boot spring-boot-starter-mail diff --git a/src/main/java/com/example/carbon/common/config/OpenAPIConfig.java b/src/main/java/com/example/carbon/common/config/OpenAPIConfig.java new file mode 100644 index 0000000..1cd1466 --- /dev/null +++ b/src/main/java/com/example/carbon/common/config/OpenAPIConfig.java @@ -0,0 +1,33 @@ +package com.example.carbon.common.config; + +import com.example.carbon.common.base.constant.SysConstant; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Arrays; + +@Configuration +public class OpenAPIConfig { + @Bean + public OpenAPI customOpenAPI() { + return new OpenAPI() + .info(new Info() + .title("中联创信-公司首页") + .version("V1.0") + .description("【公司首页-API文档】")) + .components(new Components() + .addSecuritySchemes(SysConstant.REQUEST_TOKEN_PARAM, new SecurityScheme() + .name(SysConstant.REQUEST_TOKEN_PARAM) + .type(SecurityScheme.Type.APIKEY) + .in(SecurityScheme.In.HEADER) + .description("token"))) + .security(Arrays.asList( + new SecurityRequirement().addList(SysConstant.REQUEST_TOKEN_PARAM) + )); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/carbon/common/config/RequestConfig.java b/src/main/java/com/example/carbon/common/config/RequestConfig.java index 9faea73..f9221ec 100644 --- a/src/main/java/com/example/carbon/common/config/RequestConfig.java +++ b/src/main/java/com/example/carbon/common/config/RequestConfig.java @@ -6,8 +6,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import java.util.Arrays; - @Configuration public class RequestConfig implements WebMvcConfigurer { diff --git a/src/main/java/com/example/carbon/common/service/EmailService.java b/src/main/java/com/example/carbon/common/service/EmailService.java index 713d629..61a8fbb 100644 --- a/src/main/java/com/example/carbon/common/service/EmailService.java +++ b/src/main/java/com/example/carbon/common/service/EmailService.java @@ -1,17 +1,13 @@ package com.example.carbon.common.service; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.FileSystemResource; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import javax.annotation.PostConstruct; -import javax.mail.Message; import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import java.io.File; import java.util.List; diff --git a/src/main/java/com/example/carbon/common/utils/FileUtil.java b/src/main/java/com/example/carbon/common/utils/FileUtil.java index 88b45ba..ac70b84 100644 --- a/src/main/java/com/example/carbon/common/utils/FileUtil.java +++ b/src/main/java/com/example/carbon/common/utils/FileUtil.java @@ -5,8 +5,6 @@ import com.example.carbon.common.base.func.ThrowableConsumer; import com.example.carbon.common.model.info.FileInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.util.StringUtils; -import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; @@ -15,10 +13,10 @@ import java.io.OutputStream; import java.math.BigDecimal; import java.math.RoundingMode; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/src/main/java/com/example/carbon/controller/sys/HxSysMinioController.java b/src/main/java/com/example/carbon/controller/sys/HxSysMinioController.java index b151d79..ae013c2 100644 --- a/src/main/java/com/example/carbon/controller/sys/HxSysMinioController.java +++ b/src/main/java/com/example/carbon/controller/sys/HxSysMinioController.java @@ -4,8 +4,8 @@ import com.example.carbon.common.base.exception.BizException; import com.example.carbon.common.model.entity.sys.HxSysAttach; import com.example.carbon.common.model.vo.ResultVo; import com.example.carbon.common.utils.FileUtil; -import com.example.carbon.service.sys.HxSysAttachService; import com.example.carbon.service.impl.sys.HxSysMinioServiceImpl; +import com.example.carbon.service.sys.HxSysAttachService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/example/carbon/service/impl/booking/HxBookingExperienceServiceImpl.java b/src/main/java/com/example/carbon/service/impl/booking/HxBookingExperienceServiceImpl.java index fb2d456..a7eb8ff 100644 --- a/src/main/java/com/example/carbon/service/impl/booking/HxBookingExperienceServiceImpl.java +++ b/src/main/java/com/example/carbon/service/impl/booking/HxBookingExperienceServiceImpl.java @@ -22,7 +22,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.mail.MessagingException; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.*; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; /** @@ -72,7 +73,7 @@ public class HxBookingExperienceServiceImpl extends CommonServiceImpl