From 6a588fb6d07ae95ea8d85e28245f7254e9a40fd2 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期日, 08 十二月 2024 19:40:56 +0800 Subject: [PATCH] 1 --- /dev/null | 185 ------------------------------------- se-modules/se-docker/pom.xml | 23 ---- se-modules/se-docker/src/main/java/com/se/docker/SysDockerApplication.java | 14 +- se-modules/se-docker/src/main/java/com/se/docker/controller/SysDockerController.java | 33 ++++++ se-modules/se-docker/src/main/resources/banner.txt | 2 se-modules/se-docker/src/main/resources/bootstrap.yml | 4 se-modules/se-docker/src/main/resources/logback.xml | 2 se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java | 15 +++ 8 files changed, 60 insertions(+), 218 deletions(-) diff --git a/se-modules/se-docker/pom.xml b/se-modules/se-docker/pom.xml index 9e3c363..2f110d4 100644 --- a/se-modules/se-docker/pom.xml +++ b/se-modules/se-docker/pom.xml @@ -9,14 +9,13 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>se-modules-file</artifactId> + <artifactId>se-modules-docker</artifactId> <description> - se-modules-file鏂囦欢鏈嶅姟 + se-modules-docker鏈嶅姟 </description> <dependencies> - <!-- SpringCloud Alibaba Nacos --> <dependency> <groupId>com.alibaba.cloud</groupId> @@ -40,21 +39,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> - - <!-- FastDFS --> - <dependency> - <groupId>com.github.tobato</groupId> - <artifactId>fastdfs-client</artifactId> - </dependency> - - <!-- Minio --> - <dependency> - <groupId>io.minio</groupId> - <artifactId>minio</artifactId> - <version>8.2.2</version> -<!-- <version>${minio.version}</version>--> - </dependency> - + <!-- SE Api System --> <dependency> <groupId>com.se</groupId> @@ -66,7 +51,6 @@ <groupId>com.se</groupId> <artifactId>se-common-swagger</artifactId> </dependency> - </dependencies> <build> @@ -85,5 +69,4 @@ </plugin> </plugins> </build> - </project> \ No newline at end of file diff --git a/se-modules/se-docker/src/main/java/com/se/file/SeFileApplication.java b/se-modules/se-docker/src/main/java/com/se/docker/SysDockerApplication.java similarity index 64% rename from se-modules/se-docker/src/main/java/com/se/file/SeFileApplication.java rename to se-modules/se-docker/src/main/java/com/se/docker/SysDockerApplication.java index d853e56..4dc0fab 100644 --- a/se-modules/se-docker/src/main/java/com/se/file/SeFileApplication.java +++ b/se-modules/se-docker/src/main/java/com/se/docker/SysDockerApplication.java @@ -1,22 +1,18 @@ -package com.se.file; +package com.se.docker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import com.se.common.swagger.annotation.EnableCustomSwagger2; -/** - * 鏂囦欢鏈嶅姟 - * - * @author admin - */ @EnableCustomSwagger2 +@SuppressWarnings("ALL") @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class SeFileApplication +public class SysDockerApplication { public static void main(String[] args) { - SpringApplication.run(SeFileApplication.class, args); - System.out.println(" 鏂囦欢妯″潡鍚姩鎴愬姛 "); + SpringApplication.run(SysDockerApplication.class, args); + System.out.println(" Docker妯″潡鍚姩鎴愬姛 "); } } diff --git a/se-modules/se-docker/src/main/java/com/se/docker/controller/SysDockerController.java b/se-modules/se-docker/src/main/java/com/se/docker/controller/SysDockerController.java new file mode 100644 index 0000000..89b74c3 --- /dev/null +++ b/se-modules/se-docker/src/main/java/com/se/docker/controller/SysDockerController.java @@ -0,0 +1,33 @@ +package com.se.docker.controller; + +import com.se.docker.service.SysDockerService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import com.se.common.core.domain.R; + +import javax.annotation.Resource; + +@RestController +@SuppressWarnings("ALL") +public class SysDockerController { + @Resource + SysDockerService sysDockerService; + + private static final Logger log = LoggerFactory.getLogger(SysDockerController.class); + + @GetMapping("test") + public R<Object> upload(MultipartFile file) { + try { + String str = sysDockerService.test(); + + return R.ok(str); + } catch (Exception e) { + log.error(e.getMessage(), e); + return R.fail(); + } + } +} diff --git a/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java b/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java new file mode 100644 index 0000000..4de57df --- /dev/null +++ b/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java @@ -0,0 +1,15 @@ +package com.se.docker.service; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +@SuppressWarnings("ALL") +public class SysDockerService { + //@Value("${docker.prefix}") + public String localFilePrefix; + + public String test() throws Exception { + return "docker: " + System.currentTimeMillis(); + } +} diff --git a/se-modules/se-docker/src/main/java/com/se/file/config/MinioConfig.java b/se-modules/se-docker/src/main/java/com/se/file/config/MinioConfig.java deleted file mode 100644 index bb02876..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/config/MinioConfig.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.se.file.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import io.minio.MinioClient; - -/** - * Minio 閰嶇疆淇℃伅 - * - * @author admin - */ -@Configuration -@ConfigurationProperties(prefix = "minio") -public class MinioConfig -{ - /** - * 鏈嶅姟鍦板潃 - */ - private String url; - - /** - * 鐢ㄦ埛鍚� - */ - private String accessKey; - - /** - * 瀵嗙爜 - */ - private String secretKey; - - /** - * 瀛樺偍妗跺悕绉� - */ - private String bucketName; - - public String getUrl() - { - return url; - } - - public void setUrl(String url) - { - this.url = url; - } - - public String getAccessKey() - { - return accessKey; - } - - public void setAccessKey(String accessKey) - { - this.accessKey = accessKey; - } - - public String getSecretKey() - { - return secretKey; - } - - public void setSecretKey(String secretKey) - { - this.secretKey = secretKey; - } - - public String getBucketName() - { - return bucketName; - } - - public void setBucketName(String bucketName) - { - this.bucketName = bucketName; - } - - @Bean - public MinioClient getMinioClient() - { - return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); - } -} diff --git a/se-modules/se-docker/src/main/java/com/se/file/config/ResourcesConfig.java b/se-modules/se-docker/src/main/java/com/se/file/config/ResourcesConfig.java deleted file mode 100644 index bb0eebe..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/config/ResourcesConfig.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.se.file.config; - -import java.io.File; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * 閫氱敤鏄犲皠閰嶇疆 - * - * @author admin - */ -@Configuration -public class ResourcesConfig implements WebMvcConfigurer -{ - /** - * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰� - */ - @Value("${file.path}") - private String localFilePath; - - /** - * 璧勬簮鏄犲皠璺緞 鍓嶇紑 - */ - @Value("${file.prefix}") - public String localFilePrefix; - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { - /** 鏈湴鏂囦欢涓婁紶璺緞 */ - registry.addResourceHandler(localFilePrefix + "/**") - .addResourceLocations("file:" + localFilePath + File.separator); - } - - /** - * 寮�鍚法鍩� - */ - @Override - public void addCorsMappings(CorsRegistry registry) { - // 璁剧疆鍏佽璺ㄥ煙鐨勮矾鐢� - registry.addMapping(localFilePrefix + "/**") - // 璁剧疆鍏佽璺ㄥ煙璇锋眰鐨勫煙鍚� - .allowedOrigins("*") - // 璁剧疆鍏佽鐨勬柟娉� - .allowedMethods("GET"); - } -} \ No newline at end of file diff --git a/se-modules/se-docker/src/main/java/com/se/file/controller/SysFileController.java b/se-modules/se-docker/src/main/java/com/se/file/controller/SysFileController.java deleted file mode 100644 index e87c238..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/controller/SysFileController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.se.file.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; -import com.se.common.core.domain.R; -import com.se.common.core.utils.file.FileUtils; -import com.se.file.service.ISysFileService; -import com.se.system.api.domain.SysFile; - -/** - * 鏂囦欢璇锋眰澶勭悊 - * - * @author admin - */ -@RestController -public class SysFileController -{ - private static final Logger log = LoggerFactory.getLogger(SysFileController.class); - - @Autowired - private ISysFileService sysFileService; - - /** - * 鏂囦欢涓婁紶璇锋眰 - */ - @PostMapping("upload") - public R<SysFile> upload(MultipartFile file) - { - try - { - // 涓婁紶骞惰繑鍥炶闂湴鍧� - String url = sysFileService.uploadFile(file); - SysFile sysFile = new SysFile(); - sysFile.setName(FileUtils.getName(url)); - sysFile.setUrl(url); - return R.ok(sysFile); - } - catch (Exception e) - { - log.error("涓婁紶鏂囦欢澶辫触", e); - return R.fail(e.getMessage()); - } - } -} \ No newline at end of file diff --git a/se-modules/se-docker/src/main/java/com/se/file/service/FastDfsSysFileServiceImpl.java b/se-modules/se-docker/src/main/java/com/se/file/service/FastDfsSysFileServiceImpl.java deleted file mode 100644 index fa25b7b..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/service/FastDfsSysFileServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.se.file.service; - -import java.io.InputStream; -import com.alibaba.nacos.common.utils.IoUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.github.tobato.fastdfs.domain.fdfs.StorePath; -import com.github.tobato.fastdfs.service.FastFileStorageClient; -import com.se.common.core.utils.file.FileTypeUtils; - -/** - * FastDFS 鏂囦欢瀛樺偍 - * - * @author admin - */ -@Service -public class FastDfsSysFileServiceImpl implements ISysFileService -{ - /** - * 鍩熷悕鎴栨湰鏈鸿闂湴鍧� - */ - @Value("${fdfs.domain}") - public String domain; - - @Autowired - private FastFileStorageClient storageClient; - - /** - * FastDfs鏂囦欢涓婁紶鎺ュ彛 - * - * @param file 涓婁紶鐨勬枃浠� - * @return 璁块棶鍦板潃 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - InputStream inputStream = file.getInputStream(); - StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), - FileTypeUtils.getExtension(file), null); - IoUtils.closeQuietly(inputStream); - return domain + "/" + storePath.getFullPath(); - } -} diff --git a/se-modules/se-docker/src/main/java/com/se/file/service/ISysFileService.java b/se-modules/se-docker/src/main/java/com/se/file/service/ISysFileService.java deleted file mode 100644 index 9d4215e..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/service/ISysFileService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.se.file.service; - -import org.springframework.web.multipart.MultipartFile; - -/** - * 鏂囦欢涓婁紶鎺ュ彛 - * - * @author admin - */ -public interface ISysFileService -{ - /** - * 鏂囦欢涓婁紶鎺ュ彛 - * - * @param file 涓婁紶鐨勬枃浠� - * @return 璁块棶鍦板潃 - * @throws Exception - */ - public String uploadFile(MultipartFile file) throws Exception; -} diff --git a/se-modules/se-docker/src/main/java/com/se/file/service/LocalSysFileServiceImpl.java b/se-modules/se-docker/src/main/java/com/se/file/service/LocalSysFileServiceImpl.java deleted file mode 100644 index 0ffaf52..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/service/LocalSysFileServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.se.file.service; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.se.file.utils.FileUploadUtils; - -/** - * 鏈湴鏂囦欢瀛樺偍 - * - * @author admin - */ -@Primary -@Service -public class LocalSysFileServiceImpl implements ISysFileService -{ - /** - * 璧勬簮鏄犲皠璺緞 鍓嶇紑 - */ - @Value("${file.prefix}") - public String localFilePrefix; - - /** - * 鍩熷悕鎴栨湰鏈鸿闂湴鍧� - */ - @Value("${file.domain}") - public String domain; - - /** - * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰� - */ - @Value("${file.path}") - private String localFilePath; - - /** - * 鏈湴鏂囦欢涓婁紶鎺ュ彛 - * - * @param file 涓婁紶鐨勬枃浠� - * @return 璁块棶鍦板潃 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - String name = FileUploadUtils.upload(localFilePath, file); - String url = domain + localFilePrefix + name; - return url; - } -} diff --git a/se-modules/se-docker/src/main/java/com/se/file/service/MinioSysFileServiceImpl.java b/se-modules/se-docker/src/main/java/com/se/file/service/MinioSysFileServiceImpl.java deleted file mode 100644 index cf7c1a1..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/service/MinioSysFileServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.se.file.service; - -import java.io.InputStream; - -import com.se.file.config.MinioConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.alibaba.nacos.common.utils.IoUtils; -import com.se.file.utils.FileUploadUtils; -import io.minio.MinioClient; -import io.minio.PutObjectArgs; - -/** - * Minio 鏂囦欢瀛樺偍 - * - * @author admin - */ -@Service -public class MinioSysFileServiceImpl implements ISysFileService -{ - @Autowired - private MinioConfig minioConfig; - - @Autowired - private MinioClient client; - - /** - * Minio鏂囦欢涓婁紶鎺ュ彛 - * - * @param file 涓婁紶鐨勬枃浠� - * @return 璁块棶鍦板潃 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - String fileName = FileUploadUtils.extractFilename(file); - InputStream inputStream = file.getInputStream(); - PutObjectArgs args = PutObjectArgs.builder() - .bucket(minioConfig.getBucketName()) - .object(fileName) - .stream(inputStream, file.getSize(), -1) - .contentType(file.getContentType()) - .build(); - client.putObject(args); - IoUtils.closeQuietly(inputStream); - return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; - } -} diff --git a/se-modules/se-docker/src/main/java/com/se/file/utils/FileUploadUtils.java b/se-modules/se-docker/src/main/java/com/se/file/utils/FileUploadUtils.java deleted file mode 100644 index c51548d..0000000 --- a/se-modules/se-docker/src/main/java/com/se/file/utils/FileUploadUtils.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.se.file.utils; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.Objects; -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; -import com.se.common.core.exception.file.FileException; -import com.se.common.core.exception.file.FileNameLengthLimitExceededException; -import com.se.common.core.exception.file.FileSizeLimitExceededException; -import com.se.common.core.exception.file.InvalidExtensionException; -import com.se.common.core.utils.DateUtils; -import com.se.common.core.utils.StringUtils; -import com.se.common.core.utils.file.FileTypeUtils; -import com.se.common.core.utils.file.MimeTypeUtils; -import com.se.common.core.utils.uuid.Seq; - -/** - * 鏂囦欢涓婁紶宸ュ叿绫� - * - * @author admin - */ -public class FileUploadUtils -{ - /** - * 榛樿澶у皬 50M - */ - public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L; - - /** - * 榛樿鐨勬枃浠跺悕鏈�澶ч暱搴� 100 - */ - public static final int DEFAULT_FILE_NAME_LENGTH = 100; - - /** - * 鏍规嵁鏂囦欢璺緞涓婁紶 - * - * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 - * @param file 涓婁紶鐨勬枃浠� - * @return 鏂囦欢鍚嶇О - * @throws IOException - */ - public static final String upload(String baseDir, MultipartFile file) throws IOException - { - try - { - return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (FileException fe) - { - throw new IOException(fe.getDefaultMessage(), fe); - } - catch (Exception e) - { - throw new IOException(e.getMessage(), e); - } - } - - /** - * 鏂囦欢涓婁紶 - * - * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 - * @param file 涓婁紶鐨勬枃浠� - * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷 - * @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕 - * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏� - * @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀� - * @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃� - * @throws InvalidExtensionException 鏂囦欢鏍¢獙寮傚父 - */ - public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, - InvalidExtensionException - { - int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); - if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) - { - throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); - } - - assertAllowed(file, allowedExtension); - - String fileName = extractFilename(file); - - String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); - file.transferTo(Paths.get(absPath)); - return getPathFileName(fileName); - } - - /** - * 缂栫爜鏂囦欢鍚� - */ - public static final String extractFilename(MultipartFile file) - { - return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), - FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); - } - - private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException - { - File desc = new File(uploadDir + File.separator + fileName); - - if (!desc.exists()) - { - if (!desc.getParentFile().exists()) - { - desc.getParentFile().mkdirs(); - } - } - return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); - } - - private static final String getPathFileName(String fileName) throws IOException - { - String pathFileName = "/" + fileName; - return pathFileName; - } - - /** - * 鏂囦欢澶у皬鏍¢獙 - * - * @param file 涓婁紶鐨勬枃浠� - * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏� - * @throws InvalidExtensionException 鏂囦欢鏍¢獙寮傚父 - */ - public static final void assertAllowed(MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, InvalidExtensionException - { - long size = file.getSize(); - if (size > DEFAULT_MAX_SIZE) - { - throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); - } - - String fileName = file.getOriginalFilename(); - String extension = FileTypeUtils.getExtension(file); - if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) - { - if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) - { - throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) - { - throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) - { - throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) - { - throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, - fileName); - } - else - { - throw new InvalidExtensionException(allowedExtension, extension, fileName); - } - } - } - - /** - * 鍒ゆ柇MIME绫诲瀷鏄惁鏄厑璁哥殑MIME绫诲瀷 - * - * @param extension 涓婁紶鏂囦欢绫诲瀷 - * @param allowedExtension 鍏佽涓婁紶鏂囦欢绫诲瀷 - * @return true/false - */ - public static final boolean isAllowedExtension(String extension, String[] allowedExtension) - { - for (String str : allowedExtension) - { - if (str.equalsIgnoreCase(extension)) - { - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/se-modules/se-docker/src/main/resources/banner.txt b/se-modules/se-docker/src/main/resources/banner.txt index 9504136..c22524d 100644 --- a/se-modules/se-docker/src/main/resources/banner.txt +++ b/se-modules/se-docker/src/main/resources/banner.txt @@ -1,3 +1,3 @@ Spring Boot Version: ${spring-boot.version} Spring Application Name: ${spring.application.name} -SeFileApplication锛屽凡缁忓惎鍔� \ No newline at end of file +SeDockerApplication锛屽凡缁忓惎鍔� \ No newline at end of file diff --git a/se-modules/se-docker/src/main/resources/bootstrap.yml b/se-modules/se-docker/src/main/resources/bootstrap.yml index 3204f87..516165a 100644 --- a/se-modules/se-docker/src/main/resources/bootstrap.yml +++ b/se-modules/se-docker/src/main/resources/bootstrap.yml @@ -1,12 +1,12 @@ # Tomcat server: - port: 9300 + port: 9299 # Spring spring: application: # 搴旂敤鍚嶇О - name: se-file + name: se-docker profiles: # 鐜閰嶇疆 active: dev diff --git a/se-modules/se-docker/src/main/resources/logback.xml b/se-modules/se-docker/src/main/resources/logback.xml index 46941d6..28e60a2 100644 --- a/se-modules/se-docker/src/main/resources/logback.xml +++ b/se-modules/se-docker/src/main/resources/logback.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration scan="true" scanPeriod="60 seconds" debug="false"> <!-- 鏃ュ織瀛樻斁璺緞 --> - <property name="log.path" value="logs/se-file" /> + <property name="log.path" value="logs/se-docker" /> <!-- 鏃ュ織杈撳嚭鏍煎紡 --> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> -- Gitblit v1.9.3