diff --git a/file-common/pom.xml b/file-common/pom.xml index d59b80d..45888e7 100644 --- a/file-common/pom.xml +++ b/file-common/pom.xml @@ -20,31 +20,6 @@ 7.4.0 - - - org.springframework.boot - spring-boot-starter-web - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.0.0 - - - - - commons-fileupload commons-fileupload @@ -57,17 +32,7 @@ thumbnailator 0.4.8 - - - org.jsoup - jsoup - 1.12.1 - - - net.sourceforge.htmlunit - htmlunit - 2.36.0 - + com.aliyun.oss aliyun-sdk-oss @@ -78,7 +43,10 @@ jjwt 0.6.0 - + + + + diff --git a/file-common/src/main/java/com/qiwenshare/common/upload/Uploader.java b/file-common/src/main/java/com/qiwenshare/common/upload/Uploader.java index c39fff8..07618bb 100644 --- a/file-common/src/main/java/com/qiwenshare/common/upload/Uploader.java +++ b/file-common/src/main/java/com/qiwenshare/common/upload/Uploader.java @@ -24,7 +24,7 @@ public abstract class Uploader { public static final String ROOT_PATH = "upload"; public static final String FILE_SEPARATOR = "/"; // 文件大小限制，单位KB - public static final int maxSize = 10000000; + public final int maxSize = 10000000; protected StandardMultipartHttpServletRequest request = null; diff --git a/file-common/src/main/java/com/qiwenshare/common/upload/product/AliyunOSSUploader.java b/file-common/src/main/java/com/qiwenshare/common/upload/product/AliyunOSSUploader.java index a866a22..5dcac39 100644 --- a/file-common/src/main/java/com/qiwenshare/common/upload/product/AliyunOSSUploader.java +++ b/file-common/src/main/java/com/qiwenshare/common/upload/product/AliyunOSSUploader.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.*; -import com.aliyuncs.utils.StringUtils; import com.qiwenshare.common.domain.AliyunOSS; import com.qiwenshare.common.domain.UploadFile; import com.qiwenshare.common.upload.Uploader; @@ -14,6 +13,7 @@ import lombok.Data; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/file-common/src/main/java/com/qiwenshare/common/upload/product/NormalUploader.java b/file-common/src/main/java/com/qiwenshare/common/upload/product/NormalUploader.java index de9a3e1..7bb4c35 100644 --- a/file-common/src/main/java/com/qiwenshare/common/upload/product/NormalUploader.java +++ b/file-common/src/main/java/com/qiwenshare/common/upload/product/NormalUploader.java @@ -1,6 +1,5 @@ package com.qiwenshare.common.upload.product; -import com.aliyuncs.utils.StringUtils; import com.qiwenshare.common.domain.UploadFile; import com.qiwenshare.common.operation.ImageOperation; import com.qiwenshare.common.upload.Uploader; @@ -9,6 +8,7 @@ import com.qiwenshare.common.util.PathUtil; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.util.Streams; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/file-common/src/main/java/com/qiwenshare/common/util/JjwtUtil.java b/file-common/src/main/java/com/qiwenshare/common/util/JjwtUtil.java index bbfdafa..8143c98 100644 --- a/file-common/src/main/java/com/qiwenshare/common/util/JjwtUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/util/JjwtUtil.java @@ -4,7 +4,8 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import org.apache.commons.net.util.Base64; +import org.apache.commons.codec.binary.Base64; +//import org.apache.commons.net.util.Base64; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; diff --git a/file-web/pom.xml b/file-web/pom.xml index 018d83c..49578e1 100644 --- a/file-web/pom.xml +++ b/file-web/pom.xml @@ -23,40 +23,41 @@ - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-server - + + + + - - org.springframework.boot - spring-boot-starter-test - test - - - - com.baomidou - mybatis-plus-boot-starter - 3.3.1.tmp - - - - org.springframework.boot - spring-boot-starter-web - + org.mybatis.spring.boot mybatis-spring-boot-starter + + com.baomidou + mybatis-plus-boot-starter + + + + + + + + + + + + + + org.apache.shiro - shiro-spring - 1.4.0 + shiro-core diff --git a/file-web/src/main/java/com/qiwenshare/file/FileApplication.java b/file-web/src/main/java/com/qiwenshare/file/FileApplication.java index 380968a..1c7bc5b 100644 --- a/file-web/src/main/java/com/qiwenshare/file/FileApplication.java +++ b/file-web/src/main/java/com/qiwenshare/file/FileApplication.java @@ -3,16 +3,13 @@ package com.qiwenshare.file; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.client.RestTemplate; @SpringBootApplication @MapperScan("com.qiwenshare.file.mapper") @EnableScheduling -@EnableDiscoveryClient +//@EnableDiscoveryClient @EnableTransactionManagement public class FileApplication { diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java index 45ea12b..34034d9 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java @@ -15,8 +15,6 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.crypto.hash.SimpleHash; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java index 35bcd13..8e2d39e 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java @@ -1,31 +1,20 @@ package com.qiwenshare.file.service; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qiwenshare.common.cbb.DateUtil; import com.qiwenshare.common.operation.FileOperation; import com.qiwenshare.common.oss.AliyunOSSDelete; import com.qiwenshare.common.util.FileUtil; import com.qiwenshare.common.util.PathUtil; import com.qiwenshare.file.api.IFileService; -import com.qiwenshare.file.config.AliyunConfig; import com.qiwenshare.file.config.QiwenFileConfig; -import com.qiwenshare.file.domain.UserFile; -import com.qiwenshare.file.mapper.FileMapper; import com.qiwenshare.file.domain.FileBean; -import com.qiwenshare.file.domain.StorageBean; -import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.mapper.FileMapper; import com.qiwenshare.file.mapper.UserFileMapper; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.List; @Slf4j @Service diff --git a/file-web/src/main/resources/application.properties b/file-web/src/main/resources/application.properties index afa8a82..f535fbd 100644 --- a/file-web/src/main/resources/application.properties +++ b/file-web/src/main/resources/application.properties @@ -6,7 +6,7 @@ eureka.instance.hostname=localhost eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:8761/eureka/ spring.application.name=qiwen-file #日志配置 -logging.file=/qiwenshare/qiwen-file/log/web.log +logging.file.name=/qiwenshare/qiwen-file/log/web.log logging.level.root=info #mybatis配置 @@ -32,7 +32,8 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph #静态资源指定 spring.mvc.static-path-pattern=/** -spring.resources.static-locations=classpath:/static +spring.web.resources.static-locations=classpath:/static + #上传下载 spring.servlet.multipart.max-file-size=2048MB spring.servlet.multipart.max-request-size=2048MB diff --git a/file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java b/file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java index b81c73e..80c74c7 100644 --- a/file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java +++ b/file-web/src/test/java/com/qiwenshare/file/ScpApplicationTests.java @@ -1,16 +1,16 @@ -package com.qiwenshare.file; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class ScpApplicationTests { - - @Test - public void contextLoads() { - } - -} +//package com.qiwenshare.file; +// +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.test.context.junit4.SpringRunner; +// +//@RunWith(SpringRunner.class) +//@SpringBootTest +//public class ScpApplicationTests { +// +// @Test +// public void contextLoads() { +// } +// +//} diff --git a/pom.xml b/pom.xml index af8f4cb..b0f727e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.7.RELEASE + 2.4.1 com.qiwenshare @@ -17,12 +17,21 @@ 1.8 - Hoxton.SR1 + UTF-8 UTF-8 + + org.springframework.boot + spring-boot-starter-web + + + org.apache.commons + commons-lang3 + + org.springdoc @@ -37,6 +46,9 @@ + + + org.projectlombok lombok @@ -65,78 +77,51 @@ org.springframework.boot spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-jdbc - - - - org.springframework.boot - spring-boot-starter-aop - - - - - commons-io - commons-io - 2.6 - - - - org.apache.commons - commons-dbcp2 - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - + + + + + + + org.mybatis.spring.boot mybatis-spring-boot-starter 2.1.1 - com.alibaba - fastjson - 1.2.28 - - - commons-io - commons-io - 2.6 - - - org.springframework.boot - spring-boot-starter-websocket - 2.1.5.RELEASE - - - org.hibernate - hibernate-core - 5.4.1.Final + com.baomidou + mybatis-plus-boot-starter + 3.4.1 + + + + + + + + + + + + - - com.aliyun - aliyun-java-sdk-core - 4.0.3 - + + + + + org.apache.shiro - shiro-spring + shiro-core 1.4.0 @@ -149,14 +134,5 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - - \ No newline at end of file