新增:swagger图形界面
修改:邮件发送产品格式 删除:没有用到import导入类
This commit is contained in:
19
pom.xml
19
pom.xml
@@ -74,6 +74,13 @@
|
||||
<version>1.5.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- openapi -->
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-ui</artifactId>
|
||||
<version>1.8.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- lombok -->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
@@ -81,11 +88,7 @@
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
<version>2.2.20</version>
|
||||
</dependency>
|
||||
<!-- commons -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
@@ -106,12 +109,6 @@
|
||||
</dependency>
|
||||
|
||||
<!-- javaMail -->
|
||||
<dependency>
|
||||
<groupId>com.sun.mail</groupId>
|
||||
<artifactId>javax.mail</artifactId>
|
||||
<version>1.6.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-mail</artifactId>
|
||||
|
@@ -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)
|
||||
));
|
||||
}
|
||||
}
|
@@ -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 {
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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<HxBookingE
|
||||
// 获取预约项目名称
|
||||
String bookingItemNames = entity.getBookingItemList().stream()
|
||||
.map(BookingItem::getName)
|
||||
.collect(Collectors.joining(", "));
|
||||
.collect(Collectors.joining(","));
|
||||
|
||||
// 构建邮件内容
|
||||
String emailContent = buildEmailContent(entity, bookingItemNames);
|
||||
|
@@ -80,3 +80,21 @@ mail:
|
||||
# 是否启用调试模式(开发环境可开启,生产环境应关闭)
|
||||
debug: false
|
||||
|
||||
# open-api
|
||||
#springdoc:
|
||||
# api-docs:
|
||||
# path: /v3/api-docs
|
||||
# group-configs:
|
||||
# - group: carbon-booking
|
||||
# display-name: 预约模块
|
||||
# packages-to-scan: com.example.carbon.controller.booking
|
||||
# - group: carbon-jurnalism
|
||||
# display-name: 新闻管理模块
|
||||
# packages-to-scan: com.example.carbon.controller.jrn
|
||||
# - group: carbon-permission
|
||||
# display-name: 权限管理模块
|
||||
# packages-to-scan: com.example.carbon.controller.perm
|
||||
# - group: carbon-system
|
||||
# display-name: 系统基础模块
|
||||
# packages-to-scan: com.example.carbon.controller.sys
|
||||
|
||||
|
Reference in New Issue
Block a user